diff --git a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs
index 9e7f15a1..f01ac8da 100644
--- a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs
+++ b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs
@@ -37,7 +37,7 @@ namespace Admin.Core.Service
         {
             List<CodeBindCharts> list = null;
             var _db = this.BaseDal.Db;
-            list = await _db.Ado.SqlQueryAsync<CodeBindCharts>("SELECT BOX_NAME as BoxName,COUNT(*) as Amount FROM CODE_BINDING GROUP BY BOX_NAME");
+            list = await _db.Ado.SqlQueryAsync<CodeBindCharts>("SELECT BOX_NAME as BoxName,COUNT(*) as Amount FROM CODE_BINDING WHERE PRODUCT_CODE IS NOT NULL GROUP BY BOX_NAME ");
             return list;
         }
 
diff --git a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs
index cab35e7c..b88448a1 100644
--- a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs
@@ -217,7 +217,7 @@ namespace Aucma.Core.CodeBinding.ViewModels
                 bindingInfo = value;
                 OnPropertyChanged(nameof(BindingInfo));
             }
-        }
+        } 
         #region 日产量柱状图X轴日期
         /// <summary>
         /// 日产量柱状图X轴日期
diff --git a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
index 4463a9ff..b3829f8b 100644
--- a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
+++ b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
@@ -4,6 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+ Background="#1152AC"     
+             FontFamily="Microsoft YaHei"
              xmlns:local="clr-namespace:Aucma.Core.CodeBinding.Views"
              mc:Ignorable="d"       
              d:DesignHeight="800"
@@ -12,10 +14,65 @@
     <UserControl.Resources>
         <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
             <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
         </Style>
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="HorizontalContentAlignment"  Value="Center"/>
-            <Setter Property="Background" Value="#dddddd"/>
+        <Style TargetType="DataGrid">
+            <!--网格线颜色-->
+            <Setter Property="CanUserResizeColumns" Value="false"/>
+            <Setter Property="Background" Value="#1152AC" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="HorizontalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#4285DE"/>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="VerticalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#1152AC"/>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <!--列头标题栏样式-->
+        <Style TargetType="DataGridColumnHeader">
+            <!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>-->
+            <!--<Setter Property="Background" Value="#dddddd"/>
+            <Setter Property="Foreground" Value="Black"/>-->
+            <!--<Setter Property="BorderThickness" Value="1" />-->
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Background" Value="#4285DE"/>
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="FontFamily" Value="Microsoft YaHei"/>
+        </Style>
+
+        <!--单元格样式-->
+        <Style TargetType="DataGridCell">
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}" >
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="#4285DE"/>
+                    <Setter Property="Foreground" Value="White"/>
+                </Trigger>
+                <DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
+                    <Setter Property="Background" Value="Green" />
+                </DataTrigger>
+            </Style.Triggers>
         </Style>
     </UserControl.Resources>
     <Grid Margin="1 5 1 0" >
@@ -25,8 +82,11 @@
             <RowDefinition/>
         </Grid.RowDefinitions>
         <!--扫描信息-->
-        <Border Grid.Row="0"  BorderThickness="1" BorderBrush="#0288d1"  CornerRadius="4" Background="Transparent" Width="100" Height="30" VerticalAlignment="Top" HorizontalAlignment="Center">
+        <!--<Border Grid.Row="0"  BorderThickness="1" BorderBrush="#0288d1"  CornerRadius="4" Background="Transparent" Width="100" Height="30" VerticalAlignment="Top" HorizontalAlignment="Center">
             <TextBlock Text="扫描信息" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        </Border>-->
+        <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
+            <TextBlock Text="扫描信息" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
         </Border>
         <Border Grid.Row="1"  BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="3,1,5,5">
             <Grid>
@@ -40,19 +100,19 @@
                         <RowDefinition/>
                         <RowDefinition Height="2*"/>
                     </Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center"  Margin="50 0 0 0 ">
