Forráskód Böngészése

添加传感器是否在线

JX.LI 1 éve
szülő
commit
32979f81c8

+ 7 - 0
src/api/components/supermap.js

@@ -61,15 +61,21 @@ export const iconList = {
 
   // 数据中心传感器
   'sj-icon-map-centerdata_water_quality_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_quality_sensor.png'),//水质传感器
+  'sj-icon-map-not-centerdata_water_quality_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_quality_sensor.png'),//水质传感器
   'sj-icon-map-centerdata_water_gauge': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_gauge.png'),//水尺
+  'sj-icon-map-not-centerdata_water_gauge': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_gauge.png'),//水尺
   'sj-icon-map-centerdata-t-forest-firehydrant-1': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@1.png'),//地上消火栓
   'sj-icon-map-centerdata-t-forest-firehydrant-2': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@2.png'),//地下消火栓
   'sj-icon-map-centerdata-t-forest-firehydrant-3': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@3.png'),//室内消火栓
   'sj-icon-map-centerdata_hydrological_monitoring_equipment': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_hydrological_monitoring_equipment.png'),//水文监测设备
   'sj-icon-map-centerdata_soil_monitoring_equipment': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_soil_monitoring_equipment.png'),//土壤监测设备
+  'sj-icon-map-not-centerdata_soil_monitoring_equipment': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_soil_monitoring_equipment.png'),//土壤监测设备
   'sj-icon-map-centerdata_pest_and_disease_monitoring_station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_pest_and_disease_monitoring_station.png'),//病虫害监测站
+  'sj-icon-map-not-centerdata_pest_and_disease_monitoring_station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_pest_and_disease_monitoring_station.png'),//病虫害监测站
   'sj-icon-map-centerdata_atmospheric_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_atmospheric_sensor.png'),//大气传感器
+  'sj-icon-map-not-centerdata_atmospheric_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_atmospheric_sensor.png'),//大气传感器
   'sj-icon-map-centerdata_water_pressure_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_pressure_sensor.png'),//水压传感器
+  'sj-icon-map-not-centerdata_water_pressure_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_pressure_sensor.png'),//水压传感器
   'sj-icon-map-centerdata-slmonitor-traffic': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor-traffic.png'),//交通精细化摄像头
   'sj-icon-map-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png'),//水利摄像头
   'sj-icon-map-centerdata-river_camera': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-river_camera.png'),//水利摄像头
@@ -93,6 +99,7 @@ export const iconList = {
   'sj-icon-map-centerdata-t-firecontrol-foam-liquid': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-foam-liquid.png'),//泡沫液
   'sj-icon-map-centerdata-t-firecontrol-fulltime-station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fulltime-station.png'),//专职站
 
+  'sj-icon-map-not-centerdata_water_flow_rate': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_flow_rate.png'),//专职站
   'sj-icon-map-centerdata_water_flow_rate': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_flow_rate.png'),//专职站
   'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-sand-quarry-camera.png'),//水利摄像头
   'sj-icon-map-not-centerdata-slmonitor':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-slmonitor.png'),//水利摄像头

BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_atmospheric_sensor.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_pest_and_disease_monitoring_station.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_soil_monitoring_equipment.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_flow_rate.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_gauge.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_pressure_sensor.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_quality_sensor.png


BIN
src/assets/images/not-video.png


+ 86 - 58
src/components/TVWalls.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-dialog :title="title + (this.detail != null ? titleSuffix2 : titleSuffix) " :visible.sync="TVWallVisible"
+    <el-dialog :title="title + (detail != null ? titleSuffix2 : titleSuffix) " :visible.sync="TVWallVisible"
       v-if="TVWallVisible" customClass="TVWallCustomWidth" @close="cancelEventLocationShow()"
-      :width="this.detail != null ? '1500px !important' : '1200px !important'">
+      :width="detail != null ? '1500px !important' : '1200px !important'">
       <!--<div @click="findCameraByEventCoordinate()">视频联动</div>-->
       <!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
       <!--<div class="i-list-con" style="height: 46vh; overflow-y: scroll;">-->
