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

ViewModel/MainWindowViewModel.cs

@@ -2091,10 +2091,7 @@ namespace DyeingComputer.ViewModel
                     default:
                         break;
                 }
-
             }                    
-          
-            
         }
         public static bool CALL_FR = false;//呼叫状态
         string SK5;

Windows/ViewStep.xaml.cs

@@ -340,10 +340,9 @@ namespace DyeingComputer.Windows
         }
 
 
-        private readonly string[] id_dat = {"001","007","008","013","015" ,"017", "020", "022", "031", "035", 
+        private readonly string[] id_dat = {"001","007","008","013","015" , "020", "022", "031", "035", 
-            "036", "039", "040", "041", "049", "050", "051", "054", "055", "056","064","065","066","067","090",
+            "036", "039", "040", "041", "049", "050", "051", "054", "055", "056","064","065","066","067"};
-            "091","093","094" };
+        private readonly string[] id_datp = {" " ,"017", "050", "051", "064", "066","067","090","091",
-        private readonly string[] id_datp = {" ","015" ,"017", "050", "051", "064", "066","067","090","091",
             "093","094" };
 
         private void Form1_Load()
@@ -353,7 +352,6 @@ namespace DyeingComputer.Windows
             this.boxID.Items.Add(Properties.Resources.AddWater + "(" + Properties.Resources.Flowmeter + ")");//流量进水008
             this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.WaterLevel + ")");//水位水洗013
             this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Overflow + ")");//溢流水洗015
-            this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017
             this.boxID.Items.Add(Properties.Resources.Drainage);//排水020
             this.boxID.Items.Add(Properties.Resources.PumpDrainage);//主泵排水022
             this.boxID.Items.Add(Properties.Resources.RunningTime);//运转031
@@ -372,14 +370,9 @@ namespace DyeingComputer.Windows
             this.boxID.Items.Add(Properties.Resources.AddTheMedicine);//加药065
             this.boxID.Items.Add(Properties.Resources.CallDistribution);//呼叫输送066
             this.boxID.Items.Add(Properties.Resources.CallPreparation);//呼叫准备067
-            this.boxID.Items.Add(Properties.Resources.RapidAcidAddition);//快速加酸090
-            this.boxID.Items.Add(Properties.Resources.PHTemperatureControl);//ph温度控制091
-            this.boxID.Items.Add(Properties.Resources.PHDetection);//ph检测093
-            this.boxID.Items.Add(Properties.Resources.PHControl);//ph控制094
 
 
             this.boxIDp.Items.Add("");//
-            this.boxIDp.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Overflow + ")");//溢流水洗015
             this.boxIDp.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017
             this.boxIDp.Items.Add(Properties.Resources.Pressurized);//加压050
             this.boxIDp.Items.Add(Properties.Resources.Depressurized);//减压051