q hace 1 año
padre
commit
08c959c9ae

+ 14 - 14
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsFanController.php

@@ -38,20 +38,20 @@ class ZQDcsFanController  extends BaseController
                     return $this->getEastList();
                 case 'west': // 西井
                     return $this->getWestList();
-                case '1314': // 1314立井
-                    return $this->get1314List();
                 case '5fq': // 五分区
                     return $this->get5fqList();
-                case '1200car': // 1200车场 * 150201机巷通风机
-                    return $this->get1200CarFanList();
+                case '1314': // 1314立井
+                    return $this->get1314List();
                 case '1200sm': // 1200石门 * 150201回风巷通风机
                     return $this->get1200smList();
+                case '1200car': // 1200车场 * 150201机巷通风机
+                    return $this->get1200CarFanList();
                 case '220708fzx': // 220708辅助巷
                     return $this->get220708fzxList();
-                case '220708jdx': // 220708胶带巷
-                    return $this->get220708jdxList();
                 case '220708hfx': // 220708回风巷
                     return $this->get220708hfxList();
+                case '220708jdx': // 220708胶带巷
+                    return $this->get220708jdxList();
                 case '110207hfx': // 110207回风巷
                     return $this->get110207hfxList();
                 case '110207jx': // 110207机巷
@@ -192,33 +192,33 @@ class ZQDcsFanController  extends BaseController
                     ]
                 ],
                 [
-                    "title"=>"1314立井通风机",
-                    "sys_code"=>"1314",
+                    "title"=>"五分区通风机",
+                    "sys_code"=>"5fq",
                     "info"=>[
                         [
                             "label"=>"1#风机",
-                            "state"=>$baseData['2009721035631617_2'] ?? 0,
+                            "state"=>$baseData['2008681964219393_2'] ?? 0,
                             "text"=>"停止"
                         ],
                         [
                             "label"=>"2#风机",
-                            "state"=>$baseData['2009721047067649_2'] ?? 0,
+                            "state"=>$baseData['2008682656793601_2'] ?? 0,
                             "text"=>"运行"
                         ]
                     ]
                 ],
                 [
-                    "title"=>"五分区通风机",
-                    "sys_code"=>"5fq",
+                    "title"=>"1314立井通风机",
+                    "sys_code"=>"1314",
                     "info"=>[
                         [
                             "label"=>"1#风机",
-                            "state"=>$baseData['2008681964219393_2'] ?? 0,
+                            "state"=>$baseData['2009721035631617_2'] ?? 0,
                             "text"=>"停止"
                         ],
                         [
                             "label"=>"2#风机",
-                            "state"=>$baseData['2008682656793601_2'] ?? 0,
+                            "state"=>$baseData['2009721047067649_2'] ?? 0,
                             "text"=>"运行"
                         ]
                     ]

+ 1 - 1
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsWorkFaceController.php

@@ -34,7 +34,7 @@ class ZQDcsWorkFaceController  extends BaseController
             return $this->error($code, $msg);
         } else {
             switch ($sysCode) {
-                case '220707Gzm': // 220707工作面
+                case '220707gzm': // 220707工作面
                     return $this->get220707GzmList();
                 case 'rhb': // 乳化泵
                     return $this->getRhbList();

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

@@ -31,9 +31,9 @@ Route::namespace('Api')->group(function () {
 
     Route::any('zaoquan/dcs/getFan', 'zaoquan\\ZQDcsFanController@getList'); // 风机
     Route::any('zaoquan/dcs/pump', 'zaoquan\\ZQDcsPumpController@getList'); // 水泵
-    Route::any('zaoquan/dcs/an', 'zaoquan\\ZQDcAirAndNitrogenController@getList'); // 压风制氮
-    Route::any('zaoquan/dcs/power', 'zaoquan\\ZQDcPowerController@getList'); // 电力
-    Route::any('zaoquan/dcs/workface', 'zaoquan\\ZQDcWorkFaceController@getList'); // 工作面
+    Route::any('zaoquan/dcs/an', 'zaoquan\\ZQDcsAirAndNitrogenController@getList'); // 压风制氮
+    Route::any('zaoquan/dcs/power', 'zaoquan\\ZQDcsPowerController@getList'); // 电力
+    Route::any('zaoquan/dcs/workface', 'zaoquan\\ZQDcsWorkFaceController@getList'); // 工作面
 
     Route::any('zaoquan/dcs/getSupport', 'zaoquan\\ZQDcsSupportController@getList');
 });