+                    <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center"  Margin="200 0 0 0 ">
                         <Label Content="MES条码 " FontSize="20" Foreground="#FFFFFF"/>
                         <TextBox  TextWrapping="Wrap" Text="{Binding Code1}" Width="350" FontSize="20"  Foreground="#FFFFFF"/>
                         <!--<Label Content="订单号 " FontSize="20" Foreground="#FFFFFF"/>
                         <TextBox  TextWrapping="Wrap" Width="300" FontSize="20"  Foreground="#FFFFFF"/>-->
                     </StackPanel>
-                    <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="50 0 0 0 ">
+                    <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="200 0 0 0 ">
                         <Label Content="成品条码 " FontSize="20"  Foreground="#FFFFFF"/>
                         <TextBox  TextWrapping="Wrap" Text="{Binding Code2}" Width="350" FontSize="20"  Foreground="#FFFFFF"/>
                         <!--<Label Content="型号 " FontSize="20"  Foreground="#FFFFFF"/>
                         <TextBox  TextWrapping="Wrap"  Width="300" FontSize="20"  Foreground="#FFFFFF"/>-->
                     </StackPanel>
-                    <StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="50 0 0 0 ">
+                    <StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="200 0 0 0 ">
                             <Label Content="提示信息 " FontSize="20"  Foreground="#FFFFFF"/>
                             <TextBox  TextWrapping="Wrap" Text="{Binding BindingInfo}" Width="500" Height="150" FontSize="20"  Foreground="#FFFFFF"/>
                         </StackPanel>
@@ -64,20 +124,23 @@
                         <RowDefinition Height="9*"/>
                     </Grid.RowDefinitions>
                     <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
-                        <TextBlock Text="扫描型号统计" FontSize="15" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <TextBlock Text="扫描型号统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Border>
                     <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
-                        <lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}" Margin="5" Foreground="White">
-                            <lvc:CartesianChart.AxisX>
-                                <lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15">
-                                    <lvc:Axis.Separator> 
-                                        <lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
+                        <lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}"   LegendLocation="Top" Foreground="White">
+                            <lvc:CartesianChart.DataTooltip >
+                                <lvc:DefaultTooltip SelectionMode="OnlySender"  BulletSize="10" Foreground="Black"></lvc:DefaultTooltip>
+                            </lvc:CartesianChart.DataTooltip>
+                            <lvc:CartesianChart.AxisX >
+                                <lvc:Axis Labels="{Binding ProductionHourList}" FontSize="18" Foreground="White" LabelsRotation="0"  DisableAnimations="True" Position="LeftBottom" >
+                                    <lvc:Axis.Separator>
+                                        <lvc:Separator Visibility="Hidden" Step="1" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
                                         </lvc:Separator>
                                     </lvc:Axis.Separator>
                                 </lvc:Axis>
                             </lvc:CartesianChart.AxisX>
                             <lvc:CartesianChart.AxisY>
-                                <lvc:Axis FontSize="15">
+                                <lvc:Axis FontSize="18" Foreground="White">
                                     <lvc:Axis.Separator>
                                         <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
                                         </lvc:Separator>
@@ -85,6 +148,8 @@
                                 </lvc:Axis>
                             </lvc:CartesianChart.AxisY>
                         </lvc:CartesianChart>
+                        
+                       
                     </Border>
 
                 </Grid>
@@ -98,8 +163,11 @@
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="9*"/>
                 </Grid.RowDefinitions>
-                <Border Grid.Row="0"  BorderThickness="1" BorderBrush="#0288d1"  CornerRadius="4" Background="Transparent" Width="100" Height="30" VerticalAlignment="Top" HorizontalAlignment="Center" >
+                <!--<Border Grid.Row="0"  BorderThickness="1" BorderBrush="#0288d1"  CornerRadius="4" Background="Transparent" Width="100" Height="30" VerticalAlignment="Top" HorizontalAlignment="Center" >
                     <TextBlock Text="扫描纪录" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                </Border>-->
+                <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
+                    <TextBlock Text="扫描纪录" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                 </Border>
                 <!--扫描纪录-->
                 <Border x:Name="ScanPanel" Grid.Row="1" Grid.Column="0" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
@@ -110,21 +178,7 @@
                        BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
                       Foreground="White" >
 
