Merge remote-tracking branch 'origin/master'

gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/TDetectorUserVO.java

@@ -3,6 +3,7 @@ package com.zehong.system.domain.vo;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 探测器用户对象 t_detector_user
@@ -30,6 +31,11 @@ public class TDetectorUserVO
     /** 用户类型（1居民用户，2商业用户，3工业用户） */
     private String userType;
 
+    private List<Object> detectorCountList;
+
+    /** 设备类型 */
+    private String detectorType;
+
     /** 探测器总数 */
     private Integer detectorCount;
 

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDetectorUserServiceImpl.java

@@ -85,6 +85,7 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
             userVO.setCancelAlarmNum(cancelAlarmNum);
             userVO.setProcessingAlarmNum(Math.abs(historyAlarmNum - cancelAlarmNum));
             userVO.setIconType("6");
+            userVO.setDetectorType("气体探测器");
 
             list.add(userVO);
         }

gassafetyprogress-web/src/components/bigWindow/DeviceA.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-02-28 09:45:42
+ * @LastEditTime: 2022-02-28 13:43:25
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -61,8 +61,8 @@
         <div>已处理报警</div>
         <div class="last">报警中</div>
       </div>
-      <div class="tbody flex">
-        <div class="first zzz">{{ "流量计与压力表" }}</div>
+      <div class="tbody flex" v-if="Array.isArray(deviceData.pressureFlows)">
+        <div class="first zzz">{{ "流量计" }}</div>
         <div class="">{{ deviceData.pressureFlows.length }}</div>
         <div v-unValue class="">
           {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
@@ -99,8 +99,7 @@ export default {
     return {
       companyType,
       deviceType,
-      profile:"暂无"
-
+      profile: "暂无",
     };
   },
   computed: {
@@ -119,8 +118,7 @@ export default {
         this.companyType[item.conpanyId] = item.companyName;
       });
     }
-    console.log(this.deviceData)
-
+    console.log(this.deviceData);
   },
   methods: {
     close() {
@@ -248,4 +246,4 @@ export default {
     justify-content: space-between;
   }
 }
-</style>
\ No newline at end of file
+</style>

gassafetyprogress-web/src/components/bigWindow/User.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-02-28 10:01:07
+ * @LastEditTime: 2022-02-28 13:30:46
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -46,7 +46,7 @@
         <div class="last">报警中</div>
       </div>
       <div class="tbody flex">
-        <div v-unValue class="first zzz">{{  }}</div>
+        <div v-unValue class="first zzz">{{ deviceData.detectorType }}</div>
         <div class="">{{ deviceData.detectorCount }}</div>
         <div v-unValue class="">
           {{ deviceData.onLineNum }}
@@ -227,4 +227,4 @@ export default {
     justify-content: space-between;
   }
 }
-</style>
\ No newline at end of file
+</style>