From 92cc8a15ecb93e1659369d66b0c88bf50830f8bd Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Wed, 6 Dec 2023 18:55:52 +0800
Subject: [PATCH] =?UTF-8?q?change-=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aucma.Scada.UI/MainWindow.xaml                |  53 +++----
 .../AssemblyPlan/AssemblyPlanControl.xaml     | 141 ++++++++++++++----
 .../Page/AssemblyPlan/PlanInfoEditWindow.xaml |  30 ++--
 .../AssemblyPlan/QuantityIssuedWindow.xaml    |  30 ++--
 .../Page/InStoreInfo/InStoreInfoControl.xaml  | 139 +++++++++++++----
 .../InventoryInfo/InventoryInfoControl.xaml   |   8 +-
 .../Page/InventoryInfo/LinerInventory.xaml    |  79 +++++++++-
 .../MaterialStatisticsWindow.xaml             |  18 +--
 .../Page/InventoryInfo/ShellInventory.xaml    |  79 +++++++++-
 .../Page/InventoryInfo/SpaceDetailWindow.xaml |  20 +--
 .../Page/InventoryInfo/SpaceInfoControl.xaml  |   2 +-
 .../OutStoreInfo/OutStoreInfoControl.xaml     | 128 ++++++++++++----
 .../Page/TaskInfo/TaskInfoControl.xaml        |  99 +++++++++---
 .../AssemblyPlan/AssemblyPlanViewModel.cs     |   4 +
 .../InStoreInfo/InStoreInfoViewModel.cs       |   5 +-
 Aucma.Scada.UI/viewModel/MainViewModel.cs     |  23 ++-
 16 files changed, 643 insertions(+), 215 deletions(-)

diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml
index 87b39fcd..f38de87d 100644
--- a/Aucma.Scada.UI/MainWindow.xaml
+++ b/Aucma.Scada.UI/MainWindow.xaml
@@ -4,13 +4,14 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI"
-        mc:Ignorable="d"
+        mc:Ignorable="d" FontFamily="Microsoft YaHei"
+        WindowStartupLocation="CenterScreen" 
         Title="SCADA" Height="1080" Width="1920" Icon="Icon.png" 
         WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize">
     <Window.Background>
         <ImageBrush ImageSource="/templates/image/background.jpg" />
     </Window.Background>
-        <!--WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" -->
+    <!--WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" -->
 
     <Border Margin="5" Background="Transparent" CornerRadius="10">
         <Border.Effect>
@@ -20,10 +21,11 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="7*"/>
-                <RowDefinition Height="0.7*"/>
+                <RowDefinition Height="6*"/>
+                <RowDefinition Height="27.5"/>
+                <RowDefinition Height="35.5"/>
             </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,2,2">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="2*"/>
@@ -31,8 +33,10 @@
                         <ColumnDefinition Width="2*"/>
                     </Grid.ColumnDefinitions>
                     <!--<StackPanel Grid.Row="0" >
-                        --><!--<TextBlock Text="AUCMA" FontSize="50" Foreground="Red" FontWeight="Bold"/>
-                        <TextBlock Text="澳云数智" FontSize="30" Foreground="White" FontWeight="Bold"/>--><!--
+                        -->
+                    <!--<TextBlock Text="AUCMA" FontSize="50" Foreground="Red" FontWeight="Bold"/>
+                        <TextBlock Text="澳云数智" FontSize="30" Foreground="White" FontWeight="Bold"/>-->
+                    <!--
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition/>
@@ -48,7 +52,7 @@
                         </Grid>
                     </StackPanel>-->
                     <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <TextBlock Text="澳柯玛生产控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
+                        <TextBlock Text="澳柯玛组装生产控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
                     </StackPanel>
 
                     <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
@@ -64,12 +68,12 @@
                         </Grid>
                     </StackPanel>
                 </Grid>
-                
+
             </Border>
             <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,25,2,2">
                 <ContentControl Content="{Binding UserContent}"/>
             </Border>
-            <Border Grid.Row="2" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="6,2,6,7">
+            <Border Grid.Row="2" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="6,2,6,7" Grid.RowSpan="2">
                 <Border.Effect>
                     <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
                 </Border.Effect>
@@ -78,17 +82,16 @@
                         <ColumnDefinition Width="2*"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
+                  
                     <StackPanel Grid.Column="0" VerticalAlignment="Center"  HorizontalAlignment="Left" Orientation="Horizontal">
