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

ViewModel/MainWindowViewModel.cs

@@ -72,7 +72,7 @@ namespace DyeingComputer.ViewModel
             SQL_data();   //读数据库
             UPort();    //启动串口
             CountDown();   //启动循环任务
-            AsyncTcpServer.Main();
+             AsyncTcpServer.Main();
         }
         DataTable dt_con = new DataTable();
         DataTable dt_sys = new DataTable();
@@ -212,6 +212,7 @@ namespace DyeingComputer.ViewModel
         public static int ViewID = 0;//页面id
 
         public static object Name_err = "";
+        public static object SYSTime;
         public static object WorkNumder;
         public static object Process_step;
         public static Int32 DIDETime;  //空闲计时器
@@ -242,7 +243,8 @@ namespace DyeingComputer.ViewModel
         }//时间周期初始化
         void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
         {
-            Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            SYSTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            Sys_Time = SYSTime.ToString();
             Work_Temp = Selet_dtm("1010") + "  ℃";
             Work_Numder = WorkNumder.ToString();
 
@@ -320,10 +322,10 @@ namespace DyeingComputer.ViewModel
         private static double STEP_P5 = 0;
         private static bool SETP_runtime = false; //步骤开始
         private static bool STEP_finish = false; //步骤结束
-        private static int STEP_TIME = 0; //步骤计时S
-        private static int THL_mode = 0; //温控模式 0保温 1加热 2降
-        private static double TEMP_co = 0.5; //计算温度
-        private static double TEMP_tar = 0.5; //目标温度
+        public static int STEP_TIME = 0; //步骤计时S
+        public static int THL_mode = 0; //温控模式 0保温 1加热 2降
+        public static double TEMP_co = 0.5; //计算温度
+        public static double TEMP_tar = 0.5; //目标温度
         private bool Alert_yellow = false; //警报黄灯
         private bool Alert_red = false; //警报红灯
         private bool Alert_bell = false; //警报铃声
@@ -651,6 +653,7 @@ namespace DyeingComputer.ViewModel
                                 }
                                 else 
                                 {
+                                    if (temp_time10s == 1) temp_time10s = 2;
                                     if ((temp_time10s <= Convert.ToInt16(TO)/100))
                                     { Updata_dtd("3009", true); }
                                     else { Updata_dtd("3009", false); }//升温
@@ -1360,6 +1363,7 @@ namespace DyeingComputer.ViewModel
                 }//清除输出状态
                 if (string.IsNullOrEmpty(Name_err.ToString()))
                 {
+                    WorkNumder = "----------";
                     int TIMEH = DIDETime / 3600;
                     int TIMEM = (DIDETime - TIMEH * 3600) / 60;
                     int TIMES = DIDETime - TIMEH * 3600 - TIMEM * 60;