20230516

src/App.vue

@@ -192,26 +192,33 @@ export default {
         }
       });
       if (index == 0) {
+         this.menuBtn[index].icon = require("./assets/images/shouYeAc.png");
          this.$router.push("/");
-        this.menuBtn[index].icon = require("./assets/images/shouYeAc.png");
+       
       } else if (index == 1) {
+          this.menuBtn[index].icon = require("./assets/images/faTingAc.png");
           this.$router.push("court");
-        this.menuBtn[index].icon = require("./assets/images/faTingAc.png");
+      
       
       } else if (index == 2) {
-         this.$router.push("energySaving");
         this.menuBtn[index].icon = require("./assets/images/jieNengAc.png");
+         this.$router.push("energySaving");
+        
        
       } else if (index == 3) {
-        this.$router.push("security");
         this.menuBtn[index].icon = require("./assets/images/anFangAc.png");
+        this.$router.push("security");
+        
         
       } else if (index == 4) {
+         this.menuBtn[index].icon = require("./assets/images/yunWeiAc.png"); 
          this.$router.push("operationMaintenance");
-        this.menuBtn[index].icon = require("./assets/images/yunWeiAc.png"); 
+       
       } else if (index == 5) {
-        this.$router.push("alarm");
         this.menuBtn[index].icon = require("./assets/images/gaoJingAc.png"); 
+        this.menuBtn[index].icon = require("./assets/images/gaoJingAc.png"); 
+        this.$router.push("alarm");
+        
       }
        this.goPage(name);
     //   if (name!="首页"){