-                        <Button Content="入库监控" x:Name="instoreInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=instoreInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
-                        <Button Content="出库监控" x:Name="outstoreInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=outstoreInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
-                        <Button Content="任务列表" x:Name="taskInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=taskInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
-                        <Button Content="实时库存" x:Name="inventoryInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=inventoryInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
-                        <Button Content="生产计划" x:Name="assemblyPlan"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=assemblyPlan}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
-                        <!--<Button Content="日  志" x:Name="logInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=logInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>-->
-                        <!--<Button Content="记  录" x:Name="record"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=record}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>-->
-                        <Button Content="键  盘"  Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
-                        <Button Content="最小化" x:Name="Minimized"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource  BUTTON_AGREE}"  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}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
+                        <Button Content="入库监控" x:Name="instoreInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=instoreInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/>
+                        <Button Content="出库监控" x:Name="outstoreInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=outstoreInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/>
+                        <Button Content="任务列表" x:Name="taskInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=taskInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/>
+                        <Button Content="实时库存" x:Name="inventoryInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=inventoryInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/>
+                        <Button Content="生产计划" x:Name="assemblyPlan"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=assemblyPlan}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/>
+                        <Button Content="键  盘"  Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/>
+                        <Button Content="最小化" x:Name="Minimized"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="5 0"/>
+                        <Button Content="退  出" x:Name="Exit"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#FF0033" BorderBrush="#FF0033" Margin="5 0"/>
                     </StackPanel>
 
                     <StackPanel Grid.Column="1" VerticalAlignment="Center"  HorizontalAlignment="Right" Orientation="Horizontal">
@@ -185,7 +188,7 @@
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
-                            
+
                             <StackPanel Grid.Column="0">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
@@ -247,7 +250,7 @@
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>
-                            
+
                             <StackPanel Grid.Column="2">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
@@ -282,10 +285,10 @@
 
                     </StackPanel>
                 </Grid>
-                
-                
+
+
             </Border>
         </Grid>
     </Border>
-    
+
 </Window>
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
index 4064285f..9c687dae 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
@@ -6,11 +6,74 @@
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
-             mc:Ignorable="d" 
-            d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
-    <Control.Resources>
+             mc:Ignorable="d"  
+            d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC"   >
+  
+    <UserControl.Resources>
         <local1:PlanStatusConverter x:Key="PlanStatusConverter" />
-    </Control.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
+        </Style>
+        <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="5,5">
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -54,28 +117,28 @@
                                     <RowDefinition/>
                                 </Grid.RowDefinitions>
                                 <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="工位名称" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding StationName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBlock Text="工位名称" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding StationName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="订单编号" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding OrderCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBlock Text="订单编号" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding OrderCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="计划编号" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding PlanCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBlock Text="计划编号" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding PlanCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="3" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="产品型号" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding ProductModel}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBlock Text="产品型号" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding ProductModel}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="4" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="开始时间" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding BeginTime}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBlock Text="开始时间" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding BeginTime}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                                 </StackPanel>
                             </Grid>
                         </Border>
@@ -178,10 +241,20 @@
                         <Grid Margin="10,10">
                             <lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
                                 <lvc:CartesianChart.AxisX>
-                                    <lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15" Foreground="#0288d1"/>
+                                    <lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15" Foreground="#0288d1">
+                                        <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" Foreground="#0288d1"/>
+                                    <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>
                         </Grid>
@@ -210,24 +283,24 @@
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="6*"/>
-                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="1.3*"/>
                         </Grid.RowDefinitions>
 
                         <DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
                       Foreground="#FFFFFF" >
                             <!--resourceStyle 399行修改选中字体颜色-->
                             <DataGrid.Columns>
-                                <DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="1*" IsReadOnly="True"/>
+                                <DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <!--<DataGridTextColumn Binding="{Binding productPlanCode}" Header="生产计划" Width="1*" IsReadOnly="True"/>-->
-                                <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="1*" IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding beginTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding executeStatus,Converter={StaticResource PlanStatusConverter}}" Header="执行状态" Width="1*" IsReadOnly="True"/>
+                                <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding beginTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding executeStatus,Converter={StaticResource PlanStatusConverter}}" Header="执行状态" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <!--<DataGridTextColumn Binding="{Binding endTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="完成时间" Width="1*" IsReadOnly="True"/>-->
                                 <!--<DataGridTextColumn Binding="{Binding createdTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True"/>-->
                                 <DataGridTemplateColumn Header="操作" Width="2*">
@@ -249,13 +322,13 @@
                         <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0,0,0,1">
                             <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0">
 
-                                <TextBlock Text="执行方式" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
+                                <TextBlock Text="执行方式" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
                                 <ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
                                     <ComboBoxItem Content="手动" IsSelected="True"/>
                                     <ComboBoxItem Content="自动" />
                                 </ComboBox>
-                                <Button Content="计划创建"  Command="{Binding PlanInfoEditCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA"  Width="80" Height="30"  Margin="20,0,0,0"/>
-                                <Button Content="物料库存"  Command="{Binding MaterialStatisticsCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA"  Width="80" Height="30"  Margin="20,0,0,0"/>
+                                <Button Content="计划创建"  Command="{Binding PlanInfoEditCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40"  BorderThickness="1"  />
+                                <Button Content="物料库存"  Command="{Binding MaterialStatisticsCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40"  BorderThickness="1"  />
                             </StackPanel>
                         </Border>
                     </Grid>
@@ -284,10 +357,20 @@
                     <Grid Margin="10,10">
                         <lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}">
                             <lvc:CartesianChart.AxisX>
