qr 3 месяцев назад
Родитель
Сommit
5e39265c4f

+ 2 - 1
Modules/Admin/Http/Controllers/LoginController.php

@@ -44,6 +44,7 @@ class LoginController extends Controller
 
         // 定义私有 IP 段
         $privateRanges = [
+            ['127.0.0.0', '127.255.255.255'],
             ['10.0.0.0', '10.255.255.255'],
             ['172.16.0.0', '172.31.255.255'],
             ['192.168.0.0', '192.168.255.255']
@@ -140,4 +141,4 @@ class LoginController extends Controller
     {
         return 'staff_num';
     }
-}
+}

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

@@ -3343,7 +3343,7 @@ class ZQDcsFanController  extends BaseController
 
             "2009735057177601_1", // 1#风机水平振动
             "2009735057282049_1", // 2#风机水平振动
-            "2009735057378305_1", // 3#风机水平振动
+            "2009735057378305_1", // 3#风机水平振动 风速?
             "2009735057484801_1", // 4#风机水平振动
 
             "2009735057146881_1", // 1#风机垂直振动
@@ -3411,12 +3411,12 @@ class ZQDcsFanController  extends BaseController
                     [
                         "label"=>"体积流量",
                         "unit"=>"Pa",
-                        "num"=>rand(81000, 87000) / 10.0,
+                        "num"=>$baseData["2009735057378305_1"] * 15 * 60,
                     ],
                     [
                         "label"=>"出口风速",
                         "unit"=>"m/s",
-                        "num"=>6.4,
+                        "num"=>$baseData["2009735057378305_1"],
                     ],
                 ]
             ],
@@ -3445,8 +3445,8 @@ class ZQDcsFanController  extends BaseController
                 [
                     "label"=>"负压(Pa)",
                     "type"=>"val",
-                    "value_1"=>round($baseData["2009735057501185_1"] * 1000, 1) ?? 0,
-                    "value_2"=>round($baseData["2009735057515521_1"] * 1000, 1) ?? 0,
+                    "value_1"=>round($baseData["2009735057501185_1"] * 760, 1) ?? 0,
+                    "value_2"=>round($baseData["2009735057515521_1"] * 760, 1) ?? 0,
                 ],
                 [
                     "label"=>"电流反馈(A)",
@@ -3512,8 +3512,8 @@ class ZQDcsFanController  extends BaseController
                 [
                     "label"=>"负压(Pa)",
                     "type"=>"val",
-                    "value_1"=>round($baseData["2009735057529857_1"] * 1000, 1) ?? 0,
-                    "value_2"=>round($baseData["2009735057546241_1"] * 1000, 1) ?? 0,
+                    "value_1"=>round($baseData["2009735057529857_1"] * 760, 1) ?? 0,
+                    "value_2"=>round($baseData["2009735057546241_1"] * 760, 1) ?? 0,
                 ],
                 [
                     "label"=>"电流反馈(A)",

+ 3 - 2
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsSupportController.php

@@ -3808,11 +3808,12 @@ class ZQDcsSupportController  extends BaseController
 
         }
         $info["info"] = [
-            ["label"=>"地面传感器", "value"=>"9"],
+            ["label"=>"地面传感器", "value"=>"10"],
             ["label"=>"压力水位传感器", "value"=>"2"],
             ["label"=>"流量传感器", "value"=>"23"],
+            ["label"=>"自动雨量站", "value"=>"1"],
             ["label"=>"地面断线传感器", "value"=>"0"],
-            ["label"=>"井下断线传感器", "value"=>"0"],
+            ["label"=>"井下断线传感器", "value"=>"1"],
         ];
 
         // 分站