压风状态值调整

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

@@ -95,6 +95,7 @@ class OpcDataController extends Controller
         $getDataType = $request->system_type;   // 获取需要的数据
         $dataArr = array();                     // 返回数据数组
         $result;
+        
         if ($getDataType == 'ventilation_zb'){
             // 中部风机
             $groupId = 1;
@@ -129,6 +130,7 @@ class OpcDataController extends Controller
         return response()->json($result);
     }
 
+
     // 水泵
     public function getFanData($groupId) {
 
@@ -283,7 +285,7 @@ class OpcDataController extends Controller
     }
 
 
-
+    // 压风
     public function getCompressedAirData($groupId) {
 
         $sqlStr = "
@@ -321,10 +323,10 @@ class OpcDataController extends Controller
 
             // $valArr[$jsonKey] = $devVal;
 
-            
-            if ($jsonKey == 'run_parameter') {
+            if ($jsonKey == 'state') {
                 $dataArr['compressed_air'][$devNum]['name'] = $devName;
                 $dataArr['compressed_air'][$devNum]['state'] = $devVal;
+            } else if ($jsonKey == 'run_parameter') {
 
                 $valArr = [
                     'label' => $label,      // 标题