-                                <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15" Foreground="#0288d1"/>
+                                <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15" Foreground="#0288d1">
+                                    <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" Foreground="#0288d1"/>
+                                <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>
                     </Grid>
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
index 7d7bb181..0cee6b13 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
         xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
         mc:Ignorable="d"
-        Title="MES生产计划" Height="650" Width="900" Name="window" Background="White"
+        Title="MES生产计划" Height="650" Width="900" Name="window" Background="#1152AC"   
         ResizeMode="NoResize" >
 
     <Border Margin="5" Background="#1254AB" CornerRadius="10">
@@ -26,12 +26,12 @@
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
-                        <TextBlock Text="工单编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
+                        <TextBlock Text="工单编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
+                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
                         <!--resourceStyle 413行修改边框颜色-->
-                        <Button Content="查    询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30"  Width="80" />
-                        <Button Content="重    置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
-                        <Button Content="配    置" Command="{Binding SearchCriteriaSetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
+                        <Button Content="查    询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40"  BorderThickness="1"  />
+                        <Button Content="重    置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40"  BorderThickness="1"  />
+                        <Button Content="配    置" Command="{Binding SearchCriteriaSetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40"  BorderThickness="1"  />
                     </StackPanel>
 
                     <Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="0" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,0,0,0">
@@ -43,7 +43,7 @@
                                 <ColumnDefinition Width="2*"/>
                                 <ColumnDefinition Width="15*"/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0" Text="产品型号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15"/>
+                            <TextBlock Grid.Column="0" Text="产品型号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
                             <ItemsControl Grid.Column="1"  ItemsSource="{Binding Configurations}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
@@ -57,7 +57,7 @@
                                         Command="{Binding DataContext.RadioButtonCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" 
                                         CommandParameter="{Binding}" 
                                         GroupName="MaterialTypeRadioButton"
-                                        Margin="20,10" FontSize="15" Foreground="#FFFFFF"/>
+                                        Margin="20,10" FontSize="20" Foreground="#FFFFFF"/>
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>
@@ -74,7 +74,7 @@
                     <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
                 </Border.Effect>
                 <DataGrid Name="dataGrid" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
@@ -101,12 +101,12 @@
                         <RowDefinition/>
                     </Grid.RowDefinitions>
                     <!--<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
-                        <TextBlock Text="计划编号" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox FontSize="15" Text="{Binding ProductPlanCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
-                        <TextBlock Text="产品型号" FontSize="15" Foreground="#FFFFFF"/>
-                        <TextBox FontSize="15" Text="{Binding MaterialCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
-                        <TextBlock Text="下达数量" FontSize="15" Foreground="#FFFFFF"/>
-                        <TextBox FontSize="15" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="30" Margin="5,0,10,0"/>
+                        <TextBlock Text="计划编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
+                        <TextBox FontSize="20" Text="{Binding ProductPlanCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBlock Text="产品型号" FontSize="20" Foreground="#FFFFFF"/>
+                        <TextBox FontSize="20" Text="{Binding MaterialCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBlock Text="下达数量" FontSize="20" Foreground="#FFFFFF"/>
+                        <TextBox FontSize="20" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="30" Margin="5,0,10,0"/>
                     </StackPanel>-->
                     <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
                         <!--<Button Content="计划下达" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="white" Margin="20,0,50,0" Height="30" Width="80" />-->
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
index ae8d86bc..37ef81e1 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
@@ -33,25 +33,25 @@
                     </Grid.RowDefinitions>
 
                     <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="计划编号" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox x:Name="planCode" FontSize="15" Text="{Binding PlanInfo.planCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBlock Text="计划编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
+                        <TextBox x:Name="planCode" FontSize="20" Text="{Binding PlanInfo.planCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
                     <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="工单编号" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox x:Name="orderCode" FontSize="15" Text="{Binding PlanInfo.orderCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBlock Text="工单编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
+                        <TextBox x:Name="orderCode" FontSize="20" Text="{Binding PlanInfo.orderCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
                     <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="产品型号" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox x:Name="materialCode" FontSize="15" Text="{Binding PlanInfo.materialName}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBlock Text="产品型号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
+                        <TextBox x:Name="materialCode" FontSize="20" Text="{Binding PlanInfo.materialName}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
                     <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="计划数量" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox FontSize="15" Text="{Binding PlanInfo.planAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBlock Text="计划数量" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
+                        <TextBox FontSize="20" Text="{Binding PlanInfo.planAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
 
                     <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="完成数量" FontSize="15" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox FontSize="15" Text="{Binding PlanInfo.completeAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBlock Text="完成数量" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