@@ -270,7 +277,7 @@ export default {
 #app {
   // width: 6144px;
   // height: 1920px;
-  background: rgba(1, 1, 7, 1);
+  background: rgba(1, 1, 7, 0);
   // overflow: hidden;
   .header {
     height: 11%;

src/main.js

@@ -47,9 +47,9 @@ window.PubScribe = function (topic, _callback,) {
         qos: 0
       }, (err) => {
         if (!err) {
-          console.log("订阅成功0", ['FirstLevel','SecondLevel','ThirdLevel']);
+          //console.log("订阅成功0", ['FirstLevel','SecondLevel','ThirdLevel']);
         } else {
-          console.log('订阅失败');
+          //console.log('订阅失败');
         }
       });
 
@@ -93,7 +93,6 @@ function realInfo(topic, message) {
             const u8arr = new Uint8Array(message);
             const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
             const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片，不报错则返回的是JSON的错误提示数据
-            console.log("msg", msg);
             
             for (let i = 0; i < msg.length; i++) {
                 window.alarmFirstLevel.splice(0,window.alarmFirstLevel.length);
@@ -103,7 +102,6 @@ function realInfo(topic, message) {
             // alarmAllLevel
         //消防，电梯、动环系统
           } catch (error) {}
-          console.log(error);
           break;
            case "SecondLevel":
           try {
@@ -111,13 +109,11 @@ function realInfo(topic, message) {
             const u8arr = new Uint8Array(message);
             const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
             const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片，不报错则返回的是JSON的错误提示数据
-            console.log("msg", msg);
             for (let i = 0; i < msg.length; i++) {
                 window.alarmSecondLevel.splice(0,window.alarmSecondLevel.length);
                 window.alarmSecondLevel.push(msg[i])
             }
           } catch (error) {}
-          console.log(error);
           break;
           case "ThirdLevel":
           try {
@@ -125,13 +121,12 @@ function realInfo(topic, message) {
             const u8arr = new Uint8Array(message);
             const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
             const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片，不报错则返回的是JSON的错误提示数据
-            console.log("msg", msg);
+
             for (let i = 0; i < msg.length; i++) {
                 window.alarmThirdLevel.splice(0,window.alarmThirdLevel.length);
                 window.alarmThirdLevel.push(msg[i])
             }
           } catch (error) {}
-          console.log(error);
           break;
       }
     }

src/utils/mqttConfig.js

@@ -35,7 +35,6 @@ class mqttHandle {
         //配置链接
         // console.log("connectUrl",connectUrl)
         const { host, port, endpoint, ...options } = this.connect;
-        console.log("this.connect.host", this.connect.host)
          const connectUrl = 'ws://138.227.208.100:1884/mqtt';
         //const connectUrl = 'ws://172.16.1.253:1884/mqtt';
         if (this.mqttClient == undefined) {

src/utils/request.js

@@ -0,0 +1,101 @@
+import axios from 'axios'
+import {
+  Message
+} from 'element-ui'
+import qs from 'qs'
+import { debounce } from 'throttle-debounce'
+import Lockr from 'lockr'
+
+const errorMessage = debounce(500, (message, type = 'error') => {
+  Message({
+    message: message,
+    duration: 1500,
+    type: type
+  })
+})
+
+axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+// 创建axios实例
+const service = axios.create({
+  baseURL: process.env.BASE_API, // api 的 base_url
+  withCredentials: true,
+  timeout: 600000 // 请求超时时间
+})
+
+// request拦截器
+service.interceptors.request.use(
+  config => {
+    config.headers['Admin-Token'] = Lockr.get('Admin-Token') ? Lockr.get('Admin-Token') : ''
+    const flag = config.headers['Content-Type'] && config.headers['Content-Type'].indexOf('application/json') !== -1
+    if (!flag) {
+      const mult = config.headers['Content-Type'] && config.headers['Content-Type'].indexOf('multipart/form-data') !== -1
+      if (mult) {
+        config.data = config.data
+      } else {
+        config.data = qs.stringify(config.data)
+      }
+    } else {
+      if (config.data === undefined || config.data === null) {
+        // 不传参的情况下 json类型的提交数据，校准为 空对象
+        config.data = {}
+      }
+    }
+    return config
+  },
+  error => {
+    // Do something with request error
+    return Promise.reject(error)
+  }
+)
+
+// response 拦截器
+service.interceptors.response.use(
+  response => {
+    /**
+     * code为非20000是抛错 可结合自己业务进行修改
+     */
+    const res = response.data
+    if (response.status === 200 && response.config.responseType === 'blob') { // 文件类型特殊处理
+      if (response.headers['content-disposition'] || (response.headers['content-type'] && response.headers['content-type'].indexOf('application/pdf') !== -1)) {
+        return response
+      } else if (response.data) {
+        const resultBlob = new Blob([response.data], { type: 'application/json' })
+        const fr = new FileReader()
+        fr.onload = function () {
+          const result = JSON.parse(this.result)
+          // 附件下载反馈的302 忽略
+          if (result.msg && result.code !== 302) {
+            errorMessage(result.msg, result.code === 1 ? 'success' : 'error')
+          }
+        }
+        fr.readAsText(resultBlob)
+      }
+    } else if (response.status === 400) {
+              SingleMessage({
+                message: '请输入正确的登录信息！！！',
+                type: 'warning',
+                duration: 3 * 1000
+              })
+    }else if ((res.code && res.code !== 0) || res.error) {
+      if (res.msg) {
+        errorMessage(res.msg)
+      }
+      return Promise.reject(res)
+    } else {
+      return res
+    }
+  },
+  error => {
+    if (error.response) {
+      const response = error.response
+      if (response.status === 500) {
+        errorMessage('网络错误，请检查您的网络')
+      } else if (response.data && response.data.msg) {
+        errorMessage(response.data.msg)
+      }
+    }
+    return Promise.reject(error)
+  }
+)
+
+export default service

src/views/alarm.vue

@@ -156,7 +156,7 @@ export default {
      alarmFirstLevel(val) {
        
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmFirstLevel",val)
+      //console.log("alarmFirstLevel",val)
       if(val.length!=0){
         this.upmqttData(val) 
       }
@@ -164,12 +164,12 @@ export default {
     },
      alarmSecondLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmSecondLevel",val)
+      //console.log("alarmSecondLevel",val)
       this.upmqttData(val) 
     },
      alarmThirdLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmThirdLevel",val)
+      //console.log("alarmThirdLevel",val)
       this.upmqttData(val) 
     },
      },
@@ -266,7 +266,7 @@ export default {
             risk: val[index].AlarmLevel,
           };
       });
-      console.log("warnListMqtt",warnListMqtt)
+      //console.log("warnListMqtt",warnListMqtt)
        for (let i = 0; i < warnListMqtt.length; i++) {
             if(warnListMqtt[i].risk=='三级'){
              this.warnList3.splice(0,0,warnListMqtt[i]);

src/views/camera/cameraBig.vue

@@ -74,7 +74,7 @@ export default {
     },
     // 关闭摄像头
     closeVideo() {
-      console.log('关闭');
+      //console.log('关闭');
       this.player.dispose();
     },
   },

src/views/energySaving.vue

@@ -424,7 +424,7 @@ export default {
      alarmFirstLevel(val) {
        
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmFirstLevel",val)
+     // console.log("alarmFirstLevel",val)
       if(val.length!=0){
         this.upmqttData(val) 
       }
@@ -432,12 +432,12 @@ export default {
     },
      alarmSecondLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmSecondLevel",val)
+      //console.log("alarmSecondLevel",val)
       this.upmqttData(val) 
     },
      alarmThirdLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmThirdLevel",val)
+      //console.log("alarmThirdLevel",val)
       this.upmqttData(val) 
     },
      },
@@ -559,7 +559,7 @@ export default {
         });
         // 重连回调
         this.mqttClient.on("reconnect", () => {
-          console.log("[MQTT-TEST] 重连中……");
+         // console.log("[MQTT-TEST] 重连中……");
         });
         // 连接回调
         this.mqttClient.on("connect", () => {
@@ -573,8 +573,6 @@ export default {
             const u8arr = new Uint8Array(message);
             const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
             const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片，不报错则返回的是JSON的错误提示数据
-            console.log("msg", msg);
-            console.log("msg", msg);
             if (msg.params.设备运行状态 == 1) {
               msg.params.设备运行状态 = "正常";
             } else {
@@ -596,7 +594,6 @@ export default {
     },
     //获取所有设备信息
     getAllDevicesInfo() {
-        console.log("getAllDevices")
       //调用接口数据
       let allDevicesCode = [];
       getAllDevices().then((res) => {
@@ -637,7 +634,7 @@ export default {
         
         }).catch(err => {
                                  
-                            });;
+                            });
       }).catch(err => {
                                  
                             });
@@ -721,7 +718,7 @@ export default {
           DeviceTypes:val[index].DeviceTypes,
         };
       });
-      console.log("warnListMqtt",warnListMqtt)
+      //console.log("warnListMqtt",warnListMqtt)
        for (let i = 0; i < warnListMqtt.length; i++) {
                 if(warnListMqtt[i].DeviceTypes==this.warnList[0].DeviceTypes){
                     this.warnList.splice(0,0,warnListMqtt[i]);

src/views/index.vue

@@ -516,39 +516,39 @@ export default {
   watch: {
     alarmAllLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmAllLevel", val);
+      //console.log("alarmAllLevel", val);
       this.upmqttData(val);
     },
   
     alarmFirstLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmFirstLevel", val);
+      //console.log("alarmFirstLevel", val);
       if (val.length != 0) {
         this.upmqttData(val);
       }
     },
     alarmSecondLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmSecondLevel", val);
+      //console.log("alarmSecondLevel", val);
       this.upmqttData(val);
     },
     alarmThirdLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmThirdLevel", val);
+      //console.log("alarmThirdLevel", val);
       this.upmqttData(val);
     },
   },
     watch: {
     alarmAllLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmAllLevel",val)
+      //console.log("alarmAllLevel",val)
       this.upmqttData(val) 
     },
 
      alarmFirstLevel(val) {
        
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmFirstLevel",val)
+      //console.log("alarmFirstLevel",val)
       if(val.length!=0){
         this.upmqttData(val) 
       }
@@ -556,19 +556,19 @@ export default {
     },
      alarmSecondLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmSecondLevel",val)
+      //console.log("alarmSecondLevel",val)
       this.upmqttData(val) 
     },
      alarmThirdLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmThirdLevel",val)
