From c81919978c52f9563f513214172fc19906bfd4f1 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 27 Nov 2023 10:36:22 +0800
Subject: [PATCH] change .

---
 .../Views/IndexPageView.xaml                  | 42 ++++++++++++++-----
 .../Views/StatisticsPageView.xaml             | 15 +++----
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/Aucma.Core.ProductOffLine/Views/IndexPageView.xaml b/Aucma.Core.ProductOffLine/Views/IndexPageView.xaml
index 7fbd0ba1..ecfd51e6 100644
--- a/Aucma.Core.ProductOffLine/Views/IndexPageView.xaml
+++ b/Aucma.Core.ProductOffLine/Views/IndexPageView.xaml
@@ -101,7 +101,7 @@
                     <TextBlock Text="48" Foreground="White"/>
                 </Border>
                 <Border Grid.Row="0"  Grid.Column="5" Background="#0288d1">
-                    <TextBlock Text="实际产量" Foreground="White" />
+                    <TextBlock Text="下线产量" Foreground="White" />
                 </Border>
                 <Border Grid.Row="1" Grid.RowSpan="2"  Grid.Column="5">
                     <TextBlock Text="255" Foreground="White"/>
@@ -139,10 +139,20 @@
                         <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
                             <lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" >
                                 <lvc:CartesianChart.AxisX>
-                                    <lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15"/>
+                                    <lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15">
+                                        <lvc:Axis.Separator>
+                                            <lvc:Separator Visibility="Hidden" 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="15">
+                                        <lvc:Axis.Separator>
+                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
+                                            </lvc:Separator>
+                                        </lvc:Axis.Separator>
+                                    </lvc:Axis>
                                 </lvc:CartesianChart.AxisY>
                             </lvc:CartesianChart>
                         </Border>
@@ -161,10 +171,20 @@
                         <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
                             <lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}" Margin="5">
                                 <lvc:CartesianChart.AxisX>
-                                    <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15"/>
+                                    <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15">
+                                        <lvc:Axis.Separator>
+                                            <lvc:Separator Visibility="Hidden" 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="15">
+                                        <lvc:Axis.Separator>
+                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
+                                            </lvc:Separator>
+                                        </lvc:Axis.Separator>
+                                    </lvc:Axis>
                                 </lvc:CartesianChart.AxisY>
                             </lvc:CartesianChart>
                         </Border>
@@ -189,12 +209,12 @@
                 </DataGrid.ColumnHeaderStyle>
                 <!--修改选中字体颜色-->
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding PlanCode}" Header="产品条码" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                    <DataGridTextColumn Binding="{Binding MaterialBarCode}" Header="产品型号" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                    <DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品编码" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
-                    <DataGridTextColumn Binding="{Binding MaterialName}" Header="订单号" Width="2*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
-                    <DataGridTextColumn Binding="{Binding EnterSpace}" Header="特征信息" Width="*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                    <DataGridTextColumn Binding="{Binding Status,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="扫描时间" Width="*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                    <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                    <DataGridTextColumn Binding="{Binding PlanCode}" Header="订单编号" Width="3*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                    <DataGridTextColumn Binding="{Binding MaterialBarCode}" Header="产品条码" Width="3*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                    <DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品型号" Width="3*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                    <DataGridTextColumn Binding="{Binding EnterSpace}" Header="特征信息" Width="3*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                    <DataGridTextColumn Binding="{Binding Status,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="扫描时间" Width="3*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
 
                 </DataGrid.Columns>
             </DataGrid>
diff --git a/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml b/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml
index b7c1b289..c22feb13 100644
--- a/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml
+++ b/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml
@@ -36,7 +36,7 @@
                 <TextBlock Text="扫描记录" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
             </Border>
             <Button x:Name="btn1" Content="入库记录" HorizontalAlignment="Left" Margin="37,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF1752E1" Click="btn1_Click" />
-            <Button x:Name="btn2" Content="入库统计" HorizontalAlignment="Left" Margin="135,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF384E83" Click="btn2_Click" />
+            <Button x:Name="btn2" Content="型号汇总" HorizontalAlignment="Left" Margin="135,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF384E83" Click="btn2_Click" />
             <Border x:Name="border1" Grid.Row="1" Visibility="Visible" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="1,50,5,5">
                 <Grid Margin="10,5">
                     <Grid.RowDefinitions>
@@ -119,12 +119,13 @@
                             </DataGrid.ColumnHeaderStyle>-->
                             <!--修改选中字体颜色-->
                             <DataGrid.Columns>
-                                <DataGridTextColumn Binding="{Binding No}" Header="序号" />
-                                <DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="订单号" Width="1*" />
-                                <DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品条码" Width="3*"  />
-                                <DataGridTextColumn Binding="{Binding MaterialName}" Header="产品型号" Width="3*"  />
-                                <DataGridTextColumn Binding="{Binding PlanAmount}" Header="物料编码" Width="3*"  />
-                                <DataGridTextColumn Binding="{Binding CompleteAmount}" Header="扫描时间" Width="2*" />
+                                <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" />
+                                <DataGridTextColumn Binding="{Binding PlanCode}" Header="订单编号" Width="3*" />
+                                <DataGridTextColumn Binding="{Binding MaterialBarCode}" Header="产品条码" Width="3*" />
+                                <DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品型号" Width="3*" />
+                                <DataGridTextColumn Binding="{Binding EnterSpace}" Header="特征信息" Width="3*" />
+                                <DataGridTextColumn Binding="{Binding Status,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="扫描时间" Width="3*"/>
+
                             </DataGrid.Columns>
                         </DataGrid>
                     </UniformGrid>