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

UserClass/AsyncTcpClient.cs

@@ -109,16 +109,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                 else if (SYSAPI == "SC831")
                 {
                     DAT = DAT.Substring(DAT.IndexOf("]") + 1);                  
-                    MonitorView.TechnologicalProcess = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化
+                    MainWindowViewModel.dt_TP = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化
                 }
                 else if (SYSAPI == "SC832")
                 {
-                    MonitorView.Sys_log = DAT.Substring(DAT.IndexOf("]") + 1);
+                    MainWindowViewModel.MachineLOG = DAT.Substring(DAT.IndexOf("]") + 1);
                        
                 }//当前细节信息
                 else if (SYSAPI == "SC833")
                 {
-                    MonitorView.Sys_log = DAT.Substring(DAT.IndexOf("]") + 1);
+                    MainWindowViewModel.MachineLOG = DAT.Substring(DAT.IndexOf("]") + 1);
 
                 }//当前领料单信息
                 else if (SYSAPI == "SC851")