王通 1 год назад
Родитель
Сommit
61fc34a90a

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

@@ -60,4 +60,13 @@ export const iconList = {
   'sj-icon-map-not-centerdata-slmonitor':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-slmonitor.png'),//水利摄像头
   'sj-icon-map-not-centerdata-sand-quarry-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-river_camera.png'),//水利摄像头
   'sj-icon-map-not-centerdata-slmonitor-traffic':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-slmonitor-traffic.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-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-not-centerdata_soil_monitoring_equipment':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_soil_monitoring_equipment.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-not-centerdata_water_gauge':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_gauge.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-not-centerdata_water_quality_sensor':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata_water_quality_sensor.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


+ 48 - 7
src/views/monitor.vue

@@ -748,7 +748,14 @@ export default {
           };
           if (item.deviceType == 1) {
             // 水质传感器
-            markersMap.icon = "sj-icon-map-centerdata_water_quality_sensor";
+            if (item.workingStatus==0)
+            {
+              markersMap.icon = "sj-icon-map-not-centerdata_water_quality_sensor";
+            }else (item.workingStatus==1)
+            {
+              markersMap.icon = "sj-icon-map-centerdata_water_quality_sensor";
+            }
+
             markersMap.bindPopupHtml +=
               '<div class="map-tip">' +
               "<span>" +
@@ -800,9 +807,16 @@ export default {
             markersMap.icon =
               "sj-icon-map-centerdata_hydrological_monitoring_equipment";
           } else if (item.deviceType == 2) {
+            if (item.workingStatus==0)
+            {
+              markersMap.icon = "sj-icon-map-not-centerdata_soil_monitoring_equipment";
+            }else (item.workingStatus==1)
+            {
+              markersMap.icon =
+                "sj-icon-map-centerdata_soil_monitoring_equipment";
+            }
             // 土壤监测设备
-            markersMap.icon =
-              "sj-icon-map-centerdata_soil_monitoring_equipment";
+
             markersMap.bindPopupHtml +=
               '<div class="map-tip">' +
               "<span>" +
@@ -874,10 +888,25 @@ export default {
               "                </span>" +
               "</div>";
           } else if (item.deviceType == 4) {
+            if (item.workingStatus==0)
+            {
+              markersMap.icon =
+                "sj-icon-map-not-centerdata_pest_and_disease_monitoring_station";
+            }else (item.workingStatus==1)
+            {
+              markersMap.icon =
+                "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
+            }
             // 病虫害监测站
-            markersMap.icon =
-              "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
+
           } else if (item.deviceType == 5) {
+            if (item.workingStatus==0)
+            {
+              markersMap.icon = "sj-icon-map-not-centerdata_atmospheric_sensor";
+            }else (item.workingStatus==1)
+            {
+              markersMap.icon = "sj-icon-map-centerdata_atmospheric_sensor";
+            }
             // 大气传感器
             markersMap.icon = "sj-icon-map-centerdata_atmospheric_sensor";
             markersMap.bindPopupHtml +=
@@ -926,8 +955,14 @@ export default {
               "                </span>" +
               "</div>";
           } else if (item.deviceType == 6) {
+            if (item.workingStatus==0)
+            {
+              markersMap.icon = "sj-icon-map-not-centerdata_water_pressure_sensor";
+            }else (item.workingStatus==1)
+            {
+              markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
+            }
             // 水压传感器
-            markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
             if(item.data != null){
               markersMap.bindPopupHtml +=
                 '<div class="map-tip">' +
@@ -973,7 +1008,13 @@ export default {
             }
           } else if (item.deviceType == 7) {
             //水流速传感器
-            markersMap.icon = "sj-icon-map-centerdata_water_flow_rate";
+            if (item.workingStatus==0)
+            {
+              markersMap.icon ="sj-icon-map-not-centerdata_water_flow_rate";
+            }else (item.workingStatus==1)
+            {
+              markersMap.icon = "sj-icon-map-centerdata_water_flow_rate";
+            }
             markersMap.bindPopupHtml +=
               '<div class="map-tip">' +
               "<span>" +