-                        <!-- 表头剧中-->
-                        <DataGrid.ColumnHeaderStyle>
-                            <Style TargetType="DataGridColumnHeader">
-                                <Setter Property="HorizontalContentAlignment" Value="Center">
-                                </Setter>
-                                <Setter Property="Background" Value="Transparent" />
-                            </Style>
-                        </DataGrid.ColumnHeaderStyle>
-                        <DataGrid.CellStyle>
-
-                            <Style TargetType="DataGridCell">
-                                <Setter Property="HorizontalAlignment" Value="Center"/>
-                            </Style>
-                        </DataGrid.CellStyle>
-                        <!--修改选中字体颜色-->
+                      
                         <DataGrid.Columns>
                             <DataGridTextColumn Binding="{Binding No}"     Header="序号"  Width="1*"             ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
                             <DataGridTextColumn Binding="{Binding BoxCode}"       Header="MES条码" Width="4*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
diff --git a/Aucma.Core.CodeBinding/Views/MainWindow.xaml b/Aucma.Core.CodeBinding/Views/MainWindow.xaml
index 83871b90..8a070abf 100644
--- a/Aucma.Core.CodeBinding/Views/MainWindow.xaml
+++ b/Aucma.Core.CodeBinding/Views/MainWindow.xaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         mc:Ignorable="d"
+        FontFamily="Microsoft YaHei"
        Title="SCADA" Height="1080" Width="1920" Icon="/Assets/images/Icon.png" 
         WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize">
     <Window.Background>
@@ -17,11 +18,11 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="7*"/>
-                <RowDefinition Height="0.7*"/>
+                <RowDefinition Height="6*"/>
+                <RowDefinition Height="auto"/>
             </Grid.RowDefinitions>
 
-            <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">
+            <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2" >
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="2*"/>
@@ -59,12 +60,12 @@
                             <RowDefinition/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
-                        <StackPanel  Grid.Row="1" Height="50" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
-                            <Button Content="实时监控" x:Name="FirstPage"  Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}"  Margin="5 0" />
-                            <Button Content="绑定记录" x:Name="RecordPage" Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=RecordPage}" />
-                            <Button Content="键盘" x:Name="TabTip" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=TabTip}"  />
-                            <Button Content="最小化" x:Name="Minimized"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"   Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
-                            <Button Content="退  出" x:Name="Exit"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Exit}"  Width="100" Height="30" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
+                        <StackPanel  Grid.Row="1" Height="60" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
+                            <Button Content="实时监控" x:Name="FirstPage" Height="40" Margin="5 0"  Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" />
+                            <Button Content="绑定记录" x:Name="RecordPage" Height="40" Margin="5 0"  Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=RecordPage}" />
+                            <Button Content="键盘" x:Name="TabTip" Height="40" Margin="5 0"   Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=TabTip}"  />
+                            <Button Content="最小化" x:Name="Minimized"  Height="40" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"    Background="#FF9900" BorderBrush="#FF9900" />
+                            <Button Content="退  出" x:Name="Exit"  Height="40" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Exit}"    Background="#FF0033" BorderBrush="#FF0033" />
                         </StackPanel>
                         <StackPanel  Grid.Row="2" Height="50" Orientation="Horizontal"   HorizontalAlignment="Right">
                             <Border Width="30" Height="30" CornerRadius="15">
diff --git a/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml b/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml
index 33c4d31c..40ee708d 100644
--- a/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml
+++ b/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml
@@ -6,7 +6,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:local="clr-namespace:Aucma.Core.CodeBinding.Views"
              xmlns:cvt="clr-namespace:Aucma.Core.CodeBinding.ConvertTo"
-             mc:Ignorable="d" 
+             mc:Ignorable="d" Background="#1152AC"
              d:DesignHeight="450" d:DesignWidth="800">
 
     <UserControl.Resources>
@@ -14,23 +14,46 @@
 
         <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
             <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="18"/>
+        </Style>
+        <Style TargetType="DataGrid">
+            <!--网格线颜色-->
+            <Setter Property="CanUserResizeColumns" Value="false"/>
+            <Setter Property="Background" Value="#1152AC" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="HorizontalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#4285DE"/>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="VerticalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#1152AC"/>
+                </Setter.Value>
+            </Setter>
         </Style>
         <!--列头标题栏样式-->
