sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sc committed 2024-11-27 22:33:13 +08:00
2 parents b9b100d36b 9f80ef1fdd
commit 5621c1e292
2 files changed
+4 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserClass/AsyncTcpServer.cs
+2 -1
View File
@@ -201,7 +201,8 @@ namespace DyeingComputer.UserClass
if (SYSKEY == MainWindowViewModel.SYSKEY) if (SYSKEY == MainWindowViewModel.SYSKEY)
{ {
Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数 Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数
Chart_new.Add("DYELOT", MainWindowViewModel.WorkNumder); Chart_new.Add("Status", MainWindowViewModel.StatusStr);
Chart_new.Add("WorkNumder", MainWindowViewModel.WorkNumder);
Chart_new.Add("Time", MainWindowViewModel.SYSTime); Chart_new.Add("Time", MainWindowViewModel.SYSTime);
Chart_new.Add("MST", MainWindowViewModel.TEMP_co); Chart_new.Add("MST", MainWindowViewModel.TEMP_co);
Chart_new.Add("MTT", MainWindowViewModel.Selet_dtm("1010")); Chart_new.Add("MTT", MainWindowViewModel.Selet_dtm("1010"));
ViewModel/MainWindowViewModel.cs
+2
View File
@@ -216,6 +216,7 @@ namespace DyeingComputer.ViewModel
public static object Name_err = ""; public static object Name_err = "";
public static object SYSTime; public static object SYSTime;
public static object WorkNumder; public static object WorkNumder;
public static object StatusStr;
public static object Process_step; public static object Process_step;
public static Int32 DIDETime; //空闲计时器 public static Int32 DIDETime; //空闲计时器
bool ERR_JOG;//故障状态 bool ERR_JOG;//故障状态
@@ -249,6 +250,7 @@ namespace DyeingComputer.ViewModel
Sys_Time = SYSTime.ToString(); Sys_Time = SYSTime.ToString();
Work_Temp = Selet_dtm("1010") + " ℃"; Work_Temp = Selet_dtm("1010") + " ℃";
Work_Numder = WorkNumder.ToString(); Work_Numder = WorkNumder.ToString();
StatusStr = Status_Str;
if (!SETP_runtime) DIDETime++; if (!SETP_runtime) DIDETime++;