.

Aucma.Scada.UI/MainWindow.xaml

@@ -27,7 +27,7 @@
             <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="3*"/>
                         <ColumnDefinition Width="7*"/>
                         <ColumnDefinition Width="3*"/>
                     </Grid.ColumnDefinitions>

Aucma.Scada.UI/MainWindow.xaml.cs

@@ -17,6 +17,15 @@ namespace Aucma.Scada.UI
             InitializeComponent();
             MainViewModel mainViewModel = new MainViewModel();
             this.DataContext = mainViewModel;
+            Closing += PageView_Closing; // 订阅窗口关闭事件
+        }
+
+        private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            this.Hide();
+            //跳转到登录页
+            LoginPageView login = LoginPageView.Instance;
+            login.Show();
         }
     }
 }

Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml

@@ -295,7 +295,7 @@
                             <DataGrid.Columns>
                                 <!--<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.7*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="1.3*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数" Width="0.6*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数" Width="0.6*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding beginTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
@@ -306,10 +306,10 @@
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <StackPanel Orientation="Horizontal">
-                                                <Button Content="上移" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="45" Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
-                                                <Button Content="下移" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="45" Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
-                                                <Button Content="删除" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="45" Command="{Binding DataContext.DeletePlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
-                                                <Button Content="下传" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="45" Command="{Binding DataContext.NextPassCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                                <Button Content="上移" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="60" Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
+                                                <Button Content="下移" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="60" Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                                <Button Content="删除" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="60" Command="{Binding DataContext.DeletePlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                                <Button Content="下传" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="60" Command="{Binding DataContext.NextPassCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
                                             </StackPanel>
                                         </DataTemplate>
                                     </DataGridTemplateColumn.CellTemplate>

Aucma.Scada.UI/obj/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C9C0B416B213CB23B12F2A827E6BCA339149BBFE967CBBC2231BFE724AC24B4F"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CEC8155E9CDD94D48DB05B7846E165FA20893D537FD23F43CB35589BC58004F7"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C9C0B416B213CB23B12F2A827E6BCA339149BBFE967CBBC2231BFE724AC24B4F"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CEC8155E9CDD94D48DB05B7846E165FA20893D537FD23F43CB35589BC58004F7"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "49DCEC69E90C1CE67E335FAD727D9A0EA5BDB91C5A28872F972C85125424550F"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F363F2280D556B7F8B4C24BBED816D43A9E7B34D39AFFBACAF2E36E6E524D7D4"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "49DCEC69E90C1CE67E335FAD727D9A0EA5BDB91C5A28872F972C85125424550F"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F363F2280D556B7F8B4C24BBED816D43A9E7B34D39AFFBACAF2E36E6E524D7D4"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。