电力点位矫正1

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsPowerController.php

@@ -229,6 +229,45 @@ class ZQDcsPowerController  extends BaseController
             "2046501538126849_1", // 720变电所_13207机巷2号低馈_UB
             "2046501538204673_1", // 720变电所_13207机巷2号低馈_IA
             "2046501538077697_1", // 720变电所_13207机巷1号低馈_IC
+
+            "2046459584472065_2",
+            "2046459585027073_2",
+            "2046459585592321_2",
+            "2046459586163713_2",
+            "2046459586737153_2",
+            "2046459587267585_2",
+            "2046459587804161_2",
+            "2046459588338689_2",
+            "2046459588924417_2",
+            "2046459589495809_2",
+            "2046459590081537_2",
+            "2046459590722561_2",
+            "2046459591306241_2",
+            "2046459591969793_2",
+            "2046459592600577_2",
+            "2046459593180161_2",
+            "2046459593747457_2",
+            "2046459594376193_2",
+            "2046459601812481_2",
+            "2046459602105345_2",
+            "2046459602154497_2",
+            "2046459602201601_2",
+            "2046459602248705_2",
+            "2046459597734913_2",
+            "2046459597198337_2",
+            "2046459596606465_2",
+            "2046459595996161_2",
+            "2046459595447297_2",
+            "2046459594863617_2",
+            "2046459602881537_2",
+            "2046459603129345_2",
+            "2046459601193985_2",
+            "2046459600661505_2",
+            "2046459600047105_2",
+            "2046459599434753_2",
+            "2046459598844929_2",
+            "2046459598314497_2",
+            "2046459602293761_2",
         ];
 
         // 获取点位数据
@@ -265,7 +304,6 @@ class ZQDcsPowerController  extends BaseController
                 $baseData["2046459593180161_2"] ?? 0, // 720变电所_5202_开关
                 $baseData["2046459593747457_2"] ?? 0, // 720变电所_52-9PT_开关
                 $baseData["2046459594376193_2"] ?? 0, // 720变电所_5201_开关
-
                 $baseData["2046459601812481_2"] ?? 0, // 720变电所_20F100_合闸
                 $baseData["2046459602105345_2"] ?? 0, // 720变电所_20F101_合闸
                 $baseData["2046459602154497_2"] ?? 0, // 720变电所_20F102_合闸
@@ -276,14 +314,9 @@ class ZQDcsPowerController  extends BaseController
                 $baseData["2046459596606465_2"] ?? 0, // 720变电所_20D103_开关合位
                 $baseData["2046459595996161_2"] ?? 0, // 720变电所_20D102_开关合位
                 $baseData["2046459595447297_2"] ?? 0, // 720变电所_20D101_开关合位
-
                 $baseData["2046459594863617_2"] ?? 0, // 720变电所_20D100_开关合位
-
                 $baseData["2046459602881537_2"] ?? 0, // 720变电所_2号移变高压侧_开关
                 $baseData["2046459603129345_2"] ?? 0, // 720变电所_2号移变低压侧_开关
-
-//                $baseData["2046459601761281_2"] ?? 0, // 720变电所_20D200_开关分闸
-
                 $baseData["2046459601193985_2"] ?? 0, // 720变电所_20D200_开关合位
                 $baseData["2046459600661505_2"] ?? 0, // 720变电所_20D201_开关合位
                 $baseData["2046459600047105_2"] ?? 0, // 720变电所_20D202_开关合位
@@ -295,6 +328,9 @@ class ZQDcsPowerController  extends BaseController
                 0,
                 $baseData["2047223939943425_2"] ?? 0, // 720_13207_1#
                 $baseData["2047223940000769_2"] ?? 0, // 720_13207_2#
