添加报警类型

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorInfoController.java

@@ -138,6 +138,10 @@ public class TDetectorInfoController extends BaseController
                     alarm.setDetectorType("工业探测器");
                 }else if ("3".equals(alarm.getDetectorType())){
                     alarm.setDetectorType("可燃气体探测器");
+                }else if ("4".equals(alarm.getDetectorType())){
+                    alarm.setDetectorType("激光家报");
+                }else if ("5".equals(alarm.getDetectorType())){
+                    alarm.setDetectorType("地下井探测器");
                 }
             }
 

zh-baseversion-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml

@@ -109,7 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.email AS email,
             CASE a.detector_type
             WHEN '1' THEN '家用探测器'
-            WHEN '2' THEN '工业探测器' END AS detectorType,
+            WHEN '2' THEN '工业探测器'
+            WHEN '3' THEN '可燃气体探测器'
+            WHEN '4' THEN '激光家报'
+            WHEN '5' THEN '地下井探测器'
+        END AS detectorType,
             COUNT(a.detector_id) AS detectorCount,
             SUM(CASE a.detector_status WHEN '0' THEN 1 ELSE 0 END) AS onLineNum,
             SUM(CASE a.detector_status WHEN '1' THEN 1 ELSE 0 END) AS offLineNum

zh-baseversion-web/src/components/bigWindow/rightBar.vue

@@ -393,7 +393,7 @@ export default {
 
   data() {
     return {
-      open: false,
+      open: true,
       isopen: true,
       allNum: {},
       diviceNum: {

zh-baseversion-web/src/views/operationMonitor/detectorReportData/index.vue

@@ -47,6 +47,8 @@
         <template slot-scope="scope">
           <span v-if="scope.row.detectorType == '1'">家用探测器</span>
           <span v-if="scope.row.detectorType == '2'">工业探测器</span>
+          <span v-if="scope.row.detectorType == '4'">激光家报</span>
+          <span v-if="scope.row.detectorType == '5'">地下井探测器</span>
         </template>
       </el-table-column>
       <el-table-column label="预警信息" align="center" prop="statusName" />