+                        <TextBox FontSize="20" Text="{Binding PlanInfo.completeAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
                 </Grid>
             </Border>
@@ -68,7 +68,7 @@
                         <RowDefinition Height="2*"/>
                     </Grid.RowDefinitions>
                     <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="下达数量" FontSize="15" Foreground="#FFFFFF" Height="40" Margin="10,0,0,0"/>
+                        <TextBlock Text="下达数量" FontSize="20" Foreground="#FFFFFF" Height="40" Margin="10,0,0,0"/>
                         <TextBox x:Name="TransmitAmount" FontSize="18" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="40" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
 
@@ -95,14 +95,14 @@
                             <Button Grid.Row="2" Grid.Column="1" Content="8" FontSize="18" Margin="2,2" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Foreground="white" BorderBrush="#007DFA" Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" />
                             <Button Grid.Row="2" Grid.Column="2" Content="9" FontSize="18" Margin="2,2" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Foreground="white" BorderBrush="#007DFA" Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" />
                             <Button Grid.Row="3" Grid.Column="0" Content="0" FontSize="18" Margin="2,2" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Foreground="white" BorderBrush="#007DFA" Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" />
-                            <Button Grid.Row="3" Grid.Column="2" Content="清除" FontSize="15" Margin="2,2" Style="{StaticResource  BUTTON_AGREE}" Background="#FF9900" Foreground="white" BorderBrush="#FF9900"  Command="{Binding ClearTransmitAmountCommand}"/>
-                            <!--<Button Grid.Row="3" Grid.Column="2" Content="下达" FontSize="15" Margin="2,2" Style="{StaticResource  BUTTON_AGREE}" Background="#FF36B5C1" Foreground="white" BorderBrush="#FF36B5C1"  Command="{Binding PlanInfoTransmitCommand}"/>-->
+                            <Button Grid.Row="3" Grid.Column="2" Content="清除" FontSize="20" Margin="2,2" Style="{StaticResource  BUTTON_AGREE}" Background="#FF9900" Foreground="white" BorderBrush="#FF9900"  Command="{Binding ClearTransmitAmountCommand}"/>
+                            <!--<Button Grid.Row="3" Grid.Column="2" Content="下达" FontSize="20" Margin="2,2" Style="{StaticResource  BUTTON_AGREE}" Background="#FF36B5C1" Foreground="white" BorderBrush="#FF36B5C1"  Command="{Binding PlanInfoTransmitCommand}"/>-->
                         </Grid>
                     </Border>
 
                     <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <Button Content="计划下达" FontSize="15" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0"  Height="50" Width="100" />
-                        <Button Content="取    消" FontSize="15" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource  BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" />
+                        <Button Content="计划下达" FontSize="20" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0"  Height="50" Width="100" />
+                        <Button Content="取    消" FontSize="20" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource  BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" />
                     </StackPanel>
                 </Grid>
             </Border>
diff --git a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
index ce014b5c..b307658d 100644
--- a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
@@ -6,11 +6,74 @@
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InStoreInfo"
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
-             mc:Ignorable="d" 
-             d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
-    <Control.Resources>
+             mc:Ignorable="d" Background="#1152AC"   
+             d:DesignHeight="750" d:DesignWidth="1920" >
+
+    <UserControl.Resources>
         <local1:TaskStatusConverter x:Key="TaskStatusConverter" />
-    </Control.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
+        </Style>
+        <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="5,5">
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -57,18 +120,18 @@
                                     <ColumnDefinition/>
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="箱壳物料条码：" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding ShellMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBlock Text="箱壳物料条码：" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox   FontSize="20" Text="{Binding ShellMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="箱壳物料名称：" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding ShellMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBlock Text="箱壳物料名称：" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding ShellMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="箱壳入库货道：" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding ShellSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBlock Text="箱壳入库货道：" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding ShellSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
                             </Grid>
                         </Border>
@@ -84,18 +147,18 @@
                                     <ColumnDefinition/>
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="内胆物料条码：" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding LinerMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBlock Text="内胆物料条码：" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding LinerMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="内胆物料名称：" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding LinerMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBlock Text="内胆物料名称：" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding LinerMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="内胆入库货道：" FontSize="15" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="15" Text="{Binding LinerSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBlock Text="内胆入库货道：" FontSize="20" Foreground="#FFFFFF"/>
+                                    <TextBox FontSize="20" Text="{Binding LinerSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
                             </Grid>
                         </Border>
@@ -126,10 +189,20 @@
                     <Grid Margin="10,10">
                         <lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
                             <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>
                     </Grid>
@@ -144,40 +217,40 @@
             </Border.Effect>
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="1.2*"/>
                     <RowDefinition Height="6*"/>
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,0">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
-                        <TextBlock Text="物料条码" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15"/>
-                        <TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
+                        <TextBlock Text="物料条码" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
+                        <TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
                         <!--resourceStyle 413行修改边框颜色-->
 
