通风

config/jinfeng/wind_center.json

@@ -8,7 +8,7 @@
         "label":"1号通风机",
         "value":"",
         "state":"",
-        "statie_list":[
+        "run_parameter":[
           {
             "key":"JF.Device1.TFZB2.TFZB_F1_M1FY",
             "label":"截面1负压",
@@ -76,12 +76,6 @@
             "label":"故障信息",
             "unit":"",
             "value":""
-          },
-          {
-            "key":"JF.Device1.TFZB1.TFZB_F1_B1YXZT",
-            "label":"运行状态",
-            "unit":"",
-            "value":""
           }
         ],
         "electric_parameter_2":[
@@ -114,12 +108,6 @@
             "label":"故障信息",
             "unit":"",
             "value":""
-          },
-          {
-            "key":"JF.Device1.TFZB1.TFZB_F1_B2YXZT",
-            "label":"运行状态",
-            "unit":"",
-            "value":""
           }
         ]
       },
@@ -128,7 +116,7 @@
         "label":"2号通风机",
         "value":"",
         "state":"",
-        "statie_list":[
+        "run_parameter":[
           {
             "key":"JF.Device1.TFZB2.TFZB_F2_M1FY",
             "label":"截面1负压",
@@ -196,12 +184,6 @@
             "label":"故障信息",
             "unit":"",
             "value":""
-          },
-          {
-            "key":"JF.Device1.TFZB1.TFZB_F2_B1YXZT",
-            "label":"运行状态",
-            "unit":"",
-            "value":""
           }
         ],
         "electric_parameter_2":[
@@ -234,12 +216,6 @@
             "label":"故障信息",
             "unit":"",
             "value":""
-          },
-          {
-            "key":"JF.Device1.TFZB1.TFZB_F2_B2YXZT",
-            "label":"运行状态",
-            "unit":"",
-            "value":""
           }
         ]
       }

config/jinfeng/wind_north.json

@@ -7,7 +7,7 @@
         "key":"JF.Device1.TFBB.TFBB_YHJZYX",
         "name":"1号通风机",
         "val":"",
-        "statie_list":[
+        "run_parameter":[
           {
             "key":"JF.Device1.TFBB.TFBB_F1_FY",
             "name":"负压",
@@ -198,7 +198,7 @@
         "key":"JF.Device1.TFBB.TFBB_EHJZYX",
         "name":"2号通风机",
         "val":"",
-        "statie_list":[
+        "run_parameter":[
           {
             "key":"JF.Device1.TFBB.TFBB_F2_FY",
             "name":"负压",

jf_wind_center.py

@@ -64,23 +64,42 @@ class jf_wind_center():
 
     # 数据处理
     def data_handle(self, data):
+
         for i in range(len(data)):
             val = data[i]
-            sl = val['statie_list']
+            sl = val['run_parameter']
+            is_run = False
             for j in range(len(sl)):
                 ck = sl[j]['key']
+                name = sl[j]['label']
+                value = self.point_dict[ck]
                 if ck in self.point_dict.keys():
-                    data[i]['statie_list'][j]['value'] = self.point_dict[ck]
+                    data[i]['run_parameter'][j]['value'] = value
+
             ep1 = val['electric_parameter_1']
             for j in range(len(ep1)):
                 ck = ep1[j]['key']
+                name = sl[j]['label']
+                value = self.point_dict[ck]
                 if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_1'][j]['value'] = self.point_dict[ck]
+                    data[i]['electric_parameter_1'][j]['value'] = value
+                if name == '运行状态' and value == True:
+                    data[i]['state'] = 1
+                elif name == '运行状态' and value == False:
+                    data[i]['state'] = 2
+
             ep2 = val['electric_parameter_2']
             for j in range(len(ep2)):
                 ck = ep2[j]['key']
+                name = sl[j]['label']
+                value = self.point_dict[ck]
                 if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_2'][j]['value'] = self.point_dict[ck]
+                    data[i]['electric_parameter_2'][j]['value'] = value
+                if name == '运行状态' and value == True:
+                    data[i]['state'] = 1
+                elif name == '运行状态' and value == False:
+                    data[i]['state'] = 2
+
         self.jdata['sys_point'] = data
 
 

jf_wind_north.py

@@ -66,11 +66,11 @@ class jf_wind_north():
     def data_handle(self, data):
         for i in range(len(data)):
             val = data[i]
-            sl = val['statie_list']
+            sl = val['run_parameter']
             for j in range(len(sl)):
                 ck = sl[j]['key']
                 if ck in self.point_dict.keys():
-                    data[i]['statie_list'][j]['value'] = self.point_dict[ck]
+                    data[i]['run_parameter'][j]['value'] = self.point_dict[ck]
             ep1 = val['electric_parameter_1']
             for j in range(len(ep1)):
                 ck = ep1[j]['key']