Zhou/20230201_145_upperpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加滚动条

Browse Source
This commit is contained in:
MoYue 2024-03-14 09:24:31 +08:00
parent b9cf29788b
commit ffa3e35060
3 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
InSituLaboratory.Assets/Styles/CollectionStyles.xaml Normal file
View File

@ -0,0 +1,19 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style TargetType="ListBoxItem" x:Key="NoramalListBoxItemStyle">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<Border Name="border">
<ContentPresenter/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="ItemsControl.AlternationIndex" Value="1">
<Setter TargetName="border" Property="Background" Value="#F7F9FA"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>

1
InSituLaboratory/App.xaml
View File

@ -14,6 +14,7 @@
<ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/DataGridStyle.xaml"/> <ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/DataGridStyle.xaml"/>
<ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/PageBaseTempalte.xaml"/> <ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/PageBaseTempalte.xaml"/>
<ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/CollectionStyles.xaml"/>
<ResourceDictionary> <ResourceDictionary>
<FontFamily x:Key="Icons">/InSituLaboratory.Assets;component/Fonts/iconfont.ttf#zx_icons</FontFamily> <FontFamily x:Key="Icons">/InSituLaboratory.Assets;component/Fonts/iconfont.ttf#zx_icons</FontFamily>

61
InSituLaboratory/Views/Pages/CavityOperationView.xaml
View File

@ -7,46 +7,27 @@
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}" mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}"
> >
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10"> <Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">
<Grid.RowDefinitions> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" >
<RowDefinition Height="30"/> <DataGrid ItemsSource="{Binding}" FontSize="12" FontWeight="Bold" Foreground="#666" >
<RowDefinition/> <DataGrid.Columns>
</Grid.RowDefinitions> <DataGridTextColumn Header="序号" Width="40"/>
<Border Background="#EEE" Height="1" VerticalAlignment="Bottom"/> <DataGridTextColumn Header="记录时间" Width="120"/>
<Grid TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666"> <DataGridTextColumn Header="腔体识别码" Width="70"/>
<Grid.ColumnDefinitions> <DataGridTextColumn Header="DN1-48V电压" Width="120"/>
<ColumnDefinition Width="40"/> <DataGridTextColumn Header="DN1-48V电流" Width="120"/>
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="DN1-24V电流" Width="120"/>
<ColumnDefinition Width="70"/> <DataGridTextColumn Header="DN2-48V电流" Width="120" />
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="DN2-24V电流" Width="120"/>
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="DN3-48V电流" Width="120"/>
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="DN3-24V电流" Width="120"/>
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="DN4-48V电流" Width="120"/>
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="DN4-24V电流" Width="120"/>
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="漏电流模块1" Width="120"/>
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="漏电流模块2" Width="120"/>
<ColumnDefinition Width="120"/> <DataGridTextColumn Header="漏电流模块4" Width="120"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="记录时间" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="腔体识别码" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN1-48V电压" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN1-48V电流" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN1-24V电流" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN2-48V电流" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN2-24V电流" Grid.Column="7" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN3-48V电流" Grid.Column="8" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN3-24V电流" Grid.Column="9" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN4-48V电流" Grid.Column="10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="DN4-24V电流" Grid.Column="11" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="漏电流模块1" Grid.Column="12" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="漏电流模块2" Grid.Column="13" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="漏电流模块4" Grid.Column="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid>
</DataGrid.Columns>
</DataGrid>
</ScrollViewer>
</Grid> </Grid>
</UserControl> </UserControl>