生活水调整

Modules/OpcData/Http/Controllers/Api/OpcDataController.php

@@ -620,6 +620,7 @@ class OpcDataController extends BaseController
         $dataArr = array();
         $valDict = array();
         $state = 2;
+
         // dd($dbResult);
 
         foreach ($dbResult as $key => $val) {
@@ -635,35 +636,34 @@ class OpcDataController extends BaseController
             
             $valArr = array();
             if ($jsonKey == 'trans_box') {
+
+                $dataArr['cabinet'][$devTypeNum]['title'] = $devName;
+                $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['name'] = ($devNum + 1).'号供水泵';
                 $valArr = [
-                    'label' => $label,      // 标题
-                    'value' => $devVal,     // 值
-                    'unit'  => $unit        // 单位
+                    'name' => $label,      // 标题
+                    'state' => $devVal,     // 值
                 ];
-                $dataArr[$jsonKey]['data'][$devTypeNum]['data'][$devNum][] = $valArr;
 
-                $dataArr[$jsonKey]['data'][$devTypeNum]['name'] = $devName;
-                $dataArr[$jsonKey]['info'] = '变频器';
+                $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['state_list'][] = $valArr;
                 
             } else if ($jsonKey == 'trans_box_state') {
-                $dataArr['trans_box']['data'][$devTypeNum]['state'] = $devVal;
-            } else if ($jsonKey == 'parameter_state') {
+                $dataArr['cabinet'][$devTypeNum]['state'] = $devVal;
+            } else if ($jsonKey == 'state_list') {
                 $valArr = [
                     'label' => $label,      // 标题
                     'state' => $devVal,     // 值
                 ];
-                $dataArr[$jsonKey]['data'][] = $valArr;
-                $dataArr[$jsonKey]['info'] = '状态值';
-            } else if ($jsonKey == 'parameter_data') {
+                $dataArr[$jsonKey][] = $valArr;
+            } else if ($jsonKey == 'parameter') {
                 $valArr = [
                     'label' => $label,      // 标题
                     'value' => $devVal,     // 值
                     'unit'  => $unit        // 单位
                 ];
-                $dataArr[$jsonKey]['data'][] = $valArr;
-                $dataArr[$jsonKey]['info'] = '变量值';
+                $dataArr[$jsonKey][] = $valArr;
             }
         }
+
         return $dataArr;
     }
 }