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

ViewModel/MainWindowViewModel.cs

@@ -113,13 +113,14 @@ namespace DyeingComputer.ViewModel
              disTimer.Start();//计时开始
         }
 
+        public static object Name_err;
         public static object WorkNumder;
         void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件
         {
             Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
             Work_Temp = "130" + "  ℃";
             Work_Numder = WorkNumder.ToString();
-            Status_Str = "qweqeqwqqfwfqef";
+         //   Status_Str = "qweqeqwqqfwfqef";
 
             if (LINK_OK) Modbus_link();
             IO_data();    
@@ -127,7 +128,7 @@ namespace DyeingComputer.ViewModel
         void Tick_Event_5S(object sender, EventArgs e)//Tick_Event周期执行事件
         {
             if (!LINK_OK) Modbus_link();
-
+            if (Name_err != null) Status_Str = Name_err.ToString();
         }
         void DisTimer_100MS(object sender, EventArgs e)//Tick_Event周期执行事件
         {
@@ -145,7 +146,7 @@ namespace DyeingComputer.ViewModel
             try
             {
                 port.PortName = "COM5";
-                port.BaudRate = 9600;//配置
+                port.BaudRate = 115200;//配置
                 port.DataBits = 8;
                 port.Parity = Parity.None;
                 port.StopBits = StopBits.One;
@@ -178,7 +179,10 @@ namespace DyeingComputer.ViewModel
                 {
                     master.WriteMultipleRegisters(slaveId, startAddress, registers);
                 }
-                catch (Exception ex) { }
+                catch (Exception ex) 
+                {
+                    Name_err = "PLC"+Properties.Resources.Connectionlost;
+                }
             });
         }