@@ -23,10 +23,11 @@
       <!--<div id="playWnd" class="playWnd" style="left: 0px; top: 0px;"></div>-->
       <!--</div>-->
       <div style="display: flex;">
-        <div id="dom1" class="dom1"></div>
-        <div class="leader-info-container" v-if="this.detail!=null">
-          <div class="leader-info-list-con">
-            <div v-for="(item,key) in this.detail" :key="key">
+        <div id="dom1" class="dom1" v-if="cameraNum!=0"></div>
+        <img src="../assets/images/not-video.png" v-else style="height: 650px;width: 1150px;">
+        <div class="leader-info-container" v-if="detail!=null">
+          <div class="leader-info-list-con" ref="listcon" :style="{ height: listconHeight + '%' }">
+            <div v-for="(item,key) in detail" :key="key">
               <el-descriptions class="margin-top" title="" :column="1" size="mini" border>
                 <el-descriptions-item :label="`${item.name}`">
                   {{item.value}}
@@ -63,9 +64,32 @@
   export default {
     dicts: ['event_source'],
     components: {},
+    directives: { // 使用局部注册指令的方式
+      resize: { // 指令的名称
+        bind(el, binding) { // el为绑定的元素,binding为绑定给指令的对象
+          let width = '',
+            height = '';
+
+          function isReize() {
+            const style = document.defaultView.getComputedStyle(el);
+            if (width !== style.width || height !== style.height) {
+              binding.value(); // 关键
+            }
+            width = style.width;
+            height = style.height;
+          }
+          el.__vueSetInterval__ = setInterval(isReize, 300);
+        },
+        unbind(el) {
+          clearInterval(el.__vueSetInterval__);
+        }
+      }
+    },
     data() {
       return {
+        cameraNum: 0,
         detail: null,
+        listconHeight:null,
         title: "电视墙",
         titleSuffix: "\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
         titleSuffix2: "\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
@@ -380,61 +404,65 @@
         return str;
       },
       showTVWall1(data, val, detail) {
-        this.detail = this.objToStrMap(detail)
-        console.log(this.detail)
-        selectConfigKey("DssVersion").then(res => {
-          if (this.ws.getLocalDssVersion() != res.data) {
-            this.$modal.confirm('系统检测到新客户端版本,请更新后使用', '系统提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              selectConfigKey('video_plugin_url').then(response => {
-                window.open(response.data);
-              })
-            }).catch(() => {
+        debugger
+        if (!(null == detail || detail.length == 0)) {
+          this.detail = this.objToStrMap(detail)
+          setTimeout(() => {
+            let h = this.$refs.listcon.offsetHeight;
+            if (h <= 650) {
+              this.listconHeight = 100;
+            }
+          }, 1000);
+        } else {
+          this.detail = null
+        }
+        this.TVWallVisible = true
+        this.cameraNum = data[0].labelChannels.length;
+        if (data[0].labelChannels.length != 0) {
+          console.log(this.detail)
+          selectConfigKey("DssVersion").then(res => {
+            if (this.ws.getLocalDssVersion() != res.data) {
+              this.$modal.confirm('系统检测到新客户端版本,请更新后使用', '系统提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                selectConfigKey('video_plugin_url').then(response => {
+                  window.open(response.data);
+                })
+              }).catch(() => {
+                return
+              });
               return
-            });
-            return
-          } else {
-            this.tvListJson = data
-            this.data = val
-            this.autoList = []
-            this.stringList = []
-            let length = data[0].treeLabels.length > 4 ? 5 : data[0].treeLabels.length
-            for (let i = 1; i < length; i++) {
-              this.autoList.push({
-                "channelId": data[0].treeLabels[i].labelCode
+            } else {
+              this.tvListJson = data
+              this.data = val
+              this.autoList = []
+              this.stringList = []
+              let length = data[0].treeLabels.length > 4 ? 5 : data[0].treeLabels.length
+              for (let i = 1; i < length; i++) {
+                this.autoList.push({
+                  "channelId": data[0].treeLabels[i].labelCode
+                })
+                this.stringList.push(data[0].treeLabels[i].labelCode)
+              }
+              console.log("this.autoList", this.autoList);
+              console.log("this.stringList", this.stringList);
+              // let that=this;
+              /** ----------------------------------大华摄像头预览开始------------------------------------- */
+              this.ws.addEventListener('connectStateChange', data => {
+                if (data) {
+                  console.log('连接成功')
+                } else {
+                  console.log('连接失败,下载客户端')
+                  this.alertReinstall()
+                }
               })
-              this.stringList.push(data[0].treeLabels[i].labelCode)
+              this.preview()
+              this.TVWallVisible = true
             }
-            console.log("this.autoList", this.autoList);
-            console.log("this.stringList", this.stringList);
-            // let that=this;
-            /** ----------------------------------大华摄像头预览开始------------------------------------- */
-            this.ws.addEventListener('connectStateChange', data => {
-              if (data) {
-                console.log('连接成功')
-              } else {
-                console.log('连接失败,下载客户端')
-                this.alertReinstall()
-              }
-            })
-            this.preview()
-            /** ----------------------------------大华摄像头预览结束------------------------------------- */
-            /** ----------------------------------海康摄像头预览开始------------------------------------- */
-            // tvCameraList().then(response => {
-            //   this.cameraList=response.data
-            // })
-            // that.initPlugin()
-            // setTimeout(function() {
-            //   that.playhk();
-            // }, 5000)
-            // /** ----------------------------------海康摄像头预览结束------------------------------------- */
-            this.TVWallVisible = true
-          }
-        })
-
+          })
+        }
       },
       /** ----------------------------------大华摄像头预览开始------------------------------------- */
       alertLogin: function() {

+ 282 - 558
src/views/monitor.vue

@@ -650,494 +650,300 @@
             };
             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 + "pH" : "0pH") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                // "<span>" +
