k

config/jinfeng/wind_center.json

@@ -5,7 +5,7 @@
     "sys_point": [
       {
         "key":"",
-        "label":"1号通风机",
+        "title":"1号通风机",
         "value":"",
         "state":"",
         "state_list": [
@@ -13,13 +13,13 @@
             "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
             "label":"1号电机运行状态",
             "unit":"",
-            "value":""
+            "state":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
             "label":"2号电机运行状态",
             "unit":"",
-            "value":""
+            "state":""
           }
         ],
         "run_parameter":[
@@ -115,7 +115,7 @@
       },
       {
         "key":"",
-        "label":"2号通风机",
+        "title":"2号通风机",
         "value":"",
         "state":"",
         "state_list": [
@@ -123,13 +123,13 @@
             "key":"JF.Device1.TFZB1.TFZB_F2_B1YXFK",
             "label":"1号电机运行状态",
             "unit":"",
-            "value":""
+            "state":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1YXFK",
             "label":"2号电机运行状态",
             "unit":"",
-            "value":""
+            "state":""
           }
         ],
         "run_parameter":[

config/jinfeng/wind_north.json

@@ -5,7 +5,7 @@
     "sys_point": [
       {
         "key":"JF.Device1.TFBB.TFBB_YHJZYX",
-        "name":"1号通风机",
+        "title":"1号通风机",
         "state":"",
         "value":"",
         "state_list": [
@@ -13,37 +13,37 @@
             "key":"JF.Device1.TFBB.TFBB_F1_B1YXFK",
             "label":"1号变频运行反馈",
             "unit":"",
-            "value":""
+            "state":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_B2YXFK",
             "label":"2号变频运行反馈",
             "unit":"",
-            "value":""
+            "state":""
           }
         ],
         "run_parameter":[
           {
             "key":"JF.Device1.TFBB.TFBB_F1_FY",
-            "name":"负压",
+            "label":"负压",
             "unit":"Pa",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_QY",
-            "name":"全压",
+            "label":"全压",
             "unit":"Pa",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_FS",
-            "name":"风速",
+            "label":"风速",
             "unit":"m/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_FL",
-            "name":"风量",
+            "label":"风量",
             "unit":"m³/min",
             "val":""
           }
@@ -51,79 +51,79 @@
         "electric_parameter_1":[
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1QZW",
-            "name":"前轴温度",
+            "label":"前轴温度",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1HZW",
-            "name":"后轴温度",
+            "label":"后轴温度",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1RZ1",
-            "name":"定子温度1",
+            "label":"定子温度1",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1RZ2",
-            "name":"定子温度2",
+            "label":"定子温度2",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1RZ3",
-            "name":"定子温度3",
+            "label":"定子温度3",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1XZZ",
-            "name":"水平振动",
+            "label":"水平振动",
             "unit":"mm/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1YZZ",
-            "name":"垂直振动",
+            "label":"垂直振动",
             "unit":"mm/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1SCPL",
-            "name":"输出频率",
+            "label":"输出频率",
             "unit":"Hz",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1SRDY",
-            "name":"输入电压",
+            "label":"输入电压",
             "unit":"kV",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1SRDL",
-            "name":"输入电流",
+            "label":"输入电流",
             "unit":"A",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1SCDY",
-            "name":"输出电压",
+            "label":"输出电压",
             "unit":"kV",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1SCDL",
-            "name":"输出电流",
+            "label":"输出电流",
             "unit":"A",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D1SCGL",
-            "name":"输出功率",
+            "label":"输出功率",
             "unit":"kW",
             "val":""
           }
@@ -131,79 +131,79 @@
         "electric_parameter_2":[
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2QZW",
-            "name":"前轴温度",
+            "label":"前轴温度",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2HZW",
-            "name":"后轴温度",
+            "label":"后轴温度",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2RZ1",
-            "name":"定子温度1",
+            "label":"定子温度1",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2RZ2",
-            "name":"定子温度2",
+            "label":"定子温度2",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2RZ3",
-            "name":"定子温度3",
+            "label":"定子温度3",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2XZZ",
-            "name":"水平振动",
+            "label":"水平振动",
             "unit":"mm/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2YZZ",
-            "name":"垂直振动",
+            "label":"垂直振动",
             "unit":"mm/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2SCPL",
-            "name":"输出频率",
+            "label":"输出频率",
             "unit":"Hz",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2SRDY",
-            "name":"输入电压",
+            "label":"输入电压",
             "unit":"kV",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2SRDL",
-            "name":"输入电流",
+            "label":"输入电流",
             "unit":"A",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2SCDY",
-            "name":"输出电压",
+            "label":"输出电压",
             "unit":"kV",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2SCDL",
-            "name":"输出电流",
+            "label":"输出电流",
             "unit":"A",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F1_D2SCGL",
-            "name":"输出功率",
+            "label":"输出功率",
             "unit":"kW",
             "val":""
           }
@@ -211,7 +211,7 @@
       },
       {
         "key":"JF.Device1.TFBB.TFBB_EHJZYX",
-        "name":"2号通风机",
+        "title":"2号通风机",
         "state":"",
         "value":"",
         "state_list": [
@@ -219,37 +219,37 @@
             "key":"JF.Device1.TFBB.TFBB_F2_B1YXFK",
             "label":"1号变频运行反馈",
             "unit":"",
-            "value":""
+            "state":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_B2YXFK",
             "label":"2号变频运行反馈",
             "unit":"",
-            "value":""
+            "state":""
           }
         ],
         "run_parameter":[
           {
             "key":"JF.Device1.TFBB.TFBB_F2_FY",
-            "name":"负压",
+            "label":"负压",
             "unit":"Pa",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_QY",
-            "name":"全压",
+            "label":"全压",
             "unit":"Pa",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_FS",
-            "name":"风速",
+            "label":"风速",
             "unit":"m/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_FL",
-            "name":"风量",
+            "label":"风量",
             "unit":"m³/min",
             "val":""
           }
@@ -257,79 +257,79 @@
         "electric_parameter_1":[
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1QZW",
-            "name":"前轴温度",
+            "label":"前轴温度",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1HZW",
-            "name":"后轴温度",
+            "label":"后轴温度",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1RZ1",
-            "name":"定子温度1",
+            "label":"定子温度1",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1RZ2",
-            "name":"定子温度2",
+            "label":"定子温度2",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1RZ3",
-            "name":"定子温度3",
+            "label":"定子温度3",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1XZZ",
-            "name":"水平振动",
+            "label":"水平振动",
             "unit":"mm/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1YZZ",
-            "name":"垂直振动",
+            "label":"垂直振动",
             "unit":"mm/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1SCPL",
-            "name":"输出频率",
+            "label":"输出频率",
             "unit":"Hz",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1SRDY",
-            "name":"输入电压",
+            "label":"输入电压",
             "unit":"kV",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1SRDL",
-            "name":"输入电流",
+            "label":"输入电流",
             "unit":"A",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1SCDY",
-            "name":"输出电压",
+            "label":"输出电压",
             "unit":"kV",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1SCDL",
-            "name":"输出电流",
+            "label":"输出电流",
             "unit":"A",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D1SCGL",
-            "name":"输出功率",
+            "label":"输出功率",
             "unit":"kW",
             "val":""
           }
@@ -337,79 +337,79 @@
         "electric_parameter_2":[
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2QZW",
-            "name":"前轴温度",
+            "label":"前轴温度",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2HZW",
-            "name":"后轴温度",
+            "label":"后轴温度",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2RZ1",
-            "name":"定子温度1",
+            "label":"定子温度1",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2RZ2",
-            "name":"定子温度2",
+            "label":"定子温度2",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2RZ3",
-            "name":"定子温度3",
+            "label":"定子温度3",
             "unit":"℃",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2XZZ",
-            "name":"水平振动",
+            "label":"水平振动",
             "unit":"mm/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2YZZ",
-            "name":"垂直振动",
+            "label":"垂直振动",
             "unit":"mm/s",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2SCPL",
-            "name":"输出频率",
+            "label":"输出频率",
             "unit":"Hz",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2SRDY",
-            "name":"输入电压",
+            "label":"输入电压",
             "unit":"kV",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2SRDL",
-            "name":"输入电流",
+            "label":"输入电流",
             "unit":"A",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2SCDY",
-            "name":"输出电压",
+            "label":"输出电压",
             "unit":"kV",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2SCDL",
-            "name":"输出电流",
+            "label":"输出电流",
             "unit":"A",
             "val":""
           },
           {
             "key":"JF.Device1.TFBB.TFBB_F2_D2SCGL",
-            "name":"输出功率",
+            "label":"输出功率",
             "unit":"kW",
             "val":""
           }

jf_wind_center.py

@@ -80,10 +80,15 @@ class jf_wind_center():
                     sv = 2
                 else:
                     sv = None
-                data[i]['state_list'][j]['value'] = sv
+                data[i]['state_list'][j]['state'] = sv
+
+            if is_run:
+                data[i]['value'] = 1
+                data[i]['state'] = 1
+            elif is_run == False:
+                data[i]['value'] = 2
+                data[i]['state'] = 2
 
-            data[i]['value'] = is_run
-            data[i]['state'] = is_run
 
             rp = val['run_parameter']
             for j in range(len(rp)):

jf_wind_north.py

@@ -67,8 +67,13 @@ class jf_wind_north():
 
         for i in range(len(data)):
             val = data[i]
-            data[i]['value'] = self.point_dict[data[i]['key']]
-            data[i]['state'] = self.point_dict[data[i]['key']]
+            state = self.point_dict[data[i]['key']]
+            if state:
+                data[i]['value'] = 1
+                data[i]['state'] = 1
+            else:
+                data[i]['value'] = 2
+                data[i]['state'] = 2
 
             sl = val['state_list']
             for j in range(len(sl)):
@@ -82,7 +87,7 @@ class jf_wind_north():
                     sv = 2
                 else:
                     sv = None
-                data[i]['state_list'][j]['value'] = sv
+                data[i]['state_list'][j]['state'] = sv
 
             rp = val['run_parameter']
             p_is_run = False