Browse Source

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

任敬轩 1 năm trước cách đây
mục cha
commit
41c05b3430

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 189 - 189
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsAirAndNitrogenController.php


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

@@ -118,28 +118,32 @@ class ZQDcsFanController  extends BaseController
         $info = [
             "charData_1"=>[
                 "series"=>[
-                    "data"=>[
-                        [
-                            "name"=>"有效风",
-                            "value"=>round($windData['vaildWindRate'], 1)
-                        ],
-                        [
-                            "name"=>"无效风",
-                            "value"=>round(1-$windData['vaildWindRate'], 1)
+                    [
+                        "data"=>[
+                            [
+                                "name"=>"有效风",
+                                "value"=>round($windData['vaildWindRate'], 1)
+                            ],
+                            [
+                                "name"=>"无效风",
+                                "value"=>round(1-$windData['vaildWindRate'], 1)
+                            ]
                         ]
                     ]
                 ]
             ],
             "charData_2"=>[
                 "series"=>[
-                    "data"=>[
-                        [
-                            "name"=>"供风量",
-                            "value"=>$windData['needTotalQuantity']
-                        ],
-                        [
-                            "name"=>"需风量",
-                            "value"=>$windData['needQuantity']
+                    [
+                        "data"=>[
+                            [
+                                "name"=>"供风量",
+                                "value"=>$windData['needTotalQuantity']
+                            ],
+                            [
+                                "name"=>"需风量",
+                                "value"=>$windData['needQuantity']
+                            ]
                         ]
                     ]
                 ]

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1917 - 1756
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsPowerController.php


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 525 - 406
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsPumpController.php


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

@@ -56,6 +56,9 @@ class ZQDcsWorkFaceController  extends BaseController
     public function get220707GzmList() {
 
         $keys=[
+            "2045462760791041_1", "2045462763287553_1", "2045462765548545_1", // 1\2\3号乳化泵运行状态
+            "2045462780937217_1", // 增压泵状态
+            "2045462760676353_1", "2045462763166721_1", // 1、2清水泵状态
             "2045462760600577_1", "2045462763088897_1", // 1、2号清水泵油温
             "2045462760713217_1","2045462763203585_1","2045462765470721_1", // 1、2、3号乳化泵油温
             "2045462780849153_1", // 乳化泵油温
@@ -104,33 +107,33 @@ class ZQDcsWorkFaceController  extends BaseController
             "ruhuabeng"=>[
                 [
                     "label"=>"1#液泵",
-                    "state"=>0,
-                    "test"=>"停止"
+                    "state"=>($baseData['2045462760791041_1'] ?? 0) > 0 ? 1 : 0,
+                    "text"=>($baseData['2045462760791041_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
                 [
                     "label"=>"乳化增压泵",
-                    "state"=>0,
-                    "test"=>"停止"
+                    "state"=>($baseData['2045462780937217_1'] ?? 0) > 0 ? 1 : 0,
+                    "text"=>($baseData['2045462780937217_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
                 [
                     "label"=>"2#液泵",
-                    "state"=>0,
-                    "test"=>"停止"
+                    "state"=>($baseData['2045462763287553_1'] ?? 0) > 0 ? 1 : 0,
+                    "text"=>($baseData['2045462763287553_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
                 [
                     "label"=>"1#水泵",
-                    "state"=>0,
-                    "test"=>"停止"
+                    "state"=>($baseData['2045462760676353_1'] ?? 0) > 0 ? 1 : 0,
+                    "text"=>($baseData['2045462760676353_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
                 [
                     "label"=>"3#液泵",
-                    "state"=>0,
-                    "test"=>"停止"
+                    "state"=>($baseData['2045462765548545_1'] ?? 0) > 0 ? 1 : 0,
+                    "text"=>($baseData['2045462765548545_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
                 [
                     "label"=>"2#水泵",
-                    "state"=>0,
-                    "test"=>"停止"
+                    "state"=>($baseData['2045462763166721_1'] ?? 0) > 0 ? 1 : 0,
+                    "text"=>($baseData['2045462763166721_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
             ],
             "caimeiji"=>[
@@ -157,17 +160,17 @@ class ZQDcsWorkFaceController  extends BaseController
             "sanji"=>[
                 [
                     "label"=>"转载机运行状态",
-                    "state"=>$baseData['2045462780728321_1'] ?? 0,
+                    "state"=>($baseData['2045462780728321_1'] ?? 0) > 0 ? 1 : 0,
                     "text"=>($baseData['2045462780728321_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
                 [
                     "label"=>"破碎机运行状态",
-                    "state"=>$baseData['2045462777420801_1'] ?? 0,
+                    "state"=>($baseData['2045462777420801_1'] ?? 0) > 0 ? 1 : 0,
                     "text"=>($baseData['2045462777420801_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
                 [
                     "label"=>"刮板机运行状态",
-                    "state"=>$baseData['2045462781619201_1'] ?? 0,
+                    "state"=>($baseData['2045462781619201_1'] ?? 0) > 0 ? 1 : 0,
                     "text"=>($baseData['2045462781619201_1'] ?? 0) > 0 ? "启动" : "停止",
                 ],
             ]
@@ -185,9 +188,12 @@ class ZQDcsWorkFaceController  extends BaseController
             "2045462760791041_1", // "枣泉煤矿220707工作面_1号乳化泵运行状态"
             "2045462763287553_1", // "枣泉煤矿220707工作面_2号乳化泵运行状态"
             "2045462765548545_1", // "枣泉煤矿220707工作面_3号乳化泵运行状态"
+
             "2045462780937217_1", // "枣泉煤矿220707工作面_乳化泵压泵运行状态"
+
             "2045462760676353_1", // "枣泉煤矿220707工作面_1号清水泵运行状态"
             "2045462763166721_1", // "枣泉煤矿220707工作面_2号清水泵运行状态"
+
             "2045462760713217_1", // "枣泉煤矿220707工作面_1号乳化泵润滑油温"
             "2045462760752129_1", // "枣泉煤矿220707工作面_1号乳化泵润滑油压"
             "2045462763203585_1", // "枣泉煤矿220707工作面_2号乳化泵润滑油温"
@@ -198,6 +204,7 @@ class ZQDcsWorkFaceController  extends BaseController
             "2045462760637441_1", // "枣泉煤矿220707工作面_1号清水泵润滑油压"
             "2045462763088897_1", // "枣泉煤矿220707工作面_2号清水泵润滑油温"
             "2045462763127809_1", // "枣泉煤矿220707工作面_2号清水泵润滑油压"
+
             "2045462780849153_1", // "枣泉煤矿220707工作面_乳化泵压泵润滑油温"
             "2045462780896257_1", // "枣泉煤矿220707工作面_乳化泵压泵润滑油压"
             "2045462780808193_1", // "枣泉煤矿220707工作面_乳化泵系统压力"
@@ -211,8 +218,8 @@ class ZQDcsWorkFaceController  extends BaseController
             "info"=>[
                 [
                     "label"=> "1#乳化泵",
-                    "state"=> $baseData['2045462781619201_1'] ?? 0,
-                    "text"=>($baseData['2045462781619201_1'] ?? 0) > 0 ? "启动" : "停止",
+                    "state"=> ($baseData['2045462760791041_1'] ?? 0),
+                    "text"=>($baseData['2045462760791041_1'] ?? 0) > 0 ? "启动" : "停止",
                     "info"=>[
                         [
                             "label"=>"润滑油温(℃)",
@@ -226,7 +233,7 @@ class ZQDcsWorkFaceController  extends BaseController
                 ],
                 [
                     "label"=> "2#乳化泵",
-                    "state"=> $baseData['2045462763287553_1'] ?? 0,
+                    "state"=> ($baseData['2045462763287553_1'] ?? 0),
                     "text"=>($baseData['2045462763287553_1'] ?? 0) > 0 ? "启动" : "停止",
                     "info"=>[
                         [
@@ -241,7 +248,7 @@ class ZQDcsWorkFaceController  extends BaseController
                 ],
                 [
                     "label"=> "3#乳化泵",
-                    "state"=> $baseData['2045462765548545_1'] ?? 0,
+                    "state"=> ($baseData['2045462765548545_1'] ?? 0),
                     "text"=>($baseData['2045462765548545_1'] ?? 0) > 0 ? "启动" : "停止",
                     "info"=>[
                         [
@@ -255,8 +262,23 @@ class ZQDcsWorkFaceController  extends BaseController
                     ]
                 ],
                 [
+                    "label"=> "乳化增压泵",
+                    "state"=> ($baseData['2045462780937217_1'] ?? 0),
+                    "text"=>($baseData['2045462780937217_1'] ?? 0) > 0 ? "启动" : "停止",
+                    "info"=>[
+                        [
+                            "label"=>"润滑油温(℃)",
+                            "value"=>($baseData['2045462780849153_1'] ?? 0),
+                        ],
+                        [
+                            "label"=>"润滑油压(Mpa)",
+                            "value"=>($baseData['2045462780896257_1'] ?? 0),
+                        ]
+                    ]
+                ],
+                [
                     "label"=> "1#清水泵",
-                    "state"=> $baseData['2045462760676353_1'] ?? 0,
+                    "state"=> ($baseData['2045462760676353_1'] ?? 0),
                     "text"=>($baseData['2045462760676353_1'] ?? 0) > 0 ? "启动" : "停止",
                     "info"=>[
                         [
@@ -271,7 +293,7 @@ class ZQDcsWorkFaceController  extends BaseController
                 ],
                 [
                     "label"=> "2#清水泵",
-                    "state"=> $baseData['2045462763166721_1'] ?? 0,
+                    "state"=> ($baseData['2045462763166721_1'] ?? 0),
                     "text"=>($baseData['2045462763166721_1'] ?? 0) > 0 ? "启动" : "停止",
                     "info"=>[
                         [
@@ -313,6 +335,7 @@ class ZQDcsWorkFaceController  extends BaseController
             "2045462782626817_1", //"纵撕报警"
             "2045462781230081_1", //"烟雾报警"
             "2045462774578177_1", //"堆煤报警"
+            "2045462781189121_1", // 通讯状态
             "2045462760791041_1", //"1号乳化泵运行状态"
             "2045462763287553_1", //"2号乳化泵运行状态"
             "2045462765548545_1", //"3号乳化泵运行状态"
@@ -348,49 +371,55 @@ class ZQDcsWorkFaceController  extends BaseController
             "info"=>[
                 [
                     "label"=> "采煤机回路",
-                    "state"=> $baseData['2045462774273025_1'] ?? 0,
+                    "state"=> ($baseData['2045462774273025_1'] ?? 0),
                     "text"=>($baseData['2045462774273025_1'] ?? 0) > 0 ? "启动" : "停止"
                 ],
                 [
                     "label"=> "1#液泵",
-                    "state"=> $baseData['2045462760791041_1'] ?? 0,
+                    "state"=> ($baseData['2045462760791041_1'] ?? 0),
                     "text"=>($baseData['2045462760791041_1'] ?? 0) > 0 ? "启动" : "停止"
                 ],
                 [
                     "label"=> "2#液泵",
-                    "state"=> $baseData['2045462763287553_1'] ?? 0,
+                    "state"=> ($baseData['2045462763287553_1'] ?? 0),
                     "text"=>($baseData['2045462763287553_1'] ?? 0) > 0 ? "启动" : "停止"
                 ],
                 [
                     "label"=> "3#液泵",
-                    "state"=> $baseData['2045462765548545_1'] ?? 0,
+                    "state"=> ($baseData['2045462765548545_1'] ?? 0),
                     "text"=>($baseData['2045462765548545_1'] ?? 0) > 0 ? "启动" : "停止"
                 ],
                 [
                     "label"=> "1#水泵",
-                    "state"=> $baseData['2045462760676353_1'] ?? 0,
+                    "state"=> ($baseData['2045462760676353_1'] ?? 0),
                     "text"=>($baseData['2045462760676353_1'] ?? 0) > 0 ? "启动" : "停止"
                 ],
                 [
                     "label"=> "2#水泵",
-                    "state"=> $baseData['2045462763166721_1'] ?? 0,
+                    "state"=> ($baseData['2045462763166721_1'] ?? 0),
                     "text"=>($baseData['2045462763166721_1'] ?? 0) > 0 ? "启动" : "停止"
                 ],
                 [
                     "label"=> "纵撕",
-                    "state"=> $baseData['2045462782626817_1'] ?? 0,
-                    "text"=>($baseData['2045462782626817_1'] ?? 0) > 0 ? "启动" : "停止"
+                    "state"=> ($baseData['2045462782626817_1'] ?? 0) == 0 ? 1 : 0,
+                    "text"=>($baseData['2045462782626817_1'] ?? 0) == 0 ? "正常" : "报警"
                 ],
                 [
                     "label"=> "烟雾",
-                    "state"=> $baseData['2045462781230081_1'] ?? 0,
-                    "text"=>($baseData['2045462781230081_1'] ?? 0) > 0 ? "启动" : "停止"
+                    "state"=> ($baseData['2045462781230081_1'] ?? 0) == 0 ? 1 : 0,
+                    "text"=>($baseData['2045462781230081_1'] ?? 0) == 0 ? "正常" : "报警"
                 ],
                 [
                     "label"=> "堆煤",
-                    "state"=> $baseData['2045462774578177_1'] ?? 0,
-                    "text"=>($baseData['2045462774578177_1'] ?? 0) > 0 ? "启动" : "停止"
+                    "state"=> ($baseData['2045462774578177_1'] ?? 0) == 0 ? 1 : 0,
+                    "text"=>($baseData['2045462774578177_1'] ?? 0) == 0 ? "正常" : "报警"
+                ],
+                [
+                    "label"=> "通讯状态",
+                    "state"=> ($baseData['2045462781189121_1'] ?? 0) == 0 ? 1 : 0,
+                    "text"=>($baseData['2045462781189121_1'] ?? 0) == 0 ? "正常" : "异常"
                 ],
+
             ],
             "table_data"=>[
                 [
@@ -399,19 +428,19 @@ class ZQDcsWorkFaceController  extends BaseController
                     "tbody"=>[
                         [
                             "label"=>"煤机位置(架)",
-                            "value"=>$baseData['2045462777732097_1'] ?? 0,
+                            "value"=>($baseData['2045462777732097_1'] ?? 0),
                         ],
                         [
                             "label"=>"牵引速度(m/min)",
-                            "value"=>$baseData['2045462774410241_1'] ?? 0,
+                            "value"=>($baseData['2045462774410241_1'] ?? 0),
                         ],
                         [
                             "label"=>"俯仰角(°)",
-                            "value"=>$baseData['2045462774860801_1'] ?? 0,
+                            "value"=>($baseData['2045462774860801_1'] ?? 0),
                         ],
                         [
                             "label"=>"倾角(°)",
-                            "value"=>$baseData['2045462780767233_1'] ?? 0,
+                            "value"=>($baseData['2045462780767233_1'] ?? 0),
                         ],
                     ]
                 ],
@@ -437,7 +466,7 @@ class ZQDcsWorkFaceController  extends BaseController
                         ],
                         [
                             "label"=>"采高范围(m)",
-                            "value"=>1.9-3.7,
+                            "value"=>"1.9"-"3.7",
                         ],
                     ]
                 ],
@@ -447,19 +476,19 @@ class ZQDcsWorkFaceController  extends BaseController
                     "tbody"=>[
                         [
                             "label"=>"220707回风巷15米",
-                            "value"=>$baseData['2010296279116801_1'] ?? 0,
+                            "value"=>($baseData['2010296279116801_1'] ?? 0),
                         ],
                         [
                             "label"=>"220707回风巷80米",
-                            "value"=>$baseData['2010796280116225_1'] ?? 0,
+                            "value"=>($baseData['2010796280116225_1'] ?? 0),
                         ],
                         [
                             "label"=>"220707机巷110米",
-                            "value"=>$baseData['2019138663484417_1'] ?? 0,
+                            "value"=>($baseData['2019138663484417_1'] ?? 0),
                         ],
                         [
                             "label"=>"220707机巷1250米",
-                            "value"=>$baseData['2019139795078145_1'] ?? 0,
+                            "value"=>($baseData['2019139795078145_1'] ?? 0),
                         ],
                     ]
                 ],
@@ -468,57 +497,57 @@ class ZQDcsWorkFaceController  extends BaseController
                     "thread"=>["参数名称", "数值"],
                     "tbody"=>[
                         [
-                            "label"=>"左牵引电流",
-                            "value"=>$baseData['2045462782794753_1'] ?? 0,
+                            "label"=>"左牵引电流(A)",
+                            "value"=>($baseData['2045462782794753_1'] ?? 0),
                         ],
                         [
-                            "label"=>"左牵引温度",
-                            "value"=>$baseData['2045462782833665_1'] ?? 0,
+                            "label"=>"左牵引温度(℃)",
+                            "value"=>($baseData['2045462782833665_1'] ?? 0),
                         ],
                         [
-                            "label"=>"左截割电流",
-                            "value"=>$baseData['2045462782714881_1'] ?? 0,
+                            "label"=>"左截割电流(A)",
+                            "value"=>($baseData['2045462782714881_1'] ?? 0),
                         ],
                         [
-                            "label"=>"左截割温度",
-                            "value"=>$baseData['2045462782753793_1'] ?? 0,
+                            "label"=>"左截割温度(℃)",
+                            "value"=>($baseData['2045462782753793_1'] ?? 0),
                         ],
                         [
-                            "label"=>"左滚筒温度",
-                            "value"=>$baseData['2045462777461761_1'] ?? 0,
+                            "label"=>"左滚筒温度(℃)",
+                            "value"=>($baseData['2045462777461761_1'] ?? 0),
                         ],
 
                         [
-                            "label"=>"右牵引电流",
-                            "value"=>$baseData['2045462781434881_1'] ?? 0,
+                            "label"=>"右牵引电流(A)",
+                            "value"=>($baseData['2045462781434881_1'] ?? 0),
                         ],
                         [
-                            "label"=>"右牵引温度",
-                            "value"=>$baseData['2045462781475841_1'] ?? 0,
+                            "label"=>"右牵引温度(℃)",
+                            "value"=>($baseData['2045462781475841_1'] ?? 0),
                         ],
                         [
-                            "label"=>"右截割电流",
-                            "value"=>$baseData['2045462781352961_1'] ?? 0,
+                            "label"=>"右截割电流(A)",
+                            "value"=>($baseData['2045462781352961_1'] ?? 0),
                         ],
                         [
-                            "label"=>"右截割温度",
-                            "value"=>$baseData['2045462781391873_1'] ?? 0,
+                            "label"=>"右截割温度(℃)",
+                            "value"=>($baseData['2045462781391873_1'] ?? 0),
                         ],
                         [
-                            "label"=>"右滚筒温度",
-                            "value"=>$baseData['2045462777502721_1'] ?? 0,
+                            "label"=>"右滚筒温度(℃)",
+                            "value"=>($baseData['2045462777502721_1'] ?? 0),
                         ],
                     ]
                 ],
             ],
             "chartData_1"=>[
                 "categories"=>[
-                    "00:00", "00:00","00:00","00:00","00:00","00:00",
+                    "09/08", "09/09","09/10","09/11","09/12","09/13",
                 ],
                 "series"=>[
                     [
                         "name"=>"日产量",
-                        "data"=>[0, 0, 0, 0, 0, 0]
+                        "data"=>[1.3, 1.1, 1.2, 1.4, 1.5, 1.2]
                     ]
                 ]
             ],
@@ -633,7 +662,7 @@ class ZQDcsWorkFaceController  extends BaseController
         $info = [
             [
                 "label"=>"转载机设备信息",
-                "state"=> $baseData['2045462782241793_1'] ?? 0,
+                "state"=> ($baseData['2045462782241793_1'] ?? 0) > 0 ? 1 : 0,
                 "text"=>($baseData['2045462782241793_1'] ?? 0) > 0 ? "启动" : "停止",
                 "table"=>[
                     [
@@ -642,75 +671,75 @@ class ZQDcsWorkFaceController  extends BaseController
                         "tbody"=>[
                             [
                                 "label"=> "给定速度",
-                                "value"=> $baseData['2045462781852673_1'] ?? 0,
+                                "value"=> ($baseData['2045462781852673_1'] ?? 0)." RPM",
                             ],
                             [
                                 "label"=> "直流母线电压",
-                                "value"=> $baseData['2045462782321665_1'] ?? 0,
+                                "value"=> ($baseData['2045462782321665_1'] ?? 0)." V",
                             ],
                             [
                                 "label"=> "内腔湿度",
-                                "value"=> $baseData['2045462782088193_1'] ?? 0,
+                                "value"=> ($baseData['2045462782088193_1'] ?? 0)." %",
                             ],
                             [
                                 "label"=> "电阻温度",
-                                "value"=> $baseData['2045462781772801_1'] ?? 0,
+                                "value"=> ($baseData['2045462781772801_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "逆变水冷板温度",
-                                "value"=> $baseData['2045462782127105_1'] ?? 0,
+                                "value"=> ($baseData['2045462782127105_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "腔体温度",
-                                "value"=> $baseData['2045462782163969_1'] ?? 0,
+                                "value"=> ($baseData['2045462782163969_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "整流侧水冷板温度",
-                                "value"=> $baseData['2045462782282753_1'] ?? 0,
+                                "value"=> ($baseData['2045462782282753_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "对地绝缘",
-                                "value"=> $baseData['2045462781811713_1'] ?? 0,
+                                "value"=> ($baseData['2045462781811713_1'] ?? 0)." MΩ",
                             ],
                             [
                                 "label"=> "电机转柜",
-                                "value"=> $baseData['2045462781694977_1'] ?? 0,
+                                "value"=> ($baseData['2045462781694977_1'] ?? 0)." %",
                             ],
                             [
                                 "label"=> "电机电流",
-                                "value"=> $baseData['2045462781619201_1'] ?? 0,
+                                "value"=> ($baseData['2045462781619201_1'] ?? 0)." A",
                             ],
                             [
                                 "label"=> "电机转速",
-                                "value"=> $baseData['2045462781733889_1'] ?? 0,
+                                "value"=> ($baseData['2045462781733889_1'] ?? 0)." RPM",
                             ],
                             [
                                 "label"=> "减速器输入轴温度",
-                                "value"=> $baseData['2045462782049281_1'] ?? 0,
+                                "value"=> ($baseData['2045462782049281_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器冷却水温度",
-                                "value"=> $baseData['2045462781893633_1'] ?? 0,
+                                "value"=> ($baseData['2045462781893633_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器润滑油温度",
-                                "value"=> $baseData['2045462781969409_1'] ?? 0,
+                                "value"=> ($baseData['2045462781969409_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器冷却水压力",
-                                "value"=> $baseData['2045462781932545_1'] ?? 0,
+                                "value"=> ($baseData['2045462781932545_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=> "电动机轴承温度",
-                                "value"=> $baseData['2045462781582337_1'] ?? 0,
+                                "value"=> ($baseData['2045462781582337_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "电机定子绕组温度",
-                                "value"=> $baseData['2045462781658113_1'] ?? 0,
+                                "value"=> ($baseData['2045462781658113_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器润滑油油位",
-                                "value"=> $baseData['2045462782010369_1'] ?? 0,
+                                "value"=> ($baseData['2045462782010369_1'] ?? 0)." m",
                             ],
                         ]
                     ]
@@ -718,7 +747,7 @@ class ZQDcsWorkFaceController  extends BaseController
             ],
             [
                 "label"=>"采煤机破碎机设备信息",
-                "state"=> $baseData['2045462780728321_1'] ?? 0,
+                "state"=> ($baseData['2045462780728321_1'] ?? 0) > 0 ? 1 : 0,
                 "text"=>($baseData['2045462780728321_1'] ?? 0) > 0 ? "启动" : "停止",
                 "table"=>[
                     [
@@ -727,63 +756,63 @@ class ZQDcsWorkFaceController  extends BaseController
                         "tbody"=>[
                             [
                                 "label"=> "破碎机隔离开关状态",
-                                "value"=> $baseData['2045462780288001_1'] ?? 0,
+                                "value"=> ($baseData['2045462780288001_1'] ?? 0) > 0 ? "合闸" : "分闸",
                             ],
                             [
                                 "label"=> "破碎机隔离开关电压",
-                                "value"=> $baseData['2045462780249089_1'] ?? 0,
+                                "value"=> ($baseData['2045462780249089_1'] ?? 0)." V",
                             ],
                             [
                                 "label"=> "破碎机回路启停状态",
-                                "value"=> $baseData['2045462780371969_1'] ?? 0,
+                                "value"=> ($baseData['2045462780371969_1'] ?? 0) > 0 ? "启动" : "停止",
                             ],
                             [
                                 "label"=> "破碎机回路电流",
-                                "value"=> $baseData['2045462780331009_1'] ?? 0,
+                                "value"=> ($baseData['2045462780331009_1'] ?? 0)." A",
                             ],
                             [
                                 "label"=> "采煤机隔离开关合闸状态",
-                                "value"=> $baseData['2045462774193153_1'] ?? 0,
+                                "value"=> ($baseData['2045462774193153_1'] ?? 0) > 0 ? "合闸" : "分闸",
                             ],
                             [
                                 "label"=> "采煤机隔离开关电压",
-                                "value"=> $baseData['2045462774154241_1'] ?? 0,
+                                "value"=> ($baseData['2045462774154241_1'] ?? 0)." V",
                             ],
                             [
                                 "label"=> "采煤机回路启停状态",
-                                "value"=> $baseData['2045462774273025_1'] ?? 0,
+                                "value"=> ($baseData['2045462774273025_1'] ?? 0) > 0 ? "启动" : "停止",
                             ],
                             [
                                 "label"=> "采煤机回路电流",
-                                "value"=> $baseData['2045462774230017_1'] ?? 0,
+                                "value"=> ($baseData['2045462774230017_1'] ?? 0)." A",
                             ],
                             [
                                 "label"=> "减速器输入轴温度",
-                                "value"=> $baseData['2045462780623873_1'] ?? 0,
+                                "value"=> ($baseData['2045462780623873_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器冷却水温度",
-                                "value"=> $baseData['2045462780410881_1'] ?? 0,
+                                "value"=> ($baseData['2045462780410881_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器润滑油温度",
-                                "value"=> $baseData['2045462780523521_1'] ?? 0,
+                                "value"=> ($baseData['2045462780523521_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器冷却水压力",
-                                "value"=> $baseData['2045462780474369_1'] ?? 0,
+                                "value"=> ($baseData['2045462780474369_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=> "电动机轴承温度",
-                                "value"=> $baseData['2045462780163073_1'] ?? 0,
+                                "value"=> ($baseData['2045462780163073_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "电机定子绕组温度",
-                                "value"=> $baseData['2045462780199937_1'] ?? 0,
+                                "value"=> ($baseData['2045462780199937_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器润滑油油位",
-                                "value"=> $baseData['2045462780566529_1'] ?? 0,
+                                "value"=> ($baseData['2045462780566529_1'] ?? 0)." m",
                             ],
                         ]
                     ]
@@ -791,7 +820,7 @@ class ZQDcsWorkFaceController  extends BaseController
             ],
             [
                 "label"=>"刮板机设备信息",
-                "state"=> $baseData['2045462777420801_1'] ?? 0,
+                "state"=> ($baseData['2045462777420801_1'] ?? 0) > 0 ? 1 : 0,
                 "text"=>($baseData['2045462777420801_1'] ?? 0) > 0 ? "启动" : "停止",
                 "table"=>[
                     [
@@ -800,75 +829,75 @@ class ZQDcsWorkFaceController  extends BaseController
                         "tbody"=>[
                             [
                                 "label"=> "给定速度",
-                                "value"=> $baseData['2045462776265729_1'] ?? 0,
+                                "value"=> ($baseData['2045462776265729_1'] ?? 0)." RPM",
                             ],
                             [
                                 "label"=> "直流母线电压",
-                                "value"=> $baseData['2045462776667137_1'] ?? 0,
+                                "value"=> ($baseData['2045462776667137_1'] ?? 0)." V",
                             ],
                             [
                                 "label"=> "内腔湿度",
-                                "value"=> $baseData['2045462776486913_1'] ?? 0,
+                                "value"=> ($baseData['2045462776486913_1'] ?? 0)." %",
                             ],
                             [
                                 "label"=> "电阻温度",
-                                "value"=> $baseData['2045462776185857_1'] ?? 0,
+                                "value"=> ($baseData['2045462776185857_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "逆变水冷板温度",
-                                "value"=> $baseData['2045462776531969_1'] ?? 0,
+                                "value"=> ($baseData['2045462776531969_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "腔体温度",
-                                "value"=> $baseData['2045462776570881_1'] ?? 0,
+                                "value"=> ($baseData['2045462776570881_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "整流侧水冷板温度",
-                                "value"=> $baseData['2045462776624129_1'] ?? 0,
+                                "value"=> ($baseData['2045462776624129_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "对地绝缘",
-                                "value"=> $baseData['2045462776224769_1'] ?? 0,
+                                "value"=> ($baseData['2045462776224769_1'] ?? 0)." MΩ",
                             ],
                             [
                                 "label"=> "电机转柜",
-                                "value"=> $baseData['2045462776097793_1'] ?? 0,
+                                "value"=> ($baseData['2045462776097793_1'] ?? 0)." %",
                             ],
                             [
                                 "label"=> "电机电流",
-                                "value"=> $baseData['2045462776017921_1'] ?? 0,
+                                "value"=> ($baseData['2045462776017921_1'] ?? 0)." A",
                             ],
                             [
                                 "label"=> "电机转速",
-                                "value"=> $baseData['2045462776142849_1'] ?? 0,
+                                "value"=> ($baseData['2045462776142849_1'] ?? 0)." RPM",
                             ],
                             [
                                 "label"=> "减速器输入轴温度",
-                                "value"=> $baseData['2045462776450049_1'] ?? 0,
+                                "value"=> ($baseData['2045462776450049_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器冷却水温度",
-                                "value"=> $baseData['2045462776304641_1'] ?? 0,
+                                "value"=> ($baseData['2045462776304641_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器润滑油温度",
-                                "value"=> $baseData['2045462776378369_1'] ?? 0,
+                                "value"=> ($baseData['2045462776378369_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器冷却水压力",
-                                "value"=> $baseData['2045462776343553_1'] ?? 0,
+                                "value"=> ($baseData['2045462776343553_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=> "电动机轴承温度",
-                                "value"=> $baseData['2045462775979009_1'] ?? 0,
+                                "value"=> ($baseData['2045462775979009_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "电机定子绕组温度",
-                                "value"=> $baseData['2045462776056833_1'] ?? 0,
+                                "value"=> ($baseData['2045462776056833_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器润滑油油位",
-                                "value"=> $baseData['2045462776413185_1'] ?? 0,
+                                "value"=> ($baseData['2045462776413185_1'] ?? 0)." m",
                             ],
                         ]
                     ],
@@ -878,75 +907,75 @@ class ZQDcsWorkFaceController  extends BaseController
                         "tbody"=>[
                             [
                                 "label"=> "给定速度",
-                                "value"=> $baseData['2045462776986625_1'] ?? 0,
+                                "value"=> ($baseData['2045462776986625_1'] ?? 0)." RPM",
                             ],
                             [
                                 "label"=> "直流母线电压",
-                                "value"=> $baseData['2045462777377793_1'] ?? 0,
+                                "value"=> ($baseData['2045462777377793_1'] ?? 0)." V",
                             ],
                             [
                                 "label"=> "内腔湿度",
-                                "value"=> $baseData['2045462777218049_1'] ?? 0,
+                                "value"=> ($baseData['2045462777218049_1'] ?? 0)." %",
                             ],
                             [
                                 "label"=> "电阻温度",
-                                "value"=> $baseData['2045462776914945_1'] ?? 0,
+                                "value"=> ($baseData['2045462776914945_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "逆变水冷板温度",
-                                "value"=> $baseData['2045462777256961_1'] ?? 0,
+                                "value"=> ($baseData['2045462777256961_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "腔体温度",
-                                "value"=> $baseData['2045462777297921_1'] ?? 0,
+                                "value"=> ($baseData['2045462777297921_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "整流侧水冷板温度",
-                                "value"=> $baseData['2045462777338881_1'] ?? 0,
+                                "value"=> ($baseData['2045462777338881_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "对地绝缘",
-                                "value"=> $baseData['2045462776951809_1'] ?? 0,
+                                "value"=> ($baseData['2045462776951809_1'] ?? 0)." MΩ",
                             ],
                             [
                                 "label"=> "电机转柜",
-                                "value"=> $baseData['2045462776843265_1'] ?? 0,
+                                "value"=> ($baseData['2045462776843265_1'] ?? 0)." %",
                             ],
                             [
                                 "label"=> "电机电流",
-                                "value"=> $baseData['2045462776767489_1'] ?? 0,
+                                "value"=> ($baseData['2045462776767489_1'] ?? 0)." A",
                             ],
                             [
                                 "label"=> "电机转速",
-                                "value"=> $baseData['2045462776880129_1'] ?? 0,
+                                "value"=> ($baseData['2045462776880129_1'] ?? 0)." RPM",
                             ],
                             [
                                 "label"=> "减速器输入轴温度",
-                                "value"=> $baseData['2045462777177089_1'] ?? 0,
+                                "value"=> ($baseData['2045462777177089_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器冷却水温度",
-                                "value"=> $baseData['2045462777023489_1'] ?? 0,
+                                "value"=> ($baseData['2045462777023489_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器润滑油温度",
-                                "value"=> $baseData['2045462777103361_1'] ?? 0,
+                                "value"=> ($baseData['2045462777103361_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器冷却水压力",
-                                "value"=> $baseData['2045462777066497_1'] ?? 0,
+                                "value"=> ($baseData['2045462777066497_1'] ?? 0)." Mpa",
                             ],
                             [
                                 "label"=> "电动机轴承温度",
-                                "value"=> $baseData['2045462776724481_1'] ?? 0,
+                                "value"=> ($baseData['2045462776724481_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "电机定子绕组温度",
-                                "value"=> $baseData['2045462776804353_1'] ?? 0,
+                                "value"=> ($baseData['2045462776804353_1'] ?? 0)." ℃",
                             ],
                             [
                                 "label"=> "减速器润滑油油位",
-                                "value"=> $baseData['2045462777140225_1'] ?? 0,
+                                "value"=> ($baseData['2045462777140225_1'] ?? 0)." m",
                             ],
                         ]
                     ],