-                        <TextBlock Text="仓库类型" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
-                        <ComboBox Text="{Binding MaterialTypeCombox}" Width="100" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
+                        <TextBlock Text="仓库类型" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
+                        <ComboBox Text="{Binding MaterialTypeCombox}" Width="100" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="20">
                             <ComboBoxItem Content="所有" IsSelected="True"/>
                             <ComboBoxItem Content="箱壳" />
                             <ComboBoxItem Content="内胆" />
                         </ComboBox>
 
-                        <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
-                        <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
+                        <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="36" Width="80" FontSize="20"/>
+                        <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="36" Width="80" FontSize="20" />
                     </StackPanel>
                 </Border>
                 <DataGrid Grid.Row="1" Name="DG" ItemsSource="{Binding InstoreTask}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
                       Foreground="#FFFFFF" >
                     <!--resourceStyle 399行修改选中字体颜色-->
                     <DataGrid.Columns>
-                        <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="1.5*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding spaceCode}" Header="入库货道" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="入库状态" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="任务时间" Width="*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="1.5*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding spaceCode}" Header="入库货道" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="入库状态" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="任务时间" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                     </DataGrid.Columns>
                 </DataGrid>
             </Grid>
@@ -196,7 +269,7 @@
 
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
-                    <TextBlock Text="系统日志" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    <TextBlock Text="系统监控" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                 </Border>
 
                 <!--日志信息-->
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml b/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
index d4ae26c9..a9b2f4ca 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
@@ -4,16 +4,16 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
-             mc:Ignorable="d" 
-             d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
+             mc:Ignorable="d" Background="#1152AC"   
+             d:DesignHeight="750" d:DesignWidth="1920" >
     <Grid Margin="5,5">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="14*"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
-            <Button Content="箱壳库" x:Name="shellInventory"  Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=shellInventory}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
-            <Button Content="内胆库" x:Name="linerInventory"  Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=linerInventory}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+            <Button Content="箱壳库" x:Name="shellInventory"  Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=shellInventory}" Style="{StaticResource  BUTTON_AGREE}"  FontSize="18" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
+            <Button Content="内胆库" x:Name="linerInventory"  Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=linerInventory}" Style="{StaticResource  BUTTON_AGREE}"  FontSize="18" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
         </StackPanel>
 
         <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2">
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
index a59179de..08170b31 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
@@ -5,11 +5,74 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo" 
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.LinerInventory"
-             mc:Ignorable="d" 
+             mc:Ignorable="d" Background="#1152AC"   
              d:DesignHeight="450" d:DesignWidth="800">
-    <Control.Resources>
+  
+    <UserControl.Resources>
         <local1:StatusLabelConverter x:Key="StatusLabelConverter" />
-    </Control.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
+        </Style>
+        <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="5,5">
         <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
@@ -177,20 +240,20 @@
                             <RowDefinition Height="13*"/>
                         </Grid.RowDefinitions>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="15"/>
+                            <TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="20"/>
                         </StackPanel>
 
                         <DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent" 
-                              FontSize="15" ColumnHeaderHeight="35" 
+                              FontSize="20" ColumnHeaderHeight="35" 
                               RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                               GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                               ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
                               Foreground="#FFFFFF" >
                             <!--resourceStyle 399行修改选中字体颜色-->
                             <DataGrid.Columns>
-                                <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*"  IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True"/>
+                                <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*"  IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
                             </DataGrid.Columns>
                         </DataGrid>
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
index f4ec0e56..29fbdbd2 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
@@ -4,8 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
-        mc:Ignorable="d"
-        Title="物料库存统计" Height="650" Width="1000" Name="window" Background="White"
+        mc:Ignorable="d" Background="#1152AC"   
+        Title="物料库存统计" Height="650" Width="1000" Name="window" 
         ResizeMode="NoResize" >
     <Border Margin="5" Background="#1254AB" CornerRadius="10">
         <Border.Effect>
@@ -32,11 +32,11 @@
                         <RowDefinition Height="13*"/>
                     </Grid.RowDefinitions>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="箱 壳 库 库 存" Foreground="#FFFFFF" FontSize="15"/>
+                        <TextBlock Text="箱 壳 库 库 存" Foreground="#FFFFFF" FontSize="20"/>
                     </StackPanel>
 
                     <DataGrid Grid.Row="1" ItemsSource="{Binding ShellMaterialStockDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
@@ -62,11 +62,11 @@
                         <RowDefinition Height="13*"/>
                     </Grid.RowDefinitions>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="内 胆 库 库 存" Foreground="#FFFFFF" FontSize="15"/>
+                        <TextBlock Text="内 胆 库 库 存" Foreground="#FFFFFF" FontSize="20"/>
                     </StackPanel>
 
                     <DataGrid Grid.Row="1" ItemsSource="{Binding LinerMaterialStockDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
