Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

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

@@ -116,7 +116,7 @@ class ZQDcsFanController  extends BaseController
         $windData = json_decode($data, true);
 
         $info = [
-            "charData_1"=>[
+            "chartData_1"=>[
                 "series"=>[
                     [
                         "data"=>[
@@ -132,7 +132,7 @@ class ZQDcsFanController  extends BaseController
                     ]
                 ]
             ],
-            "charData_2"=>[
+            "chartData_2"=>[
                 "series"=>[
                     [
                         "data"=>[

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

@@ -432,7 +432,7 @@ class ZQDcsPumpController  extends BaseController
                     ],
                     "table"=>[
                         "thead"=>["参数名称", "数值"],
-                        "tobody"=>[
+                        "tbody"=>[
                             [
                                 "label"=>"正压",
                                 "value"=>($valData['2008460126276609_1'] ?? 0)."Mpa",
@@ -483,7 +483,7 @@ class ZQDcsPumpController  extends BaseController
                     ],
                     "table"=>[
                         "thead"=>["参数名称", "数值"],
-                        "tobody"=>[
+                        "tbody"=>[
                             [
                                 "label"=>"正压",
                                 "value"=>($valData['2008460126495745_1'] ?? 0)."Mpa",
@@ -534,7 +534,7 @@ class ZQDcsPumpController  extends BaseController
                     ],
                     "table"=>[
                         "thead"=>["参数名称", "数值"],
-                        "tobody"=>[
+                        "tbody"=>[
                             [
                                 "label"=>"正压",
                                 "value"=>($valData['2008460126673921_1'] ?? 0)."Mpa",
@@ -633,79 +633,80 @@ class ZQDcsPumpController  extends BaseController
             ],
             "info"=>[
                 [
-                    "title"=>"1#水泵",
+                    "label"=>"1#水泵",
                     "state"=>$baseData['2024441687903233_2'] ?? 0,
+                    "text"=>($baseData['2024441687903233_2'] ?? 0) > 0 ? "开启" : "关闭",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
-
                             [
                                 "label"=>"正压",
-                                "state"=>($baseData['2024409445045249_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2024409445045249_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"负压",
-                                "state"=>($baseData['2024409444891649_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2024409444891649_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"前轴温度",
-                                "state"=>($baseData['2024409444801537_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2024409444801537_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"后轴温度",
-                                "state"=>($baseData['2024409444785153_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2024409444785153_1'] ?? 0)." ℃",
                             ],
                         ],
                     ],
                 ],
                 [
-                    "title"=>"2#水泵",
+                    "label"=>"2#水泵",
                     "state"=>$baseData['2024441740917761_2'] ?? 0,
+                    "text"=>($baseData['2024441740917761_2'] ?? 0) > 0 ? "开启" : "关闭",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
 
                             [
                                 "label"=>"正压",
-                                "state"=>($baseData['2024409445102593_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2024409445102593_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"负压",
-                                "state"=>($baseData['2024409444924417_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2024409444924417_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"前轴温度",
-                                "state"=>($baseData['未知'] ?? 37.5)." ℃",
+                                "value"=>($baseData['未知'] ?? 37.5)." ℃",
                             ],
                             [
                                 "label"=>"后轴温度",
-                                "state"=>($baseData['未知'] ?? 36.7)." ℃",
+                                "value"=>($baseData['未知'] ?? 36.7)." ℃",
                             ],
                         ],
                     ],
                 ],
                 [
-                    "title"=>"3#水泵",
+                    "label"=>"3#水泵",
                     "state"=>$baseData['2024441811375105_2'] ?? 0,
+                    "text"=>($baseData['2024441740917761_2'] ?? 0) > 0 ? "开启" : "关闭",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
-
                             [
                                 "label"=>"正压",
-                                "state"=>($baseData['2024409445080065_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2024409445080065_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"负压",
-                                "state"=>($baseData['2024409444908033_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2024409444908033_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"前轴温度",
-                                "state"=>($baseData['2024409444852737_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2024409444852737_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"后轴温度",
-                                "state"=>($baseData['2024409444869121_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2024409444869121_1'] ?? 0)." ℃",
                             ],
                         ],
                     ],
@@ -794,7 +795,7 @@ class ZQDcsPumpController  extends BaseController
             ],
             "info"=>[
                 [
-                    "title"=>"1#水泵",
+                    "label"=>"1#水泵",
                     "state"=>$baseData['2008602972865537_2'] ?? 0,
                     "text"=>($baseData['2008602972865537_2'] ?? 0) > 0 ? "开启" : "关闭" ,
                     "table"=>[
@@ -802,30 +803,30 @@ class ZQDcsPumpController  extends BaseController
                         "tbody"=>[
                             [
                                 "label"=>"正压",
-                                "state"=>($baseData['2008602973832193_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2008602973832193_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"负压",
-                                "state"=>($baseData['2008602973875201_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2008602973875201_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"前轴温度",
-                                "state"=>($baseData['2008602973764609_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602973764609_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"后轴温度",
-                                "state"=>($baseData['2008602973789185_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602973789185_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"定子温度",
-                                "state"=>($baseData['2008602973789185_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602973789185_1'] ?? 0)." ℃",
                             ],
 
                         ],
                     ],
                 ],
                 [
-                    "title"=>"2#水泵",
+                    "label"=>"2#水泵",
                     "state"=>$baseData['2008602973176833_2'] ?? 0,
                     "text"=>($baseData['2008602973176833_2'] ?? 0) > 0 ? "开启" : "关闭" ,
                     "table"=>[
@@ -833,53 +834,54 @@ class ZQDcsPumpController  extends BaseController
                         "tbody"=>[
                             [
                                 "label"=>"正压",
-                                "state"=>($baseData['2008602973953025_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2008602973953025_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"负压",
-                                "state"=>($baseData['2008602973987841_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2008602973987841_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"前轴温度",
-                                "state"=>($baseData['2008602973897729_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602973897729_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"后轴温度",
-                                "state"=>($baseData['2008602973918209_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602973918209_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"定子温度",
-                                "state"=>($baseData['2008602973936641_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602973936641_1'] ?? 0)." ℃",
                             ],
 
                         ],
                     ],
                 ],
                 [
-                    "title"=>"3#水泵",
+                    "label"=>"3#水泵",
+                    "state"=>$baseData['2008602973481985_2'] ?? 0,
                     "text"=>($baseData['2008602973481985_2'] ?? 0) > 0 ? "开启" : "关闭" ,
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
                             [
                                 "label"=>"正压",
-                                "state"=>($baseData['2008602974059521_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2008602974059521_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"负压",
-                                "state"=>($baseData['2008602974094337_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2008602974094337_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"前轴温度",
-                                "state"=>($baseData['2008602974006273_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602974006273_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"后轴温度",
-                                "state"=>($baseData['2008602974024705_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602974024705_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"定子温度",
-                                "state"=>($baseData['2008602974041089_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602974041089_1'] ?? 0)." ℃",
                             ],
                         ],
                     ],
@@ -953,28 +955,28 @@ class ZQDcsPumpController  extends BaseController
             ],
             "info"=>[
                 [
-                    "title"=>"1#水泵",
+                    "label"=>"1#水泵",
                     "state"=>$baseData['2044914761948161_2'] ?? 0,
                     "text"=>($baseData['2044914761948161_2'] ?? 0) > 0 ? "开启" : "关闭" ,
                     "table"=>[
                     ],
                 ],
                 [
-                    "title"=>"2#水泵",
+                    "label"=>"2#水泵",
                     "state"=>$baseData['2044914761968641_2'] ?? 0,
                     "text"=>($baseData['2044914761948161_2'] ?? 0) > 0 ? "开启" : "关闭" ,
                     "table"=>[
                     ],
                 ],
                 [
-                    "title"=>"3#水泵",
+                    "label"=>"3#水泵",
                     "state"=>$baseData['2044914761923585_2'] ?? 0,
                     "text"=>($baseData['2044914761923585_2'] ?? 0) > 0 ? "开启" : "关闭" ,
                     "table"=>[
                     ],
                 ],
                 [
-                    "title"=>"4#水泵",
+                    "label"=>"4#水泵",
                     "state"=>$baseData['2044914761907201_2'] ?? 0,
                     "text"=>($baseData['2044914761907201_2'] ?? 0) > 0 ? "开启" : "关闭" ,
                     "table"=>[
@@ -1077,52 +1079,55 @@ class ZQDcsPumpController  extends BaseController
             ],
             "info"=>[
                 [
-                    "title"=>"地面1#水泵",
+                    "label"=>"地面1#水泵",
                     "state"=>$baseData['2047540908469249_2'] + $baseData['2047540908469249_2'] > 0 ? 1 : 0,
+                    "text"=>$baseData['2047540908469249_2'] + $baseData['2047540908469249_2'] > 0 ? "开":"关",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
                             [
                                 "label"=>"工频运行",
-                                "state"=>$baseData['2047540908495873_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540908495873_2'] > 0 ? '是' : '否'
                             ],
                             [
                                 "label"=>"变频运行",
-                                "state"=>$baseData['2047540908469249_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540908469249_2'] > 0 ? '是' : '否'
                             ],
                         ],
                     ],
                 ],
                 [
-                    "title"=>"地面2#水泵",
+                    "label"=>"地面2#水泵",
                     "state"=>$baseData['2047540908547073_2'] + $baseData['2047540908522497_2'] > 0 ? 1 : 0,
+                    "text"=>$baseData['2047540908547073_2'] + $baseData['2047540908522497_2'] > 0 ? "开":"关",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
                             [
                                 "label"=>"工频运行",
-                                "state"=>$baseData['2047540908547073_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540908547073_2'] > 0 ? '是' : '否'
                             ],
                             [
                                 "label"=>"变频运行",
-                                "state"=>$baseData['2047540908522497_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540908522497_2'] > 0 ? '是' : '否'
                             ],
                         ],
                     ],
                 ],
                 [
-                    "title"=>"地面3#水泵",
+                    "label"=>"地面3#水泵",
                     "state"=>$baseData['2047540908573697_2'] + $baseData['2047540908598273_2'] > 0 ? 1 : 0,
+                    "text"=>$baseData['2047540908573697_2'] + $baseData['2047540908598273_2'] > 0 ? "开":"关",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
                             [
                                 "label"=>"工频运行",
-                                "state"=>$baseData['2047540908598273_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540908598273_2'] > 0 ? '是' : '否'
                             ],
                             [
                                 "label"=>"变频运行",
-                                "state"=>$baseData['2047540908573697_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540908573697_2'] > 0 ? '是' : '否'
                             ],
 
                         ],
@@ -1130,53 +1135,56 @@ class ZQDcsPumpController  extends BaseController
                 ],
 
                 [
-                    "title"=>"井下1#水泵",
+                    "label"=>"井下1#水泵",
                     "state"=>$baseData['2047540919243777_2'] + $baseData['2047540919270401_2'] > 0 ? 1 : 0,
+                    "text"=>$baseData['2047540908469249_2'] + $baseData['2047540908469249_2'] > 0 ? "开":"关",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
 
                             [
                                 "label"=>"工频运行",
-                                "state"=>$baseData['2047540919270401_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540919270401_2'] > 0 ? '是' : '否'
                             ],
                             [
                                 "label"=>"变频运行",
-                                "state"=>$baseData['2047540919243777_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540919243777_2'] > 0 ? '是' : '否'
                             ],
                         ],
                     ],
                 ],
                 [
-                    "title"=>"井下2#水泵",
+                    "label"=>"井下2#水泵",
                     "state"=>$baseData['2047540919319553_2'] + $baseData['2047540919294977_2'] > 0 ? 1 : 0,
+                    "text"=>$baseData['2047540919319553_2'] + $baseData['2047540919294977_2'] > 0 ? "开":"关",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
                             [
                                 "label"=>"工频运行",
-                                "state"=>$baseData['2047540919319553_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540919319553_2'] > 0 ? '是' : '否'
                             ],
                             [
                                 "label"=>"变频运行",
-                                "state"=>$baseData['2047540919294977_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540919294977_2'] > 0 ? '是' : '否'
                             ],
                         ],
                     ],
                 ],
                 [
-                    "title"=>"井下3#水泵",
+                    "label"=>"井下3#水泵",
                     "state"=>$baseData['2047540919368705_2'] + $baseData['2047540919344129_2'] > 0 ? 1 : 0,
+                    "text"=>$baseData['2047540919368705_2'] + $baseData['2047540919344129_2'] > 0 ? "开":"关",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
                             [
                                 "label"=>"工频运行",
-                                "state"=>$baseData['2047540919368705_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540919368705_2'] > 0 ? '是' : '否'
                             ],
                             [
                                 "label"=>"变频运行",
-                                "state"=>$baseData['2047540919344129_2'] > 0 ? '是' : '否'
+                                "value"=>$baseData['2047540919344129_2'] > 0 ? '是' : '否'
                             ],
                         ],
                     ],
@@ -1305,12 +1313,24 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
+
         $info = [
             "main"=>[
                 [
@@ -1326,61 +1346,63 @@ class ZQDcsPumpController  extends BaseController
             ],
             "info"=>[
                 [
-                    "title"=>"1号污水泵",
-                    "state"=> $baseData['2044909612874753_2'] == "未知" ? 0 : $baseData['2044909612889089_2'],
+                    "label"=>"1号污水泵",
+                    "state"=> $stateData['2044909612874753_2'] ?? 0,
+                    "text"=> $stateInfoData['2044909612874753_2'] ?? "未知",
                     "table"=>[
                         "table"=>[
                             "thead"=>["参数名称", "值"],
                             "tbody"=>[
                                 [
                                     "label"=>"正压",
-                                    "state"=>($baseData['2044909612987393_1'] ?? 0)." Mpa",
+                                    "value"=>($baseData['2044909612987393_1'] ?? 0)." Mpa",
                                 ],
                                 [
                                     "label"=>"负压",
-                                    "state"=>($baseData['2044909613003777_1'] ?? 0)." Mpa",
+                                    "value"=>($baseData['2044909613003777_1'] ?? 0)." Mpa",
                                 ],
                                 [
                                     "label"=>"前轴温度",
-                                    "state"=>($baseData['2044707427773441_1'] ?? 0)." ℃",
+                                    "value"=>($baseData['2044707427773441_1'] ?? 0)." ℃",
                                 ],
                                 [
                                     "label"=>"后轴温度",
-                                    "state"=>($baseData['2044707427785729_1'] ?? 0)." ℃",
+                                    "value"=>($baseData['2044707427785729_1'] ?? 0)." ℃",
                                 ],
                                 [
                                     "label"=>"电机温度",
-                                    "state"=>($baseData['2044707427785729_1'] ?? 0)." ℃",
+                                    "value"=>($baseData['2044707427785729_1'] ?? 0)." ℃",
                                 ],
                             ]
                         ]
                     ],
                 ],
                 [
-                    "title"=>"2号污水泵",
-                    "state"=> $baseData['2044909612889089_2'] == "未知" ? 0 : $baseData['2044909612889089_2'],
+                    "label"=>"2号污水泵",
+                    "state"=> $stateData['2044909612889089_2'] ?? 0,
+                    "text"=> $stateInfoData['2044909612889089_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
                             [
                                 "label"=>"正压",
-                                "state"=>($baseData['2044909613020161_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2044909613020161_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"负压",
-                                "state"=>($baseData['2044909613036545_1'] ?? 0)." Mpa",
+                                "value"=>($baseData['2044909613036545_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=>"前轴温度",
-                                "state"=>($baseData['2044707427773441_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2044707427773441_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"后轴温度",
-                                "state"=>($baseData['2044707427785729_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2044707427785729_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=>"点击温度",
-                                "state"=>($baseData['2044707427785729_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2044707427785729_1'] ?? 0)." ℃",
                             ],
                         ]
 
@@ -1454,10 +1476,21 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
         $info = [
@@ -1541,8 +1574,9 @@ class ZQDcsPumpController  extends BaseController
             ],
             "info"=>[
                 [
-                    "title"=>"1#水泵",
-                    "state"=>$baseData['2012602962545665_2'] ?? 0,
+                    "label"=>"1#水泵",
+                    "state"=> $stateData['2012602962545665_2'] ?? 0,
+                    "text"=> $stateInfoData['2012602962545665_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1574,8 +1608,9 @@ class ZQDcsPumpController  extends BaseController
                     ],
                 ],
                 [
-                    "title"=>"2#水泵",
-                    "state"=>$baseData['2012602962572289_2'] ?? 0,
+                    "label"=>"2#水泵",
+                    "state"=> $stateData['2012602962572289_2'] ?? 0,
+                    "text"=> $stateInfoData['2012602962572289_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1607,8 +1642,9 @@ class ZQDcsPumpController  extends BaseController
                     ],
                 ],
                 [
-                    "title"=>"3#水泵",
-                    "state"=>$baseData['2012602962603009_2'] ?? 0,
+                    "label"=>"3#水泵",
+                    "state"=> $stateData['2012602962603009_2'] ?? 0,
+                    "text"=> $stateInfoData['2012602962603009_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1724,10 +1760,21 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
         $info = [
@@ -1760,8 +1807,9 @@ class ZQDcsPumpController  extends BaseController
             ],
             "info"=>[
                 [
-                    "title"=>"1号清水泵",
-                    "state"=>$baseData['2044707426964481_2'] ?? 0,
+                    "label"=>"1号清水泵",
+                    "state"=> $stateData['2044707426964481_2'] ?? 0,
+                    "text"=> $stateInfoData['2044707426964481_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1821,8 +1869,9 @@ class ZQDcsPumpController  extends BaseController
                     ],
                 ],
                 [
-                    "title"=>"2号清水泵",
-                    "state"=>$baseData['2044707426978817_2'] ?? 0,
+                    "label"=>"2号清水泵",
+                    "state"=> $stateData['2044707426978817_2'] ?? 0,
+                    "text"=> $stateInfoData['2044707426978817_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1883,7 +1932,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "title"=>"5号清水泵",
-                    "state"=>$baseData['2044707426939905_2'] ?? 0,
+                    "state"=> $stateData['2044707426939905_2'] ?? 0,
+                    "text"=> $stateInfoData['2044707426939905_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1944,7 +1994,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "title"=>"6号清水泵",
-                    "state"=>$baseData['2044707426954241_2'] ?? 0,
+                    "state"=> $stateData['2044707426954241_2'] ?? 0,
+                    "text"=> $stateInfoData['2044707426954241_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[