-        <!--<Style TargetType="DataGridColumnHeader">
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Background" Value="#dddddd"/>
-            <Setter Property="Foreground" Value="Black"/>
-            <Setter Property="BorderThickness" Value="1" />
+        <Style TargetType="DataGridColumnHeader">
+            <!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>-->
+            <!--<Setter Property="Background" Value="#dddddd"/>
+            <Setter Property="Foreground" Value="Black"/>-->
+            <!--<Setter Property="BorderThickness" Value="1" />-->
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="BorderBrush" Value="#dddddd" />
-            <Setter Property="Height" Value="30"/>
-            <Setter Property="FontSize" Value="14"/>
-        </Style>-->
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Background" Value="#4285DE"/>
+            <Setter Property="Foreground" Value="White"/>
+        </Style>
+
         <!--单元格样式-->
-        <!--<Style TargetType="DataGridCell">
+        <Style TargetType="DataGridCell">
             <Setter Property="FocusVisualStyle" Value="{x:Null}" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="BorderBrush" Value="Gray" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Height" Value="40"/>
             <Setter Property="FontSize" Value="12"/>
             <Setter Property="Template">
                 <Setter.Value>
@@ -41,82 +64,28 @@
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
-        </Style>-->
-
-        <!--<Style TargetType="TextBlock" x:Key="centerAlignmentStyle">
-            <Setter Property="Foreground" Value="Gray"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="TextWrapping" Value="Wrap"/>
-        </Style>-->
-
-        <!--背景色改变必须先设置cellStyle 因为cellStyle会覆盖rowStyle样式，换行换色-->
-        <!--<Style TargetType="DataGridRow">
-            <Setter Property="Height" Value="30"/>
             <Style.Triggers>
-                <Trigger Property="AlternationIndex" Value="0">
-                    <Setter Property="Background" Value="#e7e7e7" />
-                    --><!--ffe14d--><!--
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="#4285DE"/>
+                    <Setter Property="Foreground" Value="#dddddd"/>
                 </Trigger>
-                <Trigger Property="AlternationIndex" Value="1">
-                    <Setter Property="Background" Value="#f2f2f2" />
-                    --><!--f1ef9f--><!--
-                </Trigger>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#f1ef9f" />
-                </Trigger>-->
-                <!--<Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#05c4ff"/>
-                </Trigger>
-                <Trigger Property="IsFocused" Value="True">
-                    <Setter Property="Background" Value="#05c4ff"/>
-                </Trigger>-->
-            <!--</Style.Triggers>
-        </Style>-->
+            </Style.Triggers>
 
-        <!--但由于DataGridTextColumn不能从FrameworkElement或FrameworkContentElement继承而无法使用-->
-        <!--<Style TargetType="DataGridTextColumn">
-		<Setter Property="ElementStyle">
-			<Setter.Value>
-				<Style TargetType="TextBlock">
-					<Setter Property="VerticalAlignment" Value="Center"/>
-				</Style>
-			</Setter.Value>
-		</Setter>
-	</Style>-->
-
-        <!--网格线颜色-->
-        <!--<Style TargetType="DataGrid">-->
-            <!--该属性指示是否允许用户调整列宽度-->
-            <!--<Setter Property="CanUserResizeColumns"   Value="false" />
-            <Setter Property="Background"   Value="#F4F4F4" />
-            <Setter Property="BorderBrush"   Value="Gray" />
-            <Setter Property="SelectionUnit"   Value="FullRow" />
-            <Setter Property="VerticalScrollBarVisibility"   Value="Auto" />
-            <Setter Property="HorizontalScrollBarVisibility"   Value="Auto" />
-            <Setter Property="RowHeaderWidth"   Value="0" />
-            <Setter Property="HorizontalGridLinesBrush">
-                <Setter.Value>
-                    <SolidColorBrush Color="#d6c79b" />
-                </Setter.Value>
-            </Setter>
-            <Setter Property="VerticalGridLinesBrush">
-                <Setter.Value>
-                    <SolidColorBrush Color="#d6c79b" />
-                </Setter.Value>
-            </Setter>
-        </Style>-->
+        </Style>
     </UserControl.Resources>
 