@@ -91,11 +91,11 @@
                         <RowDefinition Height="13*"/>
                     </Grid.RowDefinitions>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="泡 前 库 库 存" Foreground="#FFFFFF" FontSize="15"/>
+                        <TextBlock Text="泡 前 库 库 存" Foreground="#FFFFFF" FontSize="20"/>
                     </StackPanel>
 
                     <DataGrid Grid.Row="1" ItemsSource="{Binding FoamBeforeMaterialStockDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
@@ -120,7 +120,7 @@
                         <RowDefinition Height="13*"/>
                     </Grid.RowDefinitions>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="发 泡 夹 具 状 态" Foreground="#FFFFFF" FontSize="15"/>
+                        <TextBlock Text="发 泡 夹 具 状 态" Foreground="#FFFFFF" FontSize="20"/>
                     </StackPanel>
 
                 </Grid>
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
index 18ee2811..66d578a7 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
@@ -6,10 +6,73 @@
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo" 
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.ShellInventory"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" Background="Transparent">
-    <Control.Resources>
+             d:DesignHeight="450" d:DesignWidth="800" Background="#1152AC"   >
+   
+    <UserControl.Resources>
         <local1:StatusLabelConverter x:Key="StatusLabelConverter" />
-    </Control.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
+        </Style>
+        <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="5,5">
 
         <Grid.RowDefinitions>
@@ -178,20 +241,20 @@
                             <RowDefinition Height="13*"/>
                         </Grid.RowDefinitions>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="15"/>
+                            <TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="20"/>
                         </StackPanel>
 
                         <DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent" 
-                              FontSize="15" ColumnHeaderHeight="35" 
+                              FontSize="20" ColumnHeaderHeight="35" 
                               RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                               GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                               ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
                               Foreground="#FFFFFF" >
                             <!--resourceStyle 399行修改选中字体颜色-->
                             <DataGrid.Columns>
-                                <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*"  IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True"/>
+                                <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*"  IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
                             </DataGrid.Columns>
                         </DataGrid>
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
index d5875c15..e4b280bd 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
@@ -4,9 +4,9 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
-        mc:Ignorable="d"
+        mc:Ignorable="d" Background="#1152AC"   
         Title="{Binding TitleName}" Height="450" Width="800" Name="window" ResizeMode="NoResize" >
-    <Border Margin="5" Background="White" CornerRadius="10">
+    <Border Margin="5" Background="#1152AC"    CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
         </Border.Effect>
@@ -18,21 +18,21 @@
             </Grid.RowDefinitions>
             <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
-                    <TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="Gray" FontSize="15"/>
-                    <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
+                    <TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="Gray" FontSize="20"/>
+                    <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
                     <!--resourceStyle 413行修改边框颜色-->
-                    <TextBlock Text="物料名称" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
-                    <TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding MaterialNameSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
+                    <TextBlock Text="物料名称" VerticalAlignment="Center" Foreground="Gray" FontSize="20" Margin="20,0,0,0"/>
+                    <TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding MaterialNameSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
 
 
-                    <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30"  Width="80" />
-                    <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
+                    <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" FontSize="18" Width="80" />
+                    <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" FontSize="18" Width="80" />
                 </StackPanel>
             </Border>
             <!--计划列表-->
             <Border Grid.Row="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
                 <DataGrid Name="dataGrid" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
@@ -50,7 +50,7 @@
             </Border>
 
             <Border Grid.Row="2" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5" VerticalAlignment="Center" HorizontalAlignment="Right">
-                <Button Content="关    闭" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource  BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="30" BorderBrush="#FF9900" Width="80" />
+                <Button Content="关    闭" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource  BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="40" BorderBrush="#FF9900" FontSize="18" Width="80" />
             </Border>
         </Grid>
     </Border>
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml b/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
index 08850257..5673d726 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
@@ -57,7 +57,7 @@
                         <TextBlock Text="型号" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Border>
                     <Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
-                        <TextBlock Text="8307501015，SC-349，雪王爱喝水" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <TextBlock Text="8307501015，SC-349，雪王爱喝水" FontSize="20" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Border>
                 </Grid>
             </Border>
diff --git a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
index 5fbff062..c20bf021 100644
--- a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
@@ -6,10 +6,72 @@
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.OutStoreInfo"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
              mc:Ignorable="d" 
-              d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
-    <Control.Resources>
+              d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC"   >
+    <UserControl.Resources>
         <local1:TaskStatusConverter x:Key="TaskStatusConverter" />
-    </Control.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
+        </Style>
+        <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="5,5">
         <Grid.RowDefinitions>
             <RowDefinition/>
@@ -57,18 +119,18 @@
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
                                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                            <TextBlock Text="箱壳物料条码：" FontSize="15" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="15" Text="{Binding ShellMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBlock Text="箱壳物料条码：" FontSize="20" Foreground="#FFFFFF"/>
