Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsSupportController.php

@@ -629,7 +629,7 @@ class ZQDcsSupportController  extends BaseController
 
 
     /**
-      * 扬尘监测
+     * 扬尘监测
      */
     public function getDustMonitorList() {
         $url = "http://7.250.4.3:4200/Tripartite/getRealData";
@@ -1309,32 +1309,15 @@ class ZQDcsSupportController  extends BaseController
             "2108573610109953_2", // 400m_冲击地压-顶板离层_传感器$$状态
             "2108573582619649_2", // 400m_冲击地压-顶板离层_传感器$$状态
             "2108573545991169_2", // 400m_冲击地压-顶板离层_传感器$$状态
-            "2111888017437697_4", // 400m_浅基点监测值
-            "2111730111908865_4", // 400m_浅基点监测值
-            "2111402601948161_4", // 400m_浅基点监测值
-            "2110983598883841_4", // 400m_浅基点监测值
-            "2110786391475201_4", // 400m_浅基点监测值
+
             "2110210465577985_4", // 400m_浅基点监测值
-            "2109218722475009_4", // 400m_浅基点监测值
-            "2109006326594561_4", // 400m_浅基点监测值
             "2109006123219969_4", // 400m_浅基点监测值
-            "2108573778043905_4", // 400m_浅基点监测值
-            "2108573610167297_4", // 400m_浅基点监测值
-            "2108573582670849_4", // 400m_浅基点监测值
             "2108573546054657_4", // 400m_浅基点监测值
-            "2111888017409025_4", // 400m_深基点监测值
-            "2111730111890433_4", // 400m_深基点监测值
-            "2111402601931777_4", // 400m_深基点监测值
-            "2110983598842881_4", // 400m_深基点监测值
-            "2110786391452673_4", // 400m_深基点监测值
+
             "2110210465559553_4", // 400m_深基点监测值
-            "2109218722458625_4", // 400m_深基点监测值
-            "2109006326576129_4", // 400m_深基点监测值
             "2109006123131905_4", // 400m_深基点监测值
-            "2108573777884161_4", // 400m_深基点监测值
-            "2108573610148865_4", // 400m_深基点监测值
-            "2108573582652417_4", // 400m_深基点监测值
             "2108573546034177_4", // 400m_深基点监测值
+
             "2111887844555777_2", // 450m_冲击地压-顶板离层_传感器$$状态
             "2111729959904257_2", // 450m_冲击地压-顶板离层_传感器$$状态
             "2111402465840129_2", // 450m_冲击地压-顶板离层_传感器$$状态
@@ -2504,32 +2487,14 @@ class ZQDcsSupportController  extends BaseController
                 "2108573610109953_2", // 400m_冲击地压-顶板离层_传感器$$状态
                 "2108573582619649_2", // 400m_冲击地压-顶板离层_传感器$$状态
                 "2108573545991169_2", // 400m_冲击地压-顶板离层_传感器$$状态
-                "2111888017437697_4", // 400m_浅基点监测值
-                "2111730111908865_4", // 400m_浅基点监测值
-                "2111402601948161_4", // 400m_浅基点监测值
-                "2110983598883841_4", // 400m_浅基点监测值
-                "2110786391475201_4", // 400m_浅基点监测值
                 "2110210465577985_4", // 400m_浅基点监测值
-                "2109218722475009_4", // 400m_浅基点监测值
-                "2109006326594561_4", // 400m_浅基点监测值
                 "2109006123219969_4", // 400m_浅基点监测值
-                "2108573778043905_4", // 400m_浅基点监测值
-                "2108573610167297_4", // 400m_浅基点监测值
-                "2108573582670849_4", // 400m_浅基点监测值
                 "2108573546054657_4", // 400m_浅基点监测值
-                "2111888017409025_4", // 400m_深基点监测值
-                "2111730111890433_4", // 400m_深基点监测值
-                "2111402601931777_4", // 400m_深基点监测值
-                "2110983598842881_4", // 400m_深基点监测值
-                "2110786391452673_4", // 400m_深基点监测值
+
                 "2110210465559553_4", // 400m_深基点监测值
-                "2109218722458625_4", // 400m_深基点监测值
-                "2109006326576129_4", // 400m_深基点监测值
                 "2109006123131905_4", // 400m_深基点监测值
-                "2108573777884161_4", // 400m_深基点监测值
-                "2108573610148865_4", // 400m_深基点监测值
-                "2108573582652417_4", // 400m_深基点监测值
                 "2108573546034177_4", // 400m_深基点监测值
+
             ],
             "450m~800m"=>[
                 "2111887844555777_2", // 450m_冲击地压-顶板离层_传感器$$状态
@@ -2670,7 +2635,7 @@ class ZQDcsSupportController  extends BaseController
                 "2110210493252609_4", // 800m_深基点监测值
                 "2109006139988993_4", // 800m_深基点监测值
                 "2108573625525249_4", // 800m_深基点监测值
-                ],
+            ],
             "850m~1000m"=>[
                 "2111887828089857_2", // 850m_冲击地压-顶板离层_传感器$$状态
                 "2111729937646593_2", // 850m_冲击地压-顶板离层_传感器$$状态
@@ -2875,7 +2840,7 @@ class ZQDcsSupportController  extends BaseController
                 "2109006169705473_4", // 1400m_深基点监测值
                 "2108573732983809_4", // 1400m_深基点监测值
                 "2108573655186433_4", // 1400m_深基点监测值
-                ],
+            ],
             "1500m~1800m"=>[
 
                 "2111887928216577_2", // 1500m_冲击地压-顶板离层_传感器$$状态
@@ -3866,8 +3831,8 @@ class ZQDcsSupportController  extends BaseController
         // 7日降雨
         $jiangyuliangArr = $res['jiangyuliang'];
         $categories = array_map(function($date) {
-                return date("m-d", strtotime($date));
-            }, $jiangyuliangArr['categories']
+            return date("m-d", strtotime($date));
+        }, $jiangyuliangArr['categories']
         );
         $info["7day"][] = [
             "categories" => array_slice($categories, -7),