Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

View/MonitorView.xaml

@@ -56,6 +56,7 @@
                 <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrder}" Binding="{Binding WorkOrder}" Width="200" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.Dyelot}" Binding="{Binding Dyelot}" Width="200" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.Temperature}" Binding="{Binding Temperature}" Width="100" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.WaterLevel}" Binding="{Binding WaterLevel}" Width="100" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.process}" Binding="{Binding Process}" Width="300" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="300" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.message}" Binding="{Binding Message}" Width="*" IsReadOnly="True"/>

View/MonitorView.xaml.cs

@@ -93,7 +93,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             edit.IsEnabled = false;
             Paused.IsEnabled = false;
             Resume.IsEnabled = false;
-        }
+        }//恢复
         private void ListViewItem_Paused(object sender, MouseButtonEventArgs e)
         {
             if (!string.IsNullOrEmpty(machine))
@@ -106,7 +106,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index) + dat_821.ToJsonString());
 
             }
-        }
+        }//暂停
         private void ListViewItem_Stop(object sender, MouseButtonEventArgs e)
         {
             if (!string.IsNullOrEmpty(machine))
@@ -117,25 +117,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
                 int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
                 MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index)+dat_821.ToJsonString());
-
             }
-        }
+        }//停止
         private void ListViewItem_edit(object sender, MouseButtonEventArgs e)
         {
 
-        }
+        }//编辑
         private void ListViewItem_Jump(object sender, MouseButtonEventArgs e)
         {
 
-        }
+        }//跳步
         private void ListViewItem_Insert(object sender, MouseButtonEventArgs e)
         {
 
-        }
+        }//插入
         private void ListViewItem_Delete(object sender, MouseButtonEventArgs e)
         {
 
-        }
+        }//删除
 
         public void CountDown()
         {
@@ -178,6 +177,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     { 
                         log.Text = null;
                     }
+
                     if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
                     {
                         MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC831" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index));