+                                            <TextBox FontSize="20" Text="{Binding ShellMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
 
                                         <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                            <TextBlock Text="箱壳物料名称：" FontSize="15" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="15" Text="{Binding ShellMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBlock Text="箱壳物料名称：" FontSize="20" Foreground="#FFFFFF"/>
+                                            <TextBox FontSize="20" Text="{Binding ShellMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
 
                                         <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                            <TextBlock Text="箱壳入库货道：" FontSize="15" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="15" Text="{Binding ShellSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBlock Text="箱壳入库货道：" FontSize="20" Foreground="#FFFFFF"/>
+                                            <TextBox FontSize="20" Text="{Binding ShellSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
                                     </Grid>
                                 </Border>
@@ -84,18 +146,18 @@
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
                                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                            <TextBlock Text="内胆物料条码：" FontSize="15" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="15" Text="{Binding LinerMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBlock Text="内胆物料条码：" FontSize="20" Foreground="#FFFFFF"/>
+                                            <TextBox FontSize="20" Text="{Binding LinerMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
 
                                         <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                            <TextBlock Text="内胆物料名称：" FontSize="15" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="15" Text="{Binding LinerMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBlock Text="内胆物料名称：" FontSize="20" Foreground="#FFFFFF"/>
+                                            <TextBox FontSize="20" Text="{Binding LinerMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
 
                                         <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                            <TextBlock Text="内胆入库货道：" FontSize="15" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="15" Text="{Binding LinerSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBlock Text="内胆入库货道：" FontSize="20" Foreground="#FFFFFF"/>
+                                            <TextBox FontSize="20" Text="{Binding LinerSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
                                     </Grid>
                                 </Border>
@@ -121,7 +183,7 @@
 
                         </Grid.RowDefinitions>
                         <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
-                            <TextBlock Text="系统日志" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="系统监控" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Border>
                         <ListBox Grid.Row="1" x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" FontSize="15" Foreground="#FFFFFF" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
                     </Grid>
@@ -137,7 +199,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1.2*"/>
                     <RowDefinition Height="9*"/>
                     
                 </Grid.RowDefinitions>
@@ -146,14 +208,14 @@
                 </Border>
                 <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
-                        <TextBlock Text="任务编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding TaskCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
+                        <TextBlock Text="任务编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
+                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding TaskCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
 
-                        <TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
+                        <TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
+                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
 
-                        <TextBlock Text="计划编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="15" Margin="20,0,0,0"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding PlanCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
+                        <TextBlock Text="计划编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
+                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding PlanCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
 
                         <!--<TextBlock Text="产品型号" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
                         <ComboBox Text="{Binding MaterialTypeCombox}" Width="150" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
@@ -162,25 +224,25 @@
                             <ComboBoxItem Content="SC485" />
                         </ComboBox>-->
 
-                        <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
-                        <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30"  Width="80" />
+                        <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White"  Margin="20,0,0,0" Height="36" Width="80" FontSize="20"/>
+                        <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White"  Margin="20,0,0,0" Height="36" Width="80" FontSize="20"/>
                     </StackPanel>
                 </Border>
                 <DataGrid Grid.Row="2" Name="DG" ItemsSource="{Binding OutstoreTask}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
                       Foreground="#FFFFFF" >
                     <!--resourceStyle 399行修改选中字体颜色-->
                     <DataGrid.Columns>
-                        <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding spaceName}" Header="出库货道" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="出库状态" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm:ss\}}" Header="开始时间" Width="*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding spaceName}" Header="出库货道" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="出库状态" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm:ss\}}" Header="开始时间" Width="*" IsReadOnly="True" />
                         <DataGridTemplateColumn Header="操作" Width="*">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
diff --git a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
index b5908209..3d56926f 100644
--- a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
@@ -6,19 +6,82 @@
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.TaskInfo"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
              mc:Ignorable="d" 
-             d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
-    <Control.Resources>
+             d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC"   >
+   
+    <UserControl.Resources>
         <local1:TaskStatusConverter x:Key="TaskStatusConverter" />
         <local1:TaskTypeConverter x:Key="TaskTypeConverter"/>
-    </Control.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
+        </Style>
+        <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="5,5">
         <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="1.3*"/>
             <RowDefinition Height="14*"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
-            <Button Content="入库任务" x:Name="inStore"  Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=inStore}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
-            <Button Content="出库任务" x:Name="outStore"  Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=outStore}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+            <Button Content="入库任务" x:Name="inStore"  Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=inStore}" Style="{StaticResource  BUTTON_AGREE}" FontSize="20" Width="100" Height="42" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
+            <Button Content="出库任务" x:Name="outStore"  Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=outStore}" Style="{StaticResource  BUTTON_AGREE}" FontSize="20" Width="100" Height="42" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
         </StackPanel>
 
         <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">
