From ffa3e35060c4a6d602a96e12545cb21f90199f56 Mon Sep 17 00:00:00 2001
From: MoYue <MoYue@DESKTOP-V2TRTHU>
Date: Thu, 14 Mar 2024 09:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Styles/CollectionStyles.xaml              | 19 ++++++
 InSituLaboratory/App.xaml                     |  1 +
 .../Views/Pages/CavityOperationView.xaml      | 61 +++++++------------
 3 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 InSituLaboratory.Assets/Styles/CollectionStyles.xaml

diff --git a/InSituLaboratory.Assets/Styles/CollectionStyles.xaml b/InSituLaboratory.Assets/Styles/CollectionStyles.xaml
new file mode 100644
index 0000000..bd2a512
--- /dev/null
+++ b/InSituLaboratory.Assets/Styles/CollectionStyles.xaml
@@ -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>
\ No newline at end of file
diff --git a/InSituLaboratory/App.xaml b/InSituLaboratory/App.xaml
index d3b6e79..440b235 100644
--- a/InSituLaboratory/App.xaml
+++ b/InSituLaboratory/App.xaml
@@ -14,6 +14,7 @@
                 <ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/DataGridStyle.xaml"/>
 
                 <ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/PageBaseTempalte.xaml"/>
+                <ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/CollectionStyles.xaml"/>
 
                 <ResourceDictionary>
                     <FontFamily x:Key="Icons">/InSituLaboratory.Assets;component/Fonts/iconfont.ttf#zx_icons</FontFamily>
diff --git a/InSituLaboratory/Views/Pages/CavityOperationView.xaml b/InSituLaboratory/Views/Pages/CavityOperationView.xaml
index e517db7..b9a9800 100644
--- a/InSituLaboratory/Views/Pages/CavityOperationView.xaml
+++ b/InSituLaboratory/Views/Pages/CavityOperationView.xaml
@@ -7,46 +7,27 @@
              mc:Ignorable="d"    Template="{StaticResource PageSearchTempalte}"
 >
     <Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="30"/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        <Border Background="#EEE" Height="1" VerticalAlignment="Bottom"/>
-        <Grid TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="40"/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition Width="70"/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition 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>
+        <ScrollViewer  ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" >
+            <DataGrid ItemsSource="{Binding}"   FontSize="12" FontWeight="Bold" Foreground="#666" >
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="序号" Width="40"/>
+                    <DataGridTextColumn Header="记录时间"  Width="120"/>
+                    <DataGridTextColumn Header="腔体识别码"  Width="70"/>
+                    <DataGridTextColumn Header="DN1-48V电压" Width="120"/>
+                    <DataGridTextColumn Header="DN1-48V电流" Width="120"/>
+                    <DataGridTextColumn Header="DN1-24V电流" Width="120"/>
+                    <DataGridTextColumn Header="DN2-48V电流" Width="120" />
+                    <DataGridTextColumn Header="DN2-24V电流" Width="120"/>
+                    <DataGridTextColumn Header="DN3-48V电流" Width="120"/>
+                    <DataGridTextColumn Header="DN3-24V电流" Width="120"/>
+                    <DataGridTextColumn Header="DN4-48V电流" Width="120"/>
+                    <DataGridTextColumn Header="DN4-24V电流" Width="120"/>
+                    <DataGridTextColumn Header="漏电流模块1" Width="120"/>
+                    <DataGridTextColumn Header="漏电流模块2" Width="120"/>
+                    <DataGridTextColumn Header="漏电流模块4" Width="120"/>
 
+                </DataGrid.Columns>
+            </DataGrid>
+        </ScrollViewer>
     </Grid>
 </UserControl>