-                // '                  <div class="d-l-con">' +
-                // '                  <div class="d-l-l-text">' +
-                // "                  <h4>生化需氧量:" +
-                // (item.data.bod ? item.data.bod+"mg/L" : "") +
-                // "</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 + "mg/L" : "0mg/L") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>氨氮:" +
-                (item.data.ammoniaNitrogen ?
-                  item.data.ammoniaNitrogen + "mg/L" :
-                  "0mg/L") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>水温:" +
-                (item.data.waterTemperature ?
-                  item.data.waterTemperature + "°C" :
-                  "0°C") +
-                "</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") {
+              if (item.workingStatus == 0) {
+                markersMap.icon = "sj-icon-map-centerdata_water_quality_sensor";
+              } else if (item.workingStatus == 1) {
+                markersMap.icon = "sj-icon-map-not-centerdata_water_quality_sensor";
+              }
+              if (item.data != null) {
+                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 + "pH" : "0pH") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>化学需氧量:" +
+                  (item.data.cod ? item.data.cod + "mg/L" : "0mg/L") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>氨氮:" +
+                  (item.data.ammoniaNitrogen ?
+                    item.data.ammoniaNitrogen + "mg/L" :
+                    "0mg/L") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>水温:" +
+                  (item.data.waterTemperature ?
+                    item.data.waterTemperature + "°C" :
+                    "0°C") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "</div>";
+              }
+            } else if (item.deviceType == 8) {
               // 水尺
-              markersMap.icon = "sj-icon-map-centerdata_water_gauge";
-            } else if (item.deviceType == "003") {
+              if (item.workingStatus == 0) {
+                markersMap.icon = "sj-icon-map-centerdata_water_gauge";
+              } else if (item.workingStatus == 1) {
+                markersMap.icon = "sj-icon-map-not-centerdata_water_gauge";
+              }
+            } else if (item.deviceType == 3) {
               // 水文监测设备
-              markersMap.icon =
-                "sj-icon-map-centerdata_hydrological_monitoring_equipment";
+              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 + "mg/kg" : "0mg/kg") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>导电率:" +
-                (item.data.conductivity ?
-                  item.data.conductivity + "us/cm" :
-                  "0us/cm") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>氮含量:" +
-                (item.data.nitrogen ? item.data.nitrogen + "mg/kg" : "0mg/kg") +
-                "</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 + "°C" : "0°C") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>ph值:" +
-                (item.data.ph ? item.data.ph + "PH" : "0PH") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>湿度:" +
-                (item.data.humidity ? item.data.humidity + "%RH" : "0%RH") +
-                "</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 + "mg/kg" :
-                  "0mg/kg") +
-                "</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>";
+              if (item.workingStatus == 0) {
+                markersMap.icon = "sj-icon-map-centerdata_soil_monitoring_equipment";
+              } else if (item.workingStatus == 1) {
+                markersMap.icon = "sj-icon-map-not-centerdata_soil_monitoring_equipment";
+              }
+              if (item.data != null) {
+                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 + "mg/kg" : "0mg/kg") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>导电率:" +
+                  (item.data.conductivity ?
+                    item.data.conductivity + "us/cm" :
+                    "0us/cm") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>氮含量:" +
+                  (item.data.nitrogen ? item.data.nitrogen + "mg/kg" : "0mg/kg") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>温度:" +
+                  (item.data.temperature ? item.data.temperature + "°C" : "0°C") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>ph值:" +
+                  (item.data.ph ? item.data.ph + "PH" : "0PH") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>湿度:" +
+                  (item.data.humidity ? item.data.humidity + "%RH" : "0%RH") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>磷含量:" +
+                  (item.data.phosphorus ?
+                    item.data.phosphorus + "mg/kg" :
+                    "0mg/kg") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "</div>";
+              }
             } else if (item.deviceType == 4) {
               // 病虫害监测站
-              markersMap.icon =
-                "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
+              if (item.workingStatus == 0) {
+                markersMap.icon = "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
+              } else if (item.workingStatus == 1) {
+                markersMap.icon = "sj-icon-map-not-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 + "ug/m³" :
-                  "0ug/m³") +
-                "</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 + "ug/m³" :
-                  "0ug/m³") +
-                "</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 + "°C" : "0°C") +
-                "</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+"ug/m3" : "") +
-                // "</h4>" +
-                // "                </div>" +
-                // "                </div>" +
-                // "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>二氧化氮:" +
-                (item.data.nitrogenDioxide ?
-                  item.data.nitrogenDioxide + "ug/m³" :
-                  "0ug/m³") +
-                "</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>";
+              if (item.workingStatus == 0) {
+                markersMap.icon = "sj-icon-map-centerdata_atmospheric_sensor";
+              } else if (item.workingStatus == 1) {
+                markersMap.icon = "sj-icon-map-not-centerdata_atmospheric_sensor";
+              }
+              if (item.data != null) {
+                markersMap.bindPopupHtml +=
+                  '<div class="map-tip">' +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>二氧化硫:" +
+                  (item.data.sulfurDioxide ?
+                    item.data.sulfurDioxide + "ug/m³" :
+                    "0ug/m³") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>一氧化碳:" +
+                  (item.data.carbonMonoxide ?
+                    item.data.carbonMonoxide + "ug/m³" :
+                    "0ug/m³") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>温度:" +
+                  (item.data.temperature ? item.data.temperature + "°C" : "0°C") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>二氧化氮:" +
+                  (item.data.nitrogenDioxide ?
+                    item.data.nitrogenDioxide + "ug/m³" :
+                    "0ug/m³") +
+                  "</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 + "MPa" :
-                  "0MPa") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>上限警报使能:" +
-                (item.data.thresholdHighEnable ?
-                  item.data.thresholdHighEnable + "MPa" :
-                  "0MPa") +
-                "</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 + "MPa" :
-                  "0MPa") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>水压下限阈值:" +
-                (item.data.hydraulicThresholdMin ?
-                  item.data.hydraulicThresholdMin + "MPa" :
-                  "0MPa") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>水压上限阈值:" +
-                (item.data.hydraulicThresholdMax ?
-                  item.data.hydraulicThresholdMax + "MPa" :
-                  "0MPa") +
-                "</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>";
+              if (item.workingStatus == 0) {
+                markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
+              } else if (item.workingStatus == 1) {
+                markersMap.icon = "sj-icon-map-not-centerdata_water_pressure_sensor";
+              }
+              if (item.data != null) {
+                markersMap.bindPopupHtml +=
+                  '<div class="map-tip">' +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>下限警报使能:" +
+                  (item.data.thresholdLowEnable ? item.data.thresholdLowEnable + "MPa" : "0MPa") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>上限警报使能:" +
+                  (item.data.thresholdHighEnable ?
+                    item.data.thresholdHighEnable + "MPa" :
+                    "0MPa") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>水压力值:" +
+                  (item.data.hydraulicValue ?
+                    item.data.hydraulicValue + "MPa" :
+                    "0MPa") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>水压下限阈值:" +
+                  (item.data.hydraulicThresholdMin ?
+                    item.data.hydraulicThresholdMin + "MPa" :
+                    "0MPa") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>水压上限阈值:" +
+                  (item.data.hydraulicThresholdMax ?
+                    item.data.hydraulicThresholdMax + "MPa" :
+                    "0MPa") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "</div>";
+              }
             } else if (item.deviceType == 7) {
               //水流速传感器
-              markersMap.icon = "sj-icon-map-centerdata_water_flow_rate";
-              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>瞬时流量:" +
-                // (item.data.Q1 ? item.data.Q1+"m3/s" : "") +
-                // "</h4>" +
-                // "                </div>" +
-                // "                </div>" +
-                // "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>瞬时流速:" +
-                (item.data.V1 ? item.data.V1 + "m/s" : "0m/s") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>瞬时流量:" +
-                (item.data.Q ? item.data.Q + "m³/s" : "0m³/s") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span></div>";
+              if (item.workingStatus == 0) {
+                markersMap.icon = "sj-icon-map-centerdata_water_flow_rate";
+              } else if (item.workingStatus == 1) {
+                markersMap.icon = "sj-icon-map-not-centerdata_water_flow_rate";
+              }
+              if (item.data != null) {
+                markersMap.bindPopupHtml +=
+                  '<div class="map-tip">' +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>瞬时流速:" +
+                  (item.data.V1 ? item.data.V1 + "m/s" : "0m/s") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>瞬时流量:" +
+                  (item.data.Q ? item.data.Q + "m³/s" : "0m³/s") +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span></div>";
+              }
             }
             markersMap.lng = item.longitude;
             markersMap.lat = item.latitude;