@@ -33,23 +96,23 @@
                         <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
                     </Border.Effect>
                     <DataGrid ItemsSource="{Binding TaskInfoDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
                      Foreground="#FFFFFF" >
                         <!--resourceStyle 399行修改选中字体颜色-->
                         <DataGrid.Columns>
-                            <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding taskType,Converter={StaticResource TaskTypeConverter}}" Header="任务类型" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding materialType}" Header="物料型号" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding storeCode}" Header="仓库" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding spaceName}" Header="货道" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="创建时间" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm\}}" Header="执行时间" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="状态" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding taskType,Converter={StaticResource TaskTypeConverter}}" Header="任务类型" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding materialType}" Header="物料型号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding storeCode}" Header="仓库" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding spaceName}" Header="货道" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="创建时间" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm\}}" Header="执行时间" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                            <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="状态" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                         </DataGrid.Columns>
                     </DataGrid>
                 </Border>
@@ -59,7 +122,7 @@
                         <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
                     </Border.Effect>
                     <DataGrid ItemsSource="{Binding RecordInfoDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                      FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" 
diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
index 32708319..97bf8904 100644
--- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
@@ -8,11 +8,13 @@ using HighWayIot.Common;
 using HighWayIot.Config;
 using LiveCharts;
 using LiveCharts.Wpf;
+using MySqlX.XDevAPI.Relational;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
+using System.Windows.Media;
 
 namespace Aucma.Scada.UI.viewModel.AssemblyPlan
 {
@@ -431,6 +433,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
                     materialColumn.DataLabels = true;
                     materialColumn.Title = "型号";
                     materialColumn.Values = materialAchievement;
+                    materialColumn.Foreground = Brushes.White;
                     ModelStatistics.Add(materialColumn);
                 }
             }));
@@ -459,6 +462,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
                     houeColumn.DataLabels = true;
                     houeColumn.Title = "小时产量";
                     houeColumn.Values = hourAchievement;
+                    houeColumn.Foreground = Brushes.White;
                     Achievement.Add(houeColumn);
                 }
             }));
diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
index 0b07c11e..df912e9d 100644
--- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
@@ -8,6 +8,7 @@ using HighWayIot.Log4net;
 using LiveCharts;
 using LiveCharts.Wpf;
 using MySqlX.XDevAPI.Common;
+using MySqlX.XDevAPI.Relational;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -301,7 +302,6 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
             MaterialNameList = new List<string>();
             List<dynamic> info = inStoreBusiness.GetMaterialStock();
 
-
             App.Current.Dispatcher.BeginInvoke((Action)(() =>
             {
                 if (info != null)
@@ -319,11 +319,12 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
                 shellColumn.DataLabels = true;
                 shellColumn.Title = "箱壳";
                 shellColumn.Values = shellAchievement;
-               
+                shellColumn.Foreground = Brushes.White;
                 var linerColumn = new ColumnSeries();
                 linerColumn.DataLabels = true;
                 linerColumn.Title = "内胆";
                 linerColumn.Values = linerAchievement;
+                linerColumn.Foreground = Brushes.White;
                 linerColumn.Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226));
                 Achievement.Add(shellColumn);
                 Achievement.Add(linerColumn);
diff --git a/Aucma.Scada.UI/viewModel/MainViewModel.cs b/Aucma.Scada.UI/viewModel/MainViewModel.cs
index 94b536be..81c21dff 100644
--- a/Aucma.Scada.UI/viewModel/MainViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/MainViewModel.cs
@@ -8,6 +8,7 @@ using GalaSoft.MvvmLight.Command;
 using HighWayIot.Log4net;
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Windows;
 
 namespace Aucma.Scada.UI.viewModel
@@ -139,11 +140,23 @@ namespace Aucma.Scada.UI.viewModel
         {
             try
             {
-                Process proc = new Process();
-                proc.StartInfo.FileName = @"C:\Windows\System32\osk.exe";
-                proc.StartInfo.UseShellExecute = true;
-                proc.StartInfo.Verb = "runas";
-                proc.Start();
+                var commonFilesPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonProgramFiles);
+                //程序集目标平台为X86时，获取到的是x86的Program Files，但TabTip.exe始终在Program Files目录下
+                if (commonFilesPath.Contains("Program Files (x86)"))
+                {
+                    commonFilesPath = commonFilesPath.Replace("Program Files (x86)", "Program Files");
+                }
+                string tabTipPath = Path.Combine(commonFilesPath, @"microsoft shared\ink\TabTip.exe");
+                if (File.Exists(tabTipPath))
+                {
+                    ProcessStartInfo psi = new ProcessStartInfo
+                    {
+                        FileName = tabTipPath,
+                        UseShellExecute = true,
+                        CreateNoWindow = true
+                    };
+                    Process.Start(psi);
+                }
 
 
             }