Przeglądaj źródła

适配金家渠提升机

SWAT 3 lat temu
rodzic
commit
53a546e1f2

+ 4 - 2
Modules/OpcData/Http/Controllers/Api/OpcDataController.php

@@ -394,7 +394,9 @@ class OpcDataController extends Controller
             $group_name = $val->group_name;             // 设备名
 
 
-            if ($jsonKey == 'position') {
+            if ($jsonKey == 'state') {
+                $dataArr['hoist'][0]['state'] = $state;
+            } else if ($jsonKey == 'position') {
                 $valArr = [
                     'label' => $label,      // 标题
                     'value' => $devVal,     // 值
@@ -424,12 +426,12 @@ class OpcDataController extends Controller
                 $valArr = [
                     'label' => $label,      // 标题
                     'state' => $devVal,     // 值
+                    'unit'  => $unit        // 单位
                 ];
                 $dataArr['hoist'][$devTypeNum][$jsonKey][] = $valArr;
             }
             
         }
-        $dataArr['hoist'][0]['state'] = $state;
         return $dataArr;
     }