+      //console.log("alarmThirdLevel",val)
       this.upmqttData(val) 
     },
      },
   methods: {
     //放大变焦
     addZoom() {
-      console.log(this.camersCode, "sssssssssssss");
+      //console.log(this.camersCode, "sssssssssssss");
       let dataList = {
         path: "/artemis/api/video/v1/ptzs/controlling",
         data: {
@@ -579,14 +579,14 @@ export default {
         },
       };
       getHikvision(dataList).then((res) => {
-        console.log(res, "=============");
+        //console.log(res, "=============");
       }).catch(err => {
                                  
                             });
     },
       selectTime(val){
         if(val){
-            console.log("val",val)
+            //console.log("val",val)
             this.value1 = val
                  let data = {
                     buildingId: this.selectValue.value, //建筑id
@@ -609,7 +609,7 @@ export default {
     },
     selectTimeMM(val){
          if(val){
-            console.log("val",val)
+            //console.log("val",val)
             this.value2 = val
                  let data = {
         buildingId: this.selectValue.value, //建筑id
@@ -632,7 +632,7 @@ export default {
     },
     selectTimeDD(val){
          if(val){
-            console.log("val",val)
+            //console.log("val",val)
             this.value3 = val
                  let data = {
         buildingId: this.selectValue.value, //建筑id
@@ -655,7 +655,7 @@ export default {
     },
     //缩小变焦
     reduceZoom() {
-      console.log(this.camersCode, "sssssssssssss");
+      //console.log(this.camersCode, "sssssssssssss");
       let dataList = {
         path: "/artemis/api/video/v1/ptzs/controlling",
         data: {
@@ -666,7 +666,7 @@ export default {
         },
       };
       getHikvision(dataList).then((res) => {
-        console.log(res, "=============");
+        //console.log(res, "=============");
       }).catch(err => {
                                  
                             });
@@ -696,7 +696,7 @@ export default {
         //   "&code=" +
         //   dataList.data.cameraIndexCode;
           this.cameraList[0].video =res.data.result.data.url;
-          console.log(this.cameraList[0].video,'视频地址');
+         // console.log(this.cameraList[0].video,'视频地址');
       }).catch(err => {
                                  
                             });
@@ -756,7 +756,7 @@ export default {
     //获取建筑Id
     getBuildingData() {
       getBuildinginfos().then((res) => {
-        console.log("res",res)
+       // console.log("res",res)
         // 接口取值
         this.buildingList = res.data.dataResults;
         let buildArr = [];
@@ -826,7 +826,7 @@ export default {
     //智慧节能选择类型
     selectMeterType(event) {
       let nowTime = "";
-    console.log("selectDate",this.selectDate)
+    //console.log("selectDate",this.selectDate)
       if (this.selectDate == 1) {
         // nowTime = this.$moment().format("YYYYMMDD");
          nowTime = this.value1
@@ -837,10 +837,7 @@ export default {
         // nowTime = this.$moment().format("YYYY");
           nowTime = this.value3
       }
-      console.log("this.value1",this.value1)
+  //
-      console.log("this.value2",this.value2)
-      console.log("this.value3",this.value3)
-       console.log("nowTime",nowTime)
       let data = {
         buildingId: event.value, //建筑id
         customerId: "12345678",
@@ -851,7 +848,7 @@ export default {
       };
       //接口获取区域
       getAreaList(data).then((res) => {
-        console.log(res.data.data, "sssssssssssssss");
+        //console.log(res.data.data, "sssssssssssssss");
         this.energyEcharts(res.data.data);
       }).catch(err => {
                                  
@@ -951,7 +948,7 @@ export default {
           risk: val[index].AlarmLevel,
         };
       });
-      console.log("warnListMqtt", warnListMqtt);
+      //console.log("warnListMqtt", warnListMqtt);
       for (let i = 0; i < warnListMqtt.length; i++) {
         this.warnList.splice(0, 0, warnListMqtt[i]);
       }
@@ -1438,7 +1435,7 @@ export default {
       myChart.setOption(option);
     },
     energyEcharts(val) {
-      console.log(val, "节能数据");
+      //console.log(val, "节能数据");
       let dataX = [];
       let dataY = [];
       val.values.forEach((item, index) => {
@@ -1635,7 +1632,7 @@ export default {
             const u8arr = new Uint8Array(message);
             const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
             const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片，不报错则返回的是JSON的错误提示数据
-            console.log("msg", msg);
+           // console.log("msg", msg);
           } catch (error) {}
           break;
       }

src/views/security.vue

@@ -347,58 +347,58 @@ export default {
           // console.log("name",name)
        if (name.indexOf("法院一层") != -1 ) {
         if (name.indexOf("走道") != -1 || name.indexOf("大厅") != -1|| name.indexOf("楼梯") != -1|| name.indexOf("自助立案") != -1|| name.indexOf("门厅") != -1|| name.indexOf("展厅") != -1) {
-           console.log("消防联动,主楼一层,公共区");     
+          // console.log("消防联动,主楼一层,公共区");     
         }else{
-             console.log("消防联动,主楼一层,办公区");
+           //  console.log("消防联动,主楼一层,办公区");
         }
              
         } else if(name.indexOf("法院四层") != -1) {
            if (name.indexOf("走道") != -1 || name.indexOf("大厅") != -1|| name.indexOf("楼梯") != -1|| name.indexOf("自助立案") != -1) {
-           console.log("消防联动,主楼四层,公共区");     
+          // console.log("消防联动,主楼四层,公共区");     
         }else{
-             console.log("消防联动,主楼四层,办公区");
+            // console.log("消防联动,主楼四层,办公区");
         }
         }else if(name.indexOf("法院二层") != -1) {
            //console.log("消防联动 主楼二层");
             if (name.indexOf("走道") != -1 || name.indexOf("大厅") != -1|| name.indexOf("楼梯") != -1|| name.indexOf("自助立案") != -1) {
-           console.log("消防联动,主楼二层,公共区");     
+           //console.log("消防联动,主楼二层,公共区");     
         }else{
-             console.log("消防联动,主楼二层,办公区");
+            // console.log("消防联动,主楼二层,办公区");
         }
         }else if(name.indexOf("法院三层") != -1) {
           // console.log("消防联动 主楼三层");
            if (name.indexOf("走道") != -1 || name.indexOf("大厅") != -1|| name.indexOf("楼梯") != -1|| name.indexOf("自助立案") != -1) {
-           console.log("消防联动,主楼三层,公共区");     
+           //console.log("消防联动,主楼三层,公共区");     
         }else{
-             console.log("消防联动,主楼三层,办公区");
+            // console.log("消防联动,主楼三层,办公区");
         }
         }else if(name.indexOf("辅楼1层") != -1) {
           // console.log("消防联动 辅楼一层");
             if (name.indexOf("走道") != -1 || name.indexOf("大厅") != -1|| name.indexOf("楼梯") != -1|| name.indexOf("自助立案") != -1) {
-           console.log("消防联动,辅楼一层,公共区");     
+           //console.log("消防联动,辅楼一层,公共区");     
         }else{
-             console.log("消防联动,辅楼一层,办公区");
+            // console.log("消防联动,辅楼一层,办公区");
         }
         }else if(name.indexOf("辅楼2层") != -1) {
           // console.log("消防联动 辅楼二层");
             if (name.indexOf("走道") != -1 || name.indexOf("大厅") != -1|| name.indexOf("楼梯") != -1) {
-           console.log("消防联动,辅楼二层,公共区");     
+          // console.log("消防联动,辅楼二层,公共区");     
         }else{
-             console.log("消防联动,辅楼二层,办公区");
+            // console.log("消防联动,辅楼二层,办公区");
         }
         }else if(name.indexOf("辅楼3层") != -1) {
            //console.log("消防联动 辅楼三层");
             if (name.indexOf("走道") != -1 || name.indexOf("大厅") != -1|| name.indexOf("楼梯") != -1|| name.indexOf("电梯") != -1) {
-           console.log("消防联动,辅楼三层,公共区");     
+           //console.log("消防联动,辅楼三层,公共区");     
         }else{
-             console.log("消防联动,辅楼三层,办公区");
+            // console.log("消防联动,辅楼三层,办公区");
         }
         }else if(name.indexOf("辅楼4层") != -1) {
            //console.log("消防联动 辅楼四层");
             if (name.indexOf("走道") != -1 || name.indexOf("大厅") != -1|| name.indexOf("楼梯") != -1|| name.indexOf("电梯") != -1) {
-           console.log("消防联动,辅楼四层,公共区");     
+          // console.log("消防联动,辅楼四层,公共区");     
         }else{
-             console.log("消防联动,辅楼四层,办公区");
+            // console.log("消防联动,辅楼四层,办公区");
         }
         }
     };
@@ -419,19 +419,19 @@ export default {
    
     alarmFirstLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmFirstLevel", val);
+      //console.log("alarmFirstLevel", val);
       if (val.length != 0) {
         this.upmqttData(val);
       }
     },
     alarmSecondLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmSecondLevel", val);
+      //console.log("alarmSecondLevel", val);
       this.upmqttData(val);
     },
     alarmThirdLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      console.log("alarmThirdLevel", val);
+      //console.log("alarmThirdLevel", val);
       this.upmqttData(val);
     },
   },
@@ -530,7 +530,7 @@ export default {
         let doorOnLineList = [];
         let offLineList = [];
         getHikvision(doorStatusList).then((res) => {
-          console.log(res.data.result.data.authDoorList, "门禁状态数量");
+          //console.log(res.data.result.data.authDoorList, "门禁状态数量");
           for (let i = 0; i < res.data.result.data.authDoorList.length; i++) {
             //获取总数的数组
             doorTotalList.push(res.data.result.data.authDoorList);
@@ -578,7 +578,7 @@ export default {
         let cameraOnLineList = [];
         let cameraoffLineList = [];
         getHikvision(cameraStatusList).then((res) => {
-          console.log(res.data.result.data.list, "摄像头状态数量");
+          //console.log(res.data.result.data.list, "摄像头状态数量");
           for (let i = 0; i < res.data.result.data.list.length; i++) {
             //获取总数的数组
             cameraTotalList.push(res.data.result.data.list);
@@ -702,14 +702,14 @@ export default {
           AlarmLevel: val[index].AlarmLevel,
         };
       });
-      console.log("warnListMqtt", warnListMqtt);
+      //console.log("warnListMqtt", warnListMqtt);
       for (let i = 0; i < warnListMqtt.length; i++) {
         if (warnListMqtt[i].AlarmLevel == "三级") {
           this.policeList.splice(0, 0, warnListMqtt[i]);
           this.getAlarmCount();
         }
         if (warnListMqtt[i].DeviceType == "消防") {
-            console.log("warnListMqtt[i]",warnListMqtt[i])
+            //console.log("warnListMqtt[i]",warnListMqtt[i])
           this.fireWarnList.splice(0, 0, warnListMqtt[i]);
           this.getWarning(warnListMqtt[i].position)
         }