Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
5621c1e292
2 files changed
+4
-1
No files matched your search
@@ -216,6 +216,7 @@ namespace DyeingComputer.ViewModel
|
||||
public static object Name_err = "";
|
||||
public static object SYSTime;
|
||||
public static object WorkNumder;
|
||||
public static object StatusStr;
|
||||
public static object Process_step;
|
||||
public static Int32 DIDETime; //空闲计时器
|
||||
bool ERR_JOG;//故障状态
|
||||
@@ -249,6 +250,7 @@ namespace DyeingComputer.ViewModel
|
||||
Sys_Time = SYSTime.ToString();
|
||||
Work_Temp = Selet_dtm("1010") + " ℃";
|
||||
Work_Numder = WorkNumder.ToString();
|
||||
StatusStr = Status_Str;
|
||||
|
||||
if (!SETP_runtime) DIDETime++;
|
||||
|
||||
|
||||
Reference in new issue
Block a user