psto 2 роки тому
батько
коміт
9f26fdf808

+ 7 - 5
Modules/OpcData/Http/Controllers/Api/OpcDataController.php

@@ -96,10 +96,12 @@ class OpcDataController extends BaseController
                     t1.dev_type_name,
                     t1.device_num,
                     t1.device_name,
-                    case t.val 
-                        when 'True' then 1
-                        when 'False' then 2
-                        else t.val
+                    case when t.val = 'True' then 1
+					     when t.val = 'False' then 2
+					     when t.val = 0 then 0
+					     when t.val * 100 % 1 = 0 then t.val
+					     when t.val * 100 % 1 != 0 then round(t.val, 2)
+                         else t.val
                     end val,
                     t1.json_key,
                     t1.row_number,
@@ -643,7 +645,7 @@ class OpcDataController extends BaseController
             $group_name = $val->group_name;             // 设备名
             
             $valArr = array();
-            if ($jsonKey == 'trans_box' || $jsonKey == 'trans_box_state' ) {
+            if ($jsonKey == 'trans_box' ) {
 
                 $dataArr['cabinet'][$devTypeNum]['title'] = $devName;
                 $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['name'] = ($devNum + 1).'号泵';