OPC开关类型json key修改

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

@@ -105,16 +105,20 @@ class OpcDataController extends Controller
         $dataArr = array();
         foreach ($dbResult as $key => $val) {
             $fanNum     = $val->fan_type_id - 1;        // 风机号
-            $label      = $val->device_name;        // 设备名
-            $devVal     = $val->val;                // 数值
-            $dataType   = $val->json_key;           // json键值
+            $label      = $val->device_name;            // 设备名
+            $devVal     = $val->val;                    // 数值
+            $dataType   = $val->json_key;               // json键值
             $unit       = $val->unit;
             $dataArr[$fanNum]['title'] = $val->fan_type_name;
             $valArr = [
                 'label' => $label,
-                'value' => $devVal,
                 'unit'  => $unit
             ];
+            if($dataType == 'state_list') {
+                $valArr['state'] = $devVal;
+            } else {
+                $valArr['value'] = $devVal;
+            }
             if($label == '电机') {
                 $hisVal = 0;
                 if(array_key_exists('state', $dataArr)){