@@ -1152,88 +958,6 @@
         }, 2000);
       },
       // 传感器
-      getSensorListByDeptId(index) {
-        let that = this;
-        let markersList = [];
-        getSensorListByDeptId(that.deptId)
-          .then(function(res) {
-            // that.setcgqValue()
-            that.visuForestCloudCameraBOListSearch = [];
-            // that.sensorNum = res.data.length
-            if (res.data != null && res.data.length > 0) {
-              for (let j = 0; j < res.data.length; j++) {
-                let dat = {
-                  cameraName: res.data[j].deviceName,
-                  longitude: res.data[j].longitude,
-                  latitude: res.data[j].latitude,
-                };
-                that.visuForestCloudCameraBOListSearch.push(dat);
-              }
-              for (let i = 0; i < res.data.length; i++) {
-                let markersMap = {
-                  lng: 124.59,
-                  lat: 43.02,
-                  icon: "marker",
-                  bindPopupHtml: "",
-                  click: "",
-                  parameter: "",
-                  keepBindPopup: false,
-                  isAggregation: false,
-                };
-                if (res.data[i].deviceType == 1) {
-                  // 水质传感器
-                  markersMap.icon = "sj-icon-map-centerdata_water_quality_sensor";
-                } else if (res.data[i].deviceType == "002") {
-                  // 水尺
-                  markersMap.icon = "sj-icon-map-centerdata_water_gauge";
-                } else if (res.data[i].deviceType == "003") {
-                  // 水文监测设备
-                  markersMap.icon =
-                    "sj-icon-map-centerdata_hydrological_monitoring_equipment";
-                } else if (res.data[i].deviceType == 2) {
-                  // 土壤监测设备
-                  markersMap.icon =
-                    "sj-icon-map-centerdata_soil_monitoring_equipment";
-                } else if (res.data[i].deviceType == 4) {
-                  // 病虫害监测站
-                  markersMap.icon =
-                    "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
-                } else if (res.data[i].deviceType == 5) {
-                  // 大气传感器
-                  markersMap.icon = "sj-icon-map-centerdata_atmospheric_sensor";
-                } else if (res.data[i].deviceType == 6) {
-                  // 水压传感器
-                  markersMap.icon =
-                    "sj-icon-map-centerdata_water_pressure_sensor";
-                }
-
-                markersMap.lng = res.data[i].longitude;
-                markersMap.lat = res.data[i].latitude;
-
-                markersList.push(markersMap);
-              }
-              // that.setcgqValue()
-              setTimeout(() => {
-                that.$refs.supermap.clearM();
-                that.$refs.supermap.clearMRadius();
-
-                that.$refs.supermap.setMarkers(markersList);
-              }, 2000);
-            } else {
-              setTimeout(() => {
-                that.$refs.supermap.clearM();
-                that.$refs.supermap.clearMRadius();
-              }, 2000);
-            }
-            that.onLa = false;
-            that.onShe = false;
-            that.onChuan = true;
-          })
-          .catch(function(error) {
-            console.error(error);
-          });
-      },
-      // 传感器
       getSensorListByDeptIds(index) {
         let that = this;
         let markersList = [];

+ 33 - 34
src/views/resources.vue

@@ -30,7 +30,8 @@
         </div>
       </div>
       <!-- 地图 -->
-      <supermap ref="supermap" style="width: 100%; height: 100vh" @fatherMethod="fatherMethod" @sewageOutletClick="sewageOutletClick"></supermap>
+      <supermap ref="supermap" style="width: 100%; height: 100vh" @fatherMethod="fatherMethod"
+        @sewageOutletClick="sewageOutletClick"></supermap>
       <!--      <button @click="showEventInfo1" style="position: absolute; right: 50%;top: 45%;z-index: 1000;">弹层事件演示用按钮-->
       <!--      </button>-->
       <!-- 右侧 -->
@@ -484,40 +485,38 @@
             parentLabelCode: "",
           }, ];
           const labelChannels = [];
