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

ViewModel/MainWindowViewModel.cs

@@ -282,7 +282,8 @@ namespace DyeingComputer.ViewModel
         void Tick_Event_5S(object sender, EventArgs e)//Tick_Event周期执行事件5S
         {
             if (!LINK_OK) Modbus_link();
-            Chart();//写入记录
+
+            if(WORK_RUN !=0) Chart();//写入记录
 
             if (string.IsNullOrEmpty(Name_err.ToString()) && ((Selet_dtm("1010") < 1) || (Selet_dtm("1010") > 160)))
             { Name_err = Resources.Temperature + Resources.Sensor + Resources.Malfunction; } //温度故障提示
@@ -1377,7 +1378,7 @@ namespace DyeingComputer.ViewModel
                 }//清除输出状态
                 if (string.IsNullOrEmpty(Name_err.ToString()))
                 {
-                    WorkNumder = "----------";
+                    //WorkNumder = "----------";
                     int TIMEH = DIDETime / 3600;
                     int TIMEM = (DIDETime - TIMEH * 3600) / 60;
                     int TIMES = DIDETime - TIMEH * 3600 - TIMEM * 60;