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

ViewModel/MainWindowViewModel.cs

@@ -62,9 +62,6 @@ namespace DyeingComputer.ViewModel
             CountDown();   //启动循环任务
             SQL_data();   //读数据库
             UPort();    //启动串口
-
-
-    
         }
 
         private static double MT05;//主缸排水延时
@@ -161,6 +158,7 @@ namespace DyeingComputer.ViewModel
         public static object WorkNumder;
         public static object Process_step;
         public static Int32 DIDETime;  //空闲计时器
+        bool ERR_JOG;//故障状态
         void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
         {
             Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
@@ -182,8 +180,6 @@ namespace DyeingComputer.ViewModel
             if (string.IsNullOrEmpty(Name_err.ToString()) && ((Selet_dtm("1010") < 10) || (Selet_dtm("1010") > 160)))
             { Status_Str = Resources.Temperature + Resources.Sensor + Resources.Malfunction; } //温度故障提示
         }
-
-        bool ERR_JOG;
         void DisTimer_100MS(object sender, EventArgs e)//Tick_Event周期执行事件100MS
         {
             if (!string.IsNullOrEmpty(Name_err.ToString()) && (!ERR_JOG)) //有故障信息，无故障保持