修改传感器

src/api/monitor.js

@@ -12,7 +12,9 @@ export function selectCameraByDeptId(deptId) {
   return request({
     url: '/center-agriculture/monitor/selectCameraByDeptId',
     method: 'post',
-    data:{"deptId":deptId}
+    data: {
+      "deptId": deptId
+    }
   })
 }
 // 获取重点区域
@@ -23,11 +25,12 @@ export function selectKeyAreaList() {
   })
 }
 //获取点位周边摄像头
-export function findCameraByEventCoordinate(longitude,latitude) {
+export function findCameraByEventCoordinate(longitude, latitude) {
   // longitude = '124.41986560821533';
   // latitude = '43.08817137032747';
   return request({
-    url: '/center-traffic/traffic/findCameraByEventCoordinate?longitude='+longitude+"&latitude="+latitude+"&type=1",
+    url: '/center-traffic/traffic/findCameraByEventCoordinate?longitude=' + longitude + "&latitude=" + latitude +
+      "&type=1",
     method: 'get',
   })
 }
@@ -40,23 +43,23 @@ export function getCamerasByDeptId(deptId) {
   })
 }
 //转到固定点位
-export function rotation(lng,lat,list) {
+export function rotation(lng, lat, list) {
   // lng = '124.41986560821533';
   // lat = '43.08817137032747';
   return request({
     url: '/center-traffic/traffic/rotation',
     method: 'post',
-    data:{
-      lng:lng,
-      lat:lat,
-      list:list
+    data: {
+      lng: lng,
+      lat: lat,
+      list: list
     }
   })
 }
 // 获取重点区域
 export function getRegionalFlag(id) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getRegionalFlag/'+id,
+    url: '/center-fire/VisuForestCloudMapController/getRegionalFlag/' + id,
     method: 'get',
   })
 }
@@ -75,3 +78,11 @@ export function getDlblistBydeptId(deptId) {
   })
 }
 
+
+//根据部门id查询部门及部门以下的数据，没有则默认查询所有
+export function getMonitorDeviceAndDataList(deptId) {
+  return request({
+    url: '/center-monitor/device/getMonitorDeviceAndDataList?deptId=' + deptId,
+    method: 'get',
+  })
+}

src/views/monitor.vue

@@ -100,7 +100,7 @@
                 <div class="d-l-l-text">
                   <i class="iconfont sj-icon-jkzx icon-sxt"></i>
                   <h4>{{ item.cameraName }}</h4>
-                  <h4 v-if="onChuan" v-html="cgqData[index]"></h4>
+                  <!-- <h4 v-if="onChuan" v-html="cgqData[index]"></h4> -->
                 </div>
               </div>
             </div>
@@ -147,6 +147,7 @@
 
 <script>
   import {
+    getMonitorDeviceAndDataList,
     selectDeviceType,
     selectCameraByDeptId,
     selectKeyAreaList,
@@ -208,10 +209,16 @@
       this.deptId = Cookies.get("deptId")
       // this.getSensorListByDeptId(-1)
       // this.getDlblistBydeptId(-1)
-      this.getSensorListByDeptIds(-1)
+      this.getMonitorDeviceAndDataList()
+      this.cgqTimer = setInterval(() => {
+        this.getMonitorDeviceAndDataList()
+      }, 5 * 60 * 1000)
       this.getDlblistBydeptIds(-1)
       this.selectDeviceType(-1)
     },
+    beforeDestroy() {
+      clearInterval(this.cgqTimer); //关闭
+    },
     data() {
       return {
         cgqData: [],
@@ -273,6 +280,7 @@
         colors: "green",
         sensorNum: 0,
         loudspeakerNum: 0,
+        cgqTimer: null,
         values: Math.random()
       }
     },
@@ -291,39 +299,39 @@
       }
     },
     methods: {
-      setcgqValue: function() {
-        let that = this
-        for (let i = 0; i < that.visuForestCloudCameraBOListSearch.length; i++) {
-          var color = "green";
-          var value = Math.random();
-          var up = "▲";
-          var down = "▼";
-          if (value > 0.5) {
-            color = "red";
-            value = value + "" + up;
-          } else {
-            value = value + "" + down;
-          }
-          that.cgqData.push("<span style='color:" + color + "'>" + value + "</span>")
-        }
-        setInterval(function() {
-          var color = "green";
-          var value = Math.random();
-          var up = "▲";
-          var down = "▼";
-          if (value > 0.5) {
-            color = "red";
-            value = value + "" + up;
-          } else {
-            value = value + "" + down;
-          }
-          that.cgqData.push("<span style='color:" + color + "'>" + value + "</span>")
-          if (that.cgqData.length > that.visuForestCloudCameraBOListSearch.length) {
-            console.log(that.cgqData)
-            that.cgqData.splice(0, 1)
-          }
-        }, 5000)
-      },
+      // setcgqValue: function() {
+      //   let that = this
+      //   for (let i = 0; i < that.visuForestCloudCameraBOListSearch.length; i++) {
+      //     var color = "green";
+      //     var value = Math.random();
+      //     var up = "▲";
+      //     var down = "▼";
+      //     if (value > 0.5) {
+      //       color = "red";
+      //       value = value + "" + up;
+      //     } else {
+      //       value = value + "" + down;
+      //     }
+      //     that.cgqData.push("<span style='color:" + color + "'>" + value + "</span>")
+      //   }
+      //   setInterval(function() {
+      //     var color = "green";
+      //     var value = Math.random();
+      //     var up = "▲";
+      //     var down = "▼";
+      //     if (value > 0.5) {
+      //       color = "red";
+      //       value = value + "" + up;
+      //     } else {
+      //       value = value + "" + down;
+      //     }
+      //     that.cgqData.push("<span style='color:" + color + "'>" + value + "</span>")
+      //     if (that.cgqData.length > that.visuForestCloudCameraBOListSearch.length) {
+      //       console.log(that.cgqData)
+      //       that.cgqData.splice(0, 1)
+      //     }
+      //   }, 5000)
+      // },
       /* 电视墙替换开始 */
       showTVWall(channelCode, channelName) {
         let tvListJson = [{
@@ -392,7 +400,7 @@
             });
           })
         } else if (that.localMark == 'chuan') {
-          that.getSensorListByDeptId()
+          that.getMonitorDeviceAndDataList()
         } else if (that.localMark == 'la') {
           that.getDlblistBydeptId()
         }
