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

ViewModel/MainWindowViewModel.cs

@@ -150,7 +150,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         }
         int Time5=0,Time60;
         void Tick_Event_5S()//Tick_Event周期执行事件5S
-        {            
+        {
             for (int i = 0; i < Machinesdata_Count; i++)
             {
                 if (Selet_Machines(Machines, "State", i).ToString() == "801")
@@ -273,6 +273,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         public static DataTable dt_m = new DataTable("M");
         public static DataTable dt_TM = new DataTable();
         public static DataTable dt_TP = new DataTable();
+        public static bool TechnologicalProcess_bool =true;
         private async void DATA_view()//IO显示
         {
             await Task.Run(() =>
@@ -286,7 +287,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 {
                     if (dt_TP.Rows.Count > 0)
                     {
-                        TechnologicalProcess_View = ToObservableCollection<TechnologicalP>(dt_TP);
+                       if(TechnologicalProcess_bool) TechnologicalProcess_View = ToObservableCollection<TechnologicalP>(dt_TP);
                         Sys_machine = MachineLOG;
                     }
                 }
@@ -321,7 +322,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         }
         public ObservableCollection<DATA_M> SYSData_M
         {
-
             get { return sysData_M; }
             set
             {