22087辅助巷点位校正

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

@@ -832,8 +832,8 @@ class ZQDcsFanController  extends BaseController
     public function get220708fzxList() {
 
         $keys=[
-            "2046535460451329_2", "2046535460480001_2", "2046535462663169_2",
-            "2046535462687745_2", "2046535463324673_1", "2046535463621633_1",
+            "2046535459097601_2", "2046535459722241_2", "2046535461340161_2",
+            "2046535461911553_2", "2046535463324673_1", "2046535463621633_1",
             "2046535463404545_1", "2046535463697409_1", "2046535463496705_1",
             "2046535463771137_1", "2046535463363585_1", "2046535463658497_1",
             "2046535463457793_1", "2046535463732225_1", "2046535463541761_1",
@@ -854,33 +854,33 @@ class ZQDcsFanController  extends BaseController
         $data['tab']=[
             [
                 'title'=>"主风机",
-                'state'=>$baseData['2046522721719297_2'] ?? 0,
+                'state'=>$baseData['2046535459097601_2'] ?? 0,
                 'list'=>[
                     [
                         'label'=>'1号电机',
                         "unit"=>"",
-                        "num"=>$baseData['2046535460451329_2'] ?? 0,
+                        "num"=>$baseData['2046535459097601_2'] ?? 0,
                     ],
                     [
                         "label"=>"2号电机",
                         "unit"=>"",
-                        "num"=>$baseData['2046535460480001_2'] ?? 0,
+                        "num"=>$baseData['2046535459722241_2'] ?? 0,
                     ],
                 ]
             ],
             [
                 'title'=>"副风机",
-                'state'=>$baseData['2046535462663169_2'] ?? 0,
+                'state'=>$baseData['2046535461340161_2'] ?? 0,
                 'list'=>[
                     [
                         'label'=>'1号电机',
                         "unit"=>"",
-                        "num"=>$baseData['2046535462663169_2'] ?? 0,
+                        "num"=>$baseData['2046535461340161_2'] ?? 0,
                     ],
                     [
                         "label"=>"2号电机",
                         "unit"=>"",
-                        "num"=>$baseData['2046535462687745_2'] ?? 0,
+                        "num"=>$baseData['2046535461911553_2'] ?? 0,
                     ],
                 ]
             ]
@@ -1480,17 +1480,16 @@ class ZQDcsFanController  extends BaseController
 
         $baseData = $dataFromGetRequest['data'];
         // 电流、功率、振动、负压取的西井通风的点
-        // 1号和2号风机是反的
         $data['tab']=[
             [
-                'title'=>"2#风机",
-                'state'=>$baseData['2009721047067649_2'] ?? 0,
+                'title'=>"1#风机",
+                'state'=>$baseData['2009721035631617_2'] ?? 0,
                 'list'=>[
                 ]
             ],
             [
-                'title'=>"1#风机",
-                'state'=>$baseData['2009721035631617_2'] ?? 0,
+                'title'=>"2#风机",
+                'state'=>$baseData['2009721047067649_2'] ?? 0,
                 'list'=>[
                 ]
             ]
@@ -1500,43 +1499,6 @@ class ZQDcsFanController  extends BaseController
                 "参数名称", "前级", "后级"
             ],
             "tbody"=>[
-                [
-                    "label"=>"运行频率（Hz）",
-                    'value_1'=>$baseData['2009721048970241_1'] ?? 0,
-                    'value_2'=>$baseData['2009721048970241_1'] ?? 0,
-                ],
-                [
-                    "label"=>"运行电流（A）",
-                    'value_1'=>$baseData['2009735057103873_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057193985_1'] ?? 0,
-                ],
-                [
-                    "label"=>"运行功率（kw)",
-                    'value_1'=>$baseData['2009735057161217_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057263617_1'] ?? 0,
-                ],
-                [
-                    "label"=>"X振动（mm/s)",
-                    'value_1'=>$baseData['2009721037777921_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057282049_1'] ?? 0,
-                ],
-                [
-                    "label"=>"Y振动（mm/s)",
-                    'value_1'=>$baseData['2009735057146881_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057247233_1'] ?? 0,
-                ],
-                [
-                    "label"=>"负压（pa)",
-                    'value_1'=>$baseData['2009735057501185_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057515521_1'] ?? 0,
-                ],
-            ]
-        ];
-        $data['table_2']=[
-            "thead"=>[
-                "参数名称", "前级", "后级"
-            ],
-            "tbody"=>[
                 "tbody"=>[
                     [
                         "label"=>"运行频率（Hz）",
@@ -1571,6 +1533,43 @@ class ZQDcsFanController  extends BaseController
                 ]
             ]
         ];
+        $data['table_2']=[
+            "thead"=>[
+                "参数名称", "前级", "后级"
+            ],
+            "tbody"=>[
+                [
+                    "label"=>"运行频率（Hz）",
+                    'value_1'=>$baseData['2009721048970241_1'] ?? 0,
+                    'value_2'=>$baseData['2009721048970241_1'] ?? 0,
+                ],
+                [
+                    "label"=>"运行电流（A）",
+                    'value_1'=>$baseData['2009735057103873_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057193985_1'] ?? 0,
+                ],
+                [
+                    "label"=>"运行功率（kw)",
+                    'value_1'=>$baseData['2009735057161217_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057263617_1'] ?? 0,
+                ],
+                [
+                    "label"=>"X振动（mm/s)",
+                    'value_1'=>$baseData['2009721037777921_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057282049_1'] ?? 0,
+                ],
+                [
+                    "label"=>"Y振动（mm/s)",
+                    'value_1'=>$baseData['2009735057146881_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057247233_1'] ?? 0,
+                ],
+                [
+                    "label"=>"负压（pa)",
+                    'value_1'=>$baseData['2009735057501185_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057515521_1'] ?? 0,
+                ],
+            ]
+        ];
         $data['chartData_1']=[
             'categories'=>["1-1#电机", "1-2#电机"],
             'series'=>[