+
     <Border Grid.Row="1" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="5">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="0.8*"/>
                 <RowDefinition Height="9*"/>
             </Grid.RowDefinitions>
-            <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
+            <!--<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
                 <TextBlock Text="绑定记录" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+            </Border>-->
+            <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" >
+                <TextBlock Text="绑定记录" FontSize="25" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
             </Border>
             <Border Grid.Row="1" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
                 <Grid Margin="10,5">
@@ -126,12 +95,10 @@
                     </Grid.RowDefinitions>
                     <WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center">
                         <TextBlock Text="开始时间"   Margin="10 0" Foreground="White" FontSize="15"  VerticalAlignment="Center"/>
-                        <DatePicker  
-                            x:Name="BeginTime"
-                            Width="200"  Margin="10 0"  Text="2023-10-09 00:00"
-                            materialDesign:CalendarAssist.IsHeaderVisible="False"
-                            Foreground="DarkBlue"
-                            materialDesign:HintAssist.Hint="开始日期">
+                        <DatePicker 
+                            x:Name="BeginTime" FontSize="16"
+                            Width="200"  Margin="10 0"  BorderBrush="White"
+                            materialDesign:CalendarAssist.IsHeaderVisible="False">
                             <DatePicker.SelectedDate>
                                 <Binding
                                         Path="FutureValidatingDate"
@@ -142,12 +109,11 @@
                             </DatePicker.SelectedDate>
                         </DatePicker>
 
-                        <TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="15"  VerticalAlignment="Center"/>
+                        <TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="18"  VerticalAlignment="Center"/>
                         <DatePicker
-                            x:Name="EndTime"  Margin="10 0"  Text="2023-10-09"
-                            Width="200" Foreground="DarkBlue"
-                            materialDesign:CalendarAssist.IsHeaderVisible="False"
-                            materialDesign:HintAssist.Hint="结束日期">
+                            x:Name="EndTime"  Margin="10 0"  
+                            Width="200"  BorderBrush="White" FontSize="16"
+                            materialDesign:CalendarAssist.IsHeaderVisible="False">
                             <DatePicker.SelectedDate>
                                 <Binding
                                         Path="FutureValidatingDate"
@@ -157,6 +123,7 @@
                                 </Binding>
                             </DatePicker.SelectedDate>
                         </DatePicker>
+                       
                         <Button Margin="10 0"
                             Content="查询"  Command="{Binding ExecQueryCommand}"
                             Style="{StaticResource MaterialDesignRaisedSecondaryDarkButton}">
@@ -169,25 +136,13 @@
                         </Button>
                     </WrapPanel>
                     <UniformGrid Grid.Row="1">
-                        <DataGrid ItemsSource="{Binding ListItems}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
-                      RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"  AlternationCount="2" 
+                        <DataGrid ItemsSource="{Binding ListItems}"  Background="#00000000" 
+                       ColumnHeaderHeight="35"  
+                      RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
-                      ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" 
-                      Foreground="White">
-                            <!-- 表头剧中-->
-                            <DataGrid.ColumnHeaderStyle>
-                                <Style TargetType="DataGridColumnHeader">
-                                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                                    <Setter Property="Background" Value="Transparent" />
-                                </Style>
-                            </DataGrid.ColumnHeaderStyle>
-                            <DataGrid.CellStyle>
-                                <Style TargetType="DataGridCell">
-                                    <Setter Property="HorizontalAlignment" Value="Center"/>
-                                </Style>
-                            </DataGrid.CellStyle>
-                            <!--修改选中字体颜色-->
+                      ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
+                      Foreground="White" >
+                        
                             <DataGrid.Columns>
                                 <DataGridTextColumn Binding="{Binding No}"     Header="序号"  Width="1*"             ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
                                 <DataGridTextColumn Binding="{Binding BoxCode}"       Header="MES条码" Width="4*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>