@@ -403,6 +411,7 @@
         this.onChuan = false
         this.localMark = 'she'
         this.placeholderMsg = "请输入摄像头名称"
+        clearInterval(this.cgqTimer)
         this.selectDeviceType()
       },
       laClick() {
@@ -411,12 +420,17 @@
         this.onChuan = false
         this.localMark = 'la'
         this.placeholderMsg = "请输入大喇叭名称"
+        clearInterval(this.cgqTimer)
         this.getDlblistBydeptId()
       },
       chuanClick() {
         this.localMark = 'chuan'
         this.placeholderMsg = "请输入传感器名称"
-        this.getSensorListByDeptId()
+        this.getMonitorDeviceAndDataList()
+        clearInterval(this.cgqTimer)
+        this.cgqTimer = setInterval(() => {
+          this.getMonitorDeviceAndDataList()
+        }, 5 * 60 * 1000)
       },
       // 大喇叭
       getDlblistBydeptId(index) {
@@ -439,7 +453,7 @@
                   lng: 124.59,
                   lat: 43.02,
                   icon: "marker",
-                  bindPopupHtml: "<div class=\"map-tip\"><span></span></div>",
+                  bindPopupHtml: "",
                   click: "",
                   parameter: "",
                   keepBindPopup: false,
@@ -477,12 +491,541 @@
             console.error(error);
           });
       },