+
+//                $baseData["2046459601761281_2"] ?? 0, // 720变电所_20D200_开关分闸
+
             ],
             "table_data"=>[
                 [
@@ -695,6 +731,19 @@ class ZQDcsPowerController  extends BaseController
             "2046501472091137_1", //880变电所_88Z_5_UCA
             "2046501472128001_1", //880变电所_88Z_5_IA
 
+            "2046459492846593_2", // 5101
+            "2046459493544961_2", // 5102
+            "2046459494116353_2", // 5103
+            "2046459494673409_2", // 5104
+
+            "2046459495306241_2", // 5001
+
+            "2046459495926785_2", // 5204
+            "2046459496530945_2", // 5203
+            "2046459497137153_2", // 5202
+            "2046459497741313_2", // 5201
+
+
         ];
 
         // 获取点位数据
@@ -722,6 +771,19 @@ class ZQDcsPowerController  extends BaseController
                 $baseData["2053367762666497_2"] ?? 0, //八八零变电所5203_开关
                 $baseData["2053367762693121_2"] ?? 0, //八八零变电所5202_开关
                 $baseData["2053367762719745_2"] ?? 0, //八八零变电所5201_开关
+
+                $baseData["2046459492846593_2"] ?? 0, // 5101
+                $baseData["2046459493544961_2"] ?? 0, // 5102
+                $baseData["2046459494116353_2"] ?? 0, // 5103
+                $baseData["2046459494673409_2"] ?? 0, // 5104
+
+                $baseData["2046459495306241_2"] ?? 0, // 5001
+
+                $baseData["2046459495926785_2"] ?? 0, // 5204
+                $baseData["2046459496530945_2"] ?? 0, // 5203
+                $baseData["2046459497137153_2"] ?? 0, // 5202
+                $baseData["2046459497741313_2"] ?? 0, // 5201
+
                 $baseData["2046459500686337_2"] ?? 0, //880变电所_88Z-1_开关合位
                 $baseData["2046459501636609_2"] ?? 0, //880变电所_1号移变高压侧_开关合位
                 $baseData["2046459501816833_2"] ?? 0, //880变电所_1号移变低压侧_开关合位
@@ -4088,11 +4150,11 @@ class ZQDcsPowerController  extends BaseController
             "tip"=>[
                 [
                     "color"=>"#FF0000",
-                    "text"=>"通信正常"
+                    "text"=>"开"
                 ],
                 [
                     "color"=>"#00FF00",
-                    "text"=>"通信中断"
+                    "text"=>"关"
                 ],
             ],
             "state"=>[
@@ -4152,7 +4214,7 @@ class ZQDcsPowerController  extends BaseController
                 [
                     "title"=>"五分区井下950变电所系统1",
                     "table"=>[
-                        "thead"=>["名称", "电压", "电流", "有功功率", "功率因数"] ?? 0,
+                        "thead"=>["名称", "电流", "电压", "有功功率", "功率因数"],
                         "tbody"=>[
                             [
                                 "5101",
@@ -4237,7 +4299,7 @@ class ZQDcsPowerController  extends BaseController
                 [
                     "title"=>"五分区井下950变电所系统2",
                     "table"=>[
-                        "thead"=>["名称", "电流", "电压", "有功功率", "功率因数"] ?? 0,
+                        "thead"=>["名称", "电流", "电压", "有功功率", "功率因数"],
                         "tbody"=>[
                             [
                                 "5001",
@@ -4343,7 +4405,7 @@ class ZQDcsPowerController  extends BaseController
                 [
                     "title"=>"五分区井下950变电所系统3",
                     "table"=>[
-                        "thead"=>["名称", "电压", "电流"] ?? 0,
+                        "thead"=>["名称", "电流", "电压", "有功功率", "功率因数"],
                         "tbody"=>[
                             [
                                 "Z104",
@@ -4831,11 +4893,11 @@ class ZQDcsPowerController  extends BaseController
             "tip"=>[
                 [
                     "color"=>"#FF0000",
-                    "text"=>"通信正常"
+                    "text"=>"开"
                 ],
                 [
                     "color"=>"#00FF00",
-                    "text"=>"通信中断"
+                    "text"=>"关"
                 ],
             ],
             "state"=>[