diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 98922a6..f6ced2f 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -201,7 +201,8 @@ namespace DyeingComputer.UserClass if (SYSKEY == MainWindowViewModel.SYSKEY) { Dictionary Chart_new = new Dictionary();//缓存函数 - 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("MST", MainWindowViewModel.TEMP_co); Chart_new.Add("MTT", MainWindowViewModel.Selet_dtm("1010")); diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 085c382..ecdb403 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -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++;