1 应急响应 - 界面报错问题修复，及去掉 用户渲染地图。

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

@@ -329,7 +329,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a2.user_id as userId
         from t_detector_info a1
         right join t_detector_user a2 on a1.user_id = a2.user_id
-        where a1.is_del = '0' and a2.is_del = '0' and a1.detector_status = '2' and a1.error_msg is null
+        where a1.is_del = '0' and a2.is_del = '0' and a1.detector_status = '2' and a2.error_msg is null
     </select>
 
     <insert id="insertTDetectorUser" parameterType="TDetectorUser" useGeneratedKeys="true" keyProperty="userId">

zh-baseversion-web/src/views/emergency/index.vue

@@ -416,12 +416,12 @@ export default {
           imgurl: require("@/assets/images/cz3.png"),
           name: "场 站",
         },
-        {
-          val: 6,
-          ischeck: false,
-          imgurl: require("@/assets/images/cz4.png"),
-          name: "用 户",
-        },
+        // {
+        //   val: 6,
+        //   ischeck: false,
+        //   imgurl: require("@/assets/images/cz4.png"),
+        //   name: "用 户",
+        // },
         {
           val: 5,
           ischeck: false,
@@ -592,14 +592,14 @@ export default {
       this.goMap(getVideo, this.addDevice, VideoView);
 
       // 用户要等一下 因为有报警数据
-      this.goMap(detectorUserList, this.addDevice, User).then((res) => {
-        // 先查一下，然后开启定时器
-        this.userAlarm();
-        this.alarmTimer = setInterval(() => {
-          this.userAlarm();
-          // console.log("查询报警");
-        }, alarmtime);
-      });
+      // this.goMap(detectorUserList, this.addDevice, User).then((res) => {
+      //   // 先查一下，然后开启定时器
+      //   this.userAlarm();
+      //   this.alarmTimer = setInterval(() => {
+      //     this.userAlarm();
+      //     // console.log("查询报警");
+      //   }, alarmtime);
+      // });
     }
     this.currentTime();
     // this.$refs.mychild.choice(this.selarr);