q 11 月之前
父节点
当前提交
93dc16c87b

+ 8 - 6
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsSupportController.php

@@ -36,16 +36,18 @@ class ZQDcsSupportController  extends BaseController
         switch ($sysCode) {
             case 'main':
                 return $this->getMainSupport();
-            case 'djjk':
+            case 'znzj': // 智能综掘
                 return $this->getZNZJList();
-            case 'yangchen':
+            case 'yangchen': // 扬尘
                 return $this->getDustMonitorList();
-            case 'kuangya':
+            case 'kuangya': // 矿压
                 return $this->getMinePressureList();
-            case 'shuiwen':
+            case 'shuiwen': // 水文监测
                 return $this->getWaterData();
-            case 'guangbo':
+            case 'guangbo': // 应急广播
                 return $this->getEmergencyBroadcast();
+            case 'djjkcr': // 东井架空乘人
+                return $this->getEastJKCRQList();
             default:
                 $msg="未知数据";
                 $code=-2;
@@ -3867,7 +3869,7 @@ class ZQDcsSupportController  extends BaseController
                 return date("m-d", strtotime($date));
             }, $jiangyuliangArr['categories']
         );
-        $info["7day"] = [
+        $info["7day"][] = [
             "categories" => array_slice($categories, -7),
             "series" => [[
                 "name"=>"降雨量",

+ 1 - 1
Modules/OpcData/Routes/api.php

@@ -36,6 +36,6 @@ Route::namespace('Api')->group(function () {
     Route::any('zaoquan/dcs/power', 'zaoquan\\ZQDcsPowerController@getList'); // 电力
     Route::any('zaoquan/dcs/getSupport', 'zaoquan\\ZQDcsSupportController@getList'); // 支架
 
-    Route::any('zaoquan/dcs/dustMonitor', 'zaoquan\\ZQDcsSupportController@getDustMonitorList'); // 扬尘
+//    Route::any('zaoquan/dcs/dustMonitor', 'zaoquan\\ZQDcsSupportController@getDustMonitorList'); // 扬尘
 
 });