-          if (0 < data1.cameras.length) {
-            for (let i in data1.cameras) {
-              treeLabels.push({
-                id: null,
-                labelCode: data1.cameras[i].cameraCode,
-                labelName: data1.cameras[i].cameraName,
+          for (let i in data1.cameras) {
+            treeLabels.push({
+              id: null,
+              labelCode: data1.cameras[i].cameraCode,
+              labelName: data1.cameras[i].cameraName,
+              cameraType: data1.cameras[i].cameraType,
+              parentLabelCode: "999",
+            });
+            labelChannels.push({
+              labelCode: data1.cameras[i].cameraCode,
+              channelDates: [{
+                channelCode: data1.cameras[i].cameraCode,
+                channelName: data1.cameras[i].cameraName,
+                channelSn: null,
                 cameraType: data1.cameras[i].cameraType,
-                parentLabelCode: "999",
-              });
-              labelChannels.push({
-                labelCode: data1.cameras[i].cameraCode,
-                channelDates: [{
-                  channelCode: data1.cameras[i].cameraCode,
-                  channelName: data1.cameras[i].cameraName,
-                  channelSn: null,
-                  cameraType: data1.cameras[i].cameraType,
-                  online: "1",
-                  cameraCode: "1",
-                }, ],
-              });
-            }
-            const dianshiqiang = [{
-              switchTab: "2",
-              treeLabels: treeLabels,
-              labelChannels: labelChannels,
-            }, ]
-            this.$refs.TVWalls.showTVWall1(
-              dianshiqiang, {
-                longitude: params.longitude,
-                latitude: params.latitude
-              },
-              data1.detail
-            );
+                online: "1",
+                cameraCode: "1",
+              }, ],
+            });
           }
+          const dianshiqiang = [{
+            switchTab: "2",
+            treeLabels: treeLabels,
+            labelChannels: labelChannels,
+          }, ]
+          this.$refs.TVWalls.showTVWall1(
+            dianshiqiang, {
+              longitude: params.longitude,
+              latitude: params.latitude
+            },
+            data1.detail
+          );
         })
       },
       indentleftByDeptIdSetMarkers(deptId) {
@@ -557,4 +556,4 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   @import "@/assets/styles/base.scss";
-</style>
+</style>