q 2 anni fa
parent
commit
c3e21191f1

+ 48 - 48
config/jinfeng/air_north.json

@@ -6,158 +6,158 @@
       "common":[
         {
           "key":"JF.Device1.YF.YF_ZGYL",
-          "name":"总管压力",
+          "label":"总管压力",
           "unit":"Mpa",
-          "val":""
+          "value":""
         }
       ],
       "commpressed_air":[
         {
           "key":"JF.Device1.YF.YF_F1_YXFK",
-          "name":"1号压风机",
+          "label":"1号压风机",
           "state":"",
           "run_parameter":[
             {
               "key":"JF.Device1.YF.YF_F1_PQYL",
-              "name":"排气压力",
-              "val":"",
+              "label":"排气压力",
+              "value":"",
               "unit":"Mpa"
             },
             {
               "key":"JF.Device1.YF.YF_F1_PQWD",
-              "name":"排气温度",
-              "val":"",
+              "label":"排气温度",
+              "value":"",
               "unit":"Mpa"
             },
             {
               "key":"JF.Device1.YF.YF_F1_QGYL",
-              "name":"储气罐压力",
-              "val":"",
+              "label":"储气罐压力",
+              "value":"",
               "unit":"Mpa"
             },
             {
               "key":"JF.Device1.YF.YF_F1_QGWD",
-              "name":"储气罐温度",
-              "val":"",
+              "label":"储气罐温度",
+              "value":"",
               "unit":"℃"
             },
             {
               "key":"JF.Device1.YF.YF_F1_DDL",
-              "name":"电机电流",
-              "val":"",
+              "label":"电机电流",
+              "value":"",
               "unit":"A"
             },
             {
               "key":"JF.Device1.YF.YF_F1_DQZW",
-              "name":"前轴温度",
-              "val":"",
+              "label":"前轴温度",
+              "value":"",
               "unit":"℃"
             },
             {
               "key":"JF.Device1.YF.YF_F1_DHZW",
-              "name":"后轴温度",
-              "val":"",
+              "label":"后轴温度",
+              "value":"",
               "unit":"℃"
             }
           ],
           "warn_state":[
             {
               "key":"JF.Device1.YF.YF_F1_KLBJ",
-              "name":"空滤报警",
-              "val":"",
+              "label":"空滤报警",
+              "value":"",
               "unit":""
             },
             {
               "key":"JF.Device1.YF.YF_F1_YFBJ",
-              "name":"油分报警",
-              "val":"",
+              "label":"油分报警",
+              "value":"",
               "unit":""
             },
             {
               "key":"JF.Device1.YF.YF_F1_YLBJ",
-              "name":"油滤报警",
-              "val":"",
+              "label":"油滤报警",
+              "value":"",
               "unit":""
             },
             {
               "key":"JF.Device1.YF.YF_F1_YYBJ",
-              "name":"油压报警",
-              "val":"",
+              "label":"油压报警",
+              "value":"",
               "unit":""
             }
           ]
         },
         {
           "key":"JF.Device1.YF.YF_F2_YXFK",
-          "name":"2号压风机",
+          "label":"2号压风机",
           "state":"",
           "run_parameter":[
             {
               "key":"JF.Device1.YF.YF_F2_PQYL",
-              "name":"排气压力",
-              "val":"",
+              "label":"排气压力",
+              "value":"",
               "unit":"Mpa"
             },
             {
               "key":"JF.Device1.YF.YF_F2_PQWD",
-              "name":"排气温度",
-              "val":"",
+              "label":"排气温度",
+              "value":"",
               "unit":"Mpa"
             },
             {
               "key":"JF.Device1.YF.YF_F2_QGYL",
-              "name":"储气罐压力",
-              "val":"",
+              "label":"储气罐压力",
+              "value":"",
               "unit":"Mpa"
             },
             {
               "key":"JF.Device1.YF.YF_F2_QGWD",
-              "name":"储气罐温度",
-              "val":"",
+              "label":"储气罐温度",
+              "value":"",
               "unit":"℃"
             },
             {
               "key":"JF.Device1.YF.YF_F2_DDL",
-              "name":"电机电流",
-              "val":"",
+              "label":"电机电流",
+              "value":"",
               "unit":"A"
             },
             {
               "key":"JF.Device1.YF.YF_F2_DQZW",
-              "name":"前轴温度",
-              "val":"",
+              "label":"前轴温度",
+              "value":"",
               "unit":"℃"
             },
             {
               "key":"JF.Device1.YF.YF_F2_DHZW",
-              "name":"后轴温度",
-              "val":"",
+              "label":"后轴温度",
+              "value":"",
               "unit":"℃"
             }
           ],
           "warn_state":[
             {
               "key":"JF.Device1.YF.YF_F2_KLBJ",
-              "name":"空滤报警",
-              "val":"",
+              "label":"空滤报警",
+              "value":"",
               "unit":""
             },
             {
               "key":"JF.Device1.YF.YF_F2_YFBJ",
-              "name":"油分报警",
-              "val":"",
+              "label":"油分报警",
+              "value":"",
               "unit":""
             },
             {
               "key":"JF.Device1.YF.YF_F2_YLBJ",
-              "name":"油滤报警",
-              "val":"",
+              "label":"油滤报警",
+              "value":"",
               "unit":""
             },
             {
               "key":"JF.Device1.YF.YF_F2_YYBJ",
-              "name":"油压报警",
-              "val":"",
+              "label":"油压报警",
+              "value":"",
               "unit":""
             }
           ]

+ 6 - 6
config/jinfeng/belt_101.json

@@ -4,19 +4,19 @@
     "sys_path": "1\\1\\9",
     "sys_point": {
       "key":"JF.Device1.PD101.PD101_BP1_YXFK",
-      "name":"运行状态",
+      "label":"运行状态",
       "state":"",
       "common":[
         {
           "key":"JF.Device1.PD101.PD101_SD",
-          "name":"速度",
+          "label":"速度",
           "unit":"m/s",
           "value":""
         }
       ],
       "electric_parameter":[
         {
-          "name": "轴承温度",
+          "label": "轴承温度",
           "value_list": [
             {
               "key": "JF.Device1.PD101.PD101_DJ1_ZC",
@@ -31,7 +31,7 @@
           ]
         },
         {
-          "name": "绕组温度",
+          "label": "绕组温度",
           "value_list": [
             {
               "key": "JF.Device1.PD101.PD101_DJ1_RZ",
@@ -46,7 +46,7 @@
           ]
         },
         {
-          "name": "滚筒温度",
+          "label": "滚筒温度",
           "value_list": [
             {
               "key": "JF.Device1.PD101.PD101_GT1_RZ",
@@ -61,7 +61,7 @@
           ]
         },
         {
-          "name": "变频电流",
+          "label": "变频电流",
           "value_list": [
             {
               "key": "JF.Device1.PD101.PD101_BP1_DL",

+ 6 - 6
config/jinfeng/belt_102.json

@@ -4,19 +4,19 @@
     "sys_path": "1\\1\\9",
     "sys_point": {
       "key":"JF.Device1.PD102.PD102_BP1_YXFK",
-      "name":"运行状态",
+      "label":"运行状态",
       "state":"",
       "common":[
         {
           "key":"JF.Device1.PD101.PD102_SD",
-          "name":"速度",
+          "label":"速度",
           "unit":"m/s",
           "val":""
         }
       ],
       "electric_parameter":[
         {
-          "name": "前轴温度",
+          "label": "前轴温度",
           "value_list": [
             {
               "key": "JF.Device1.PD102.PD102_DJ1_QZW",
@@ -31,7 +31,7 @@
           ]
         },
         {
-          "name": "后轴温度",
+          "label": "后轴温度",
           "value_list": [
             {
               "key": "JF.Device1.PD102.PD102_DJ1_HZW",
@@ -46,7 +46,7 @@
           ]
         },
         {
-          "name": "定子温度",
+          "label": "定子温度",
           "value_list": [
             {
               "key": "JF.Device1.PD102.PD102_DJ1_DZW",
@@ -61,7 +61,7 @@
           ]
         },
         {
-          "name": "变频电流",
+          "label": "变频电流",
           "value_list": [
             {
               "key": "JF.Device1.PD102.PD102_BP1_DL",

+ 1 - 1
config/jinfeng/compressed_air.json

@@ -1,6 +1,6 @@
 {
     "sys_id": "compressed_air",
-    "sys_name": "压风",
+    "sys_name": "压风机房",
     "sys_path": "1\\1\\10",
     "sys_point": {
       "common":[

+ 78 - 76
config/jinfeng/wind_center.json

@@ -5,239 +5,241 @@
     "sys_point": [
       {
         "key":"",
-        "name":"1号通风机",
-        "val":"",
+        "label":"1号通风机",
+        "value":"",
+        "state":"",
         "statie_list":[
           {
             "key":"JF.Device1.TFZB2.TFZB_F1_M1FY",
-            "name":"截面1负压",
+            "label":"截面1负压",
             "unit":"Pa",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F1_M2FY",
-            "name":"截面2负压",
+            "label":"截面2负压",
             "unit":"Pa",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F1_JY",
-            "name":"静压",
+            "label":"静压",
             "unit":"Pa",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F1_QY",
-            "name":"全压",
+            "label":"全压",
             "unit":"Pa",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F1_FS",
-            "name":"风速",
+            "label":"风速",
             "unit":"m/s",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F1_FL",
-            "name":"风量",
+            "label":"风量",
             "unit":"m³/min",
-            "val":""
+            "value":""
           }
         ],
         "electric_parameter_1":[
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
-            "name":"运行状态",
+            "label":"运行状态",
             "unit":"",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1SDT",
-            "name":"当前上电时间",
+            "label":"当前上电时间",
             "unit":"min",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1YXT",
-            "name":"当前运行时间",
+            "label":"当前运行时间",
             "unit":"min",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1YXPL",
-            "name":"变频频率",
+            "label":"变频频率",
             "unit":"Hz",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1GG",
-            "name":"故障信息",
+            "label":"故障信息",
             "unit":"",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1YXZT",
-            "name":"运行状态",
+            "label":"运行状态",
             "unit":"",
-            "val":""
+            "value":""
           }
         ],
         "electric_parameter_2":[
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
-            "name":"运行状态",
+            "label":"运行状态",
             "unit":"",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B2SDT",
-            "name":"当前上电时间",
+            "label":"当前上电时间",
             "unit":"min",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B2YXT",
-            "name":"当前运行时间",
+            "label":"当前运行时间",
             "unit":"min",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B2YXPL",
-            "name":"变频频率",
+            "label":"变频频率",
             "unit":"Hz",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B2GG",
-            "name":"故障信息",
+            "label":"故障信息",
             "unit":"",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F1_B2YXZT",
-            "name":"运行状态",
+            "label":"运行状态",
             "unit":"",
-            "val":""
+            "value":""
           }
         ]
       },
       {
         "key":"",
-        "name":"2号通风机",
-        "val":"",
+        "label":"2号通风机",
+        "value":"",
+        "state":"",
         "statie_list":[
           {
             "key":"JF.Device1.TFZB2.TFZB_F2_M1FY",
-            "name":"截面1负压",
+            "label":"截面1负压",
             "unit":"Pa",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F2_M2FY",
-            "name":"截面2负压",
+            "label":"截面2负压",
             "unit":"Pa",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F2_JY",
-            "name":"静压",
+            "label":"静压",
             "unit":"Pa",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F2_QY",
-            "name":"全压",
+            "label":"全压",
             "unit":"Pa",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F2_FS",
-            "name":"风速",
+            "label":"风速",
             "unit":"m/s",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB2.TFZB_F2_FL",
-            "name":"风量",
+            "label":"风量",
             "unit":"m³/min",
-            "val":""
+            "value":""
           }
         ],
         "electric_parameter_1":[
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1YXFK",
-            "name":"运行状态",
+            "label":"运行状态",
             "unit":"",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1SDT",
-            "name":"当前上电时间",
+            "label":"当前上电时间",
             "unit":"min",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1YXT",
-            "name":"当前运行时间",
+            "label":"当前运行时间",
             "unit":"min",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1YXPL",
-            "name":"变频频率",
+            "label":"变频频率",
             "unit":"Hz",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1GG",
-            "name":"故障信息",
+            "label":"故障信息",
             "unit":"",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1YXZT",
-            "name":"运行状态",
+            "label":"运行状态",
             "unit":"",
-            "val":""
+            "value":""
           }
         ],
         "electric_parameter_2":[
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1YXFK",
-            "name":"运行状态",
+            "label":"运行状态",
             "unit":"",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B2SDT",
-            "name":"当前上电时间",
+            "label":"当前上电时间",
             "unit":"min",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B2YXT",
-            "name":"当前运行时间",
+            "label":"当前运行时间",
             "unit":"min",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B2YXPL",
-            "name":"变频频率",
+            "label":"变频频率",
             "unit":"Hz",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B2GG",
-            "name":"故障信息",
+            "label":"故障信息",
             "unit":"",
-            "val":""
+            "value":""
           },
           {
             "key":"JF.Device1.TFZB1.TFZB_F2_B2YXZT",
-            "name":"运行状态",
+            "label":"运行状态",
             "unit":"",
-            "val":""
+            "value":""
           }
         ]
       }

+ 33 - 33
config/jinfeng/wind_north.json

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

+ 2 - 2
jf_belt_101.py

@@ -70,14 +70,14 @@ class jf_belt_101():
         for i in range(len(comm)):
             ck = comm[i]
             k = ck[i]['key']
-            comm[i]['val'] = self.point_dict[k]
+            comm[i]['value'] = self.point_dict[k]
             data['common'][i] = ck
 
         for i in range(len(elec)):
             vl = elec[i]['value_list']
             for j in range(len(vl)):
                 k = vl[j]['key']
-                vl[j]['val'] = self.point_dict[k]
+                vl[j]['value'] = self.point_dict[k]
             data['electric_parameter'][i]['value_list'] = vl
 
         self.jdata['sys_point'] = data

+ 2 - 2
jf_belt_102.py

@@ -70,14 +70,14 @@ class jf_belt_102():
         for i in range(len(comm)):
             ck = comm[i]
             k = ck[i]['key']
-            comm[i]['val'] = self.point_dict[k]
+            comm[i]['value'] = self.point_dict[k]
             data['common'][i] = ck
 
         for i in range(len(elec)):
             vl = elec[i]['value_list']
             for j in range(len(vl)):
                 k = vl[j]['key']
-                vl[j]['val'] = self.point_dict[k]
+                vl[j]['value'] = self.point_dict[k]
             data['electric_parameter'][i]['value_list'] = vl
 
         self.jdata['sys_point'] = data

+ 2 - 2
jf_belt_north.py

@@ -70,14 +70,14 @@ class jf_belt_north():
         for i in range(len(comm)):
             ck = comm[i]
             k = ck[i]['key']
-            comm[i]['val'] = self.point_dict[k]
+            comm[i]['value'] = self.point_dict[k]
             data['common'][i] = ck
 
         for i in range(len(elec)):
             vl = elec[i]['value_list']
             for j in range(len(vl)):
                 k = vl[j]['key']
-                vl[j]['val'] = self.point_dict[k]
+                vl[j]['value'] = self.point_dict[k]
             data['electric_parameter'][i]['value_list'] = vl
 
         self.jdata['sys_point'] = data

+ 3 - 3
jf_wind_center.py

@@ -70,17 +70,17 @@ class jf_wind_center():
             for j in range(len(sl)):
                 ck = sl[j]['key']
                 if ck in self.point_dict.keys():
-                    data[i]['statie_list'][j]['val'] = self.point_dict[ck]
+                    data[i]['statie_list'][j]['value'] = self.point_dict[ck]
             ep1 = val['electric_parameter_1']
             for j in range(len(ep1)):
                 ck = ep1[j]['key']
                 if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_1'][j]['val'] = self.point_dict[ck]
+                    data[i]['electric_parameter_1'][j]['value'] = self.point_dict[ck]
             ep2 = val['electric_parameter_2']
             for j in range(len(ep2)):
                 ck = ep2[j]['key']
                 if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_2'][j]['val'] = self.point_dict[ck]
+                    data[i]['electric_parameter_2'][j]['value'] = self.point_dict[ck]
         self.jdata['sys_point'] = data
 
 

+ 3 - 3
jf_wind_north.py

@@ -70,17 +70,17 @@ class jf_wind_north():
             for j in range(len(sl)):
                 ck = sl[j]['key']
                 if ck in self.point_dict.keys():
-                    data[i]['statie_list'][j]['val'] = self.point_dict[ck]
+                    data[i]['statie_list'][j]['value'] = self.point_dict[ck]
             ep1 = val['electric_parameter_1']
             for j in range(len(ep1)):
                 ck = ep1[j]['key']
                 if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_1'][j]['val'] = self.point_dict[ck]
+                    data[i]['electric_parameter_1'][j]['value'] = self.point_dict[ck]
             ep2 = val['electric_parameter_2']
             for j in range(len(ep2)):
                 ck = ep2[j]['key']
                 if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_2'][j]['val'] = self.point_dict[ck]
+                    data[i]['electric_parameter_2'][j]['value'] = self.point_dict[ck]
         self.jdata['sys_point'] = data