+      getMonitorDeviceAndDataList() {
+        let list = []
+        let markersList = [];
+        getMonitorDeviceAndDataList(this.deptId).then((res) => {
+          this.visuForestCloudCameraBOListSearch = []
+          list = res.data
+          this.sensorNum = list.length
+          list.forEach(item => {
+            let dat = {
+              cameraName: item.deviceName,
+              longitude: item.longitude,
+              latitude: item.latitude,
+            }
+            this.visuForestCloudCameraBOListSearch.push(dat)
+            let markersMap = {
+              lng: 124.59,
+              lat: 43.02,
+              icon: "marker",
+              bindPopupHtml: '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>名称：" +
+                (item.deviceName ? item.deviceName : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>厂家：" +
+                (item.brand ? item.brand : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>经纬度：" +
+                item.longitude + "," + item.latitude +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "</div>",
+
+              click: "",
+              parameter: "",
+              name: "",
+              keepBindPopup: false,
+              isAggregation: false,
+            };
+            if (item.deviceType == 1) { // 水质传感器
+              markersMap.icon = "sj-icon-map-centerdata_water_quality_sensor";
+              markersMap.bindPopupHtml += '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水中PH：" +
+                (item.data.waterPh ? item.data.waterPh : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>生化需氧量：" +
+                (item.data.bod ? item.data.bod : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>信号强度：" +
+                (item.data.signalStrength ? item.data.signalStrength : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>化学需氧量：" +
+                (item.data.cod ? item.data.cod : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>氨氮：" +
+                (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水温：" +
+                (item.data.waterTemperature ? item.data.waterTemperature : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>版本号：" +
+                (item.data.version ? item.data.version : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水质悬浮物：" +
+                (item.data.waterQualitySuspension ? item.data.waterQualitySuspension : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+
+                "</div>";
+
+            } else if (item.deviceType == '002') { // 水尺
+              markersMap.icon = "sj-icon-map-centerdata_water_gauge";
+            } else if (item.deviceType == '003') { // 水文监测设备
+              markersMap.icon = "sj-icon-map-centerdata_hydrological_monitoring_equipment";
+            } else if (item.deviceType == 2) { // 土壤监测设备
+              markersMap.icon = "sj-icon-map-centerdata_soil_monitoring_equipment";
+              markersMap.bindPopupHtml += '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>钾含量：" +
+                (item.data.potassium ? item.data.potassium : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>导电率：" +
+                (item.data.conductivity ? item.data.conductivity : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>氮含量：" +
+                (item.data.nitrogen ? item.data.nitrogen : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>信号强度：" +
+                (item.data.signalStrength ? item.data.signalStrength : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>温度：" +
+                (item.data.temperature ? item.data.temperature : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>ph值：" +
+                (item.data.ph ? item.data.ph : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>湿度：" +
+                (item.data.humidity ? item.data.humidity : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>错误码：" +
+                (item.data.errorCode ? item.data.errorCode : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>版本号：" +
+                (item.data.version ? item.data.version : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>磷含量：" +
+                (item.data.phosphorus ? item.data.phosphorus : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>电压：" +
+                (item.data.voltage ? item.data.voltage : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "</div>";
+            } else if (item.deviceType == 4) { // 病虫害监测站
+              markersMap.icon = "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
+            } else if (item.deviceType == 5) { // 大气传感器
+              markersMap.icon = "sj-icon-map-centerdata_atmospheric_sensor";
+              markersMap.bindPopupHtml += '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>总挥发性有机物：" +
+                (item.data.tvoc ? item.data.tvoc : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>二氧化硫：" +
+                (item.data.sulfurDioxide ? item.data.sulfurDioxide : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>电池电压：" +
+                (item.data.batteryVoltage ? item.data.batteryVoltage : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>信号强度：" +
+                (item.data.signalStrength ? item.data.signalStrength : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>可吸入颗粒物：" +
+                (item.data.suctionParticle ? item.data.suctionParticle : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>一氧化碳：" +
+                (item.data.carbonMonoxide ? item.data.carbonMonoxide : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>臭氧：" +
+                (item.data.ozone ? item.data.ozone : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>总悬浮颗粒物：" +
+                (item.data.tsp ? item.data.tsp : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>温度：" +
+                (item.data.temperature ? item.data.temperature : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>湿度：" +
+                (item.data.humidity ? item.data.humidity : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>细颗粒：" +
+                (item.data.fineParticle ? item.data.fineParticle : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>二氧化氮：" +
+                (item.data.nitrogenDioxide ? item.data.nitrogenDioxide : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>风向：" +
+                (item.data.windDirection ? item.data.windDirection : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>风速：" +
+                (item.data.windSpeed ? item.data.windSpeed : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "</div>";
+            } else if (item.deviceType == 6) { // 水压传感器
+              markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
+              markersMap.bindPopupHtml += '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>设备编码：" +
+                (item.data.IMEI ? item.data.IMEI : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>下限警报使能：" +
+                (item.data.thresholdLowEnable ? item.data.thresholdLowEnable : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>上限警报使能：" +
+                (item.data.thresholdHighEnable ? item.data.thresholdHighEnable : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>信号强度：" +
+                (item.data.signalPower ? item.data.signalPower : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水压力值：" +
+                (item.data.hydraulicValue ? item.data.hydraulicValue : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水压下限阈值：" +
+                (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水压上限阈值：" +
+                (item.data.hydraulicThresholdMax ? item.data.hydraulicThresholdMax : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水压力值：" +
+                (item.data.hydraulicValue ? item.data.hydraulicValue : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>心跳周期：" +
+                (item.data.heartbeatTime ? item.data.heartbeatTime : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>电池电压：" +
+                (item.data.batteryVoltage ? item.data.batteryVoltage : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>电池电量：" +
+                (item.data.batteryValue ? item.data.batteryValue : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+
+                "</div>";
+            } else if (item.deviceType == 7) //水流速传感器
+            {
+              markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
+              markersMap.bindPopupHtml += '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>两流量累计之和：" +
+                (item.data.Q ? item.data.Q : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>流量Q1：" +
+                (item.data.Q1 ? item.data.Q1 : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>流量Q2：" +
+                (item.data.Q2 ? item.data.Q2 : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>Q1累计流量：" +
+                (item.data.CQ1 ? item.data.CQ1 : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span></div>";
+            }
+            markersMap.lng = item.longitude;
+            markersMap.lat = item.latitude;
+            markersList.push(markersMap);
+          })
+          console.log(markersList)
+        })
+        setTimeout(() => {
+          this.$refs.supermap.clearM();
+          this.$refs.supermap.clearMRadius()
+          this.$refs.supermap.setMarkers(markersList);
+        }, 2000);
+      },
       // 传感器
       getSensorListByDeptId(index) {
         let that = this;
         let markersList = [];
         getSensorListByDeptId(that.deptId).then(function(res) {
-            that.setcgqValue()
+            // that.setcgqValue()
             that.visuForestCloudCameraBOListSearch = []
             // that.sensorNum = res.data.length
             if (res.data != null && res.data.length > 0) {
@@ -526,7 +1069,7 @@
 
                 markersList.push(markersMap);
               }
-              that.setcgqValue()
+              // that.setcgqValue()
               setTimeout(() => {
                 that.$refs.supermap.clearM();
                 that.$refs.supermap.clearMRadius();
@@ -1212,4 +1755,4 @@
     height: 600px;
     border: 1px solid red;
   }
-</style>
+</style>