ソースを参照

传感器显示字段同步

JX.LI 1 年間 前
コミット
1d6142402b
1 ファイル変更434 行追加248 行削除
  1. 434 248
      src/views/monitor.vue

+ 434 - 248
src/views/monitor.vue

@@ -718,15 +718,6 @@ export default {
               "                </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">' +
@@ -748,222 +739,398 @@ export default {
           };
           if (item.deviceType == 1) {
             // 水质传感器
-            if (item.workingStatus==1)
-            {
-              markersMap.icon = "sj-icon-map-not-centerdata_water_quality_sensor";
-            }else if(item.workingStatus==0)
-            {
+            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";
             }
-
-            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 == "002") {
+            if (item.data != null) {
+              markersMap.bindPopupHtml +=
+                '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>类型:水质传感器" +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水质悬浮物:" +
+                (item.data.waterQualitySuspension ? item.data.waterQualitySuspension + "mg/L" : "0mg/L") +
+                "</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>水中PH:" +
+                (item.data.waterPh ? item.data.waterPh + "pH | " + (item.threshold ? item.threshold
+                    .waterPhThresholdUp + "pH - " + item.threshold.waterPhThresholdDown + "pH" : "0pH - 0pH"
+                    ) : "0pH | 0pH - 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 " : "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 | " + (item.threshold ? item
+                  .threshold.waterTemperatureThresholdUp + "°C - " + item.threshold
+                  .waterTemperatureThresholdDown + "°C" : "0°C - 0°C") : "0°C | 0°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) {
-            if (item.workingStatus==1)
-            {
+            // 土壤监测设备
+            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";
-            }else if (item.workingStatus==0)
-            {
-              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.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) {
-            if (item.workingStatus==1)
-            {
-              markersMap.icon =
-                "sj-icon-map-not-centerdata_pest_and_disease_monitoring_station";
-            }else if (item.workingStatus==0)
-            {
-              markersMap.icon =
-                "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
+            if (item.data != null) {
+              markersMap.bindPopupHtml +=
+                '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>类型:土壤监测设备" +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>温度:" +
+                (item.data.temperature ? item.data.temperature + "°C | " + (item.threshold ? item.threshold
+                  .temperatureThresholdUp + "°C - " + item.threshold.temperatureThresholdDown + "°C" :
+                  "0°C - 0°C") : "0°C | 0°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 + "%RH | " + (item.threshold ? item.threshold
+                  .humidityThresholdDown + "%RH - " + item.threshold.humidityThresholdUp + "%RH" :
+                  "0%RH - 0%RH") : "0%RH | 0%RH - 0%RH") +
+          
+                "</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 | " + (item.threshold ? item.threshold.phThresholdUp +
+                  "pH - " + item.threshold.phThresholdDown + "pH" : "0pH - 0pH") : "0pH | 0pH - 0pH") +
+                "</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 | " + (item.threshold ? item
+                  .threshold.conductivityThresholdUp + "us/cm - " + item.threshold
+                  .conductivityThresholdDown + "us/cm" : "0us/cm - 0us/cm") : "0us/cm | 0us/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 | " + (item.threshold ? item.threshold
+                  .nitrogenThresholdUp + "mg/kg - " + item.threshold.nitrogenThresholdDown + "mg/kg" :
+                  "0mg/kg - 0mg/kg") : "0mg/kg | 0mg/kg - 0mg/kg") +
+          
+                "</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 | " + (item.threshold ? item.threshold
+                  .phosphorusThresholdUp + "mg/kg - " + item.threshold.phosphorusThresholdDown + "mg/kg" :
+                  "0mg/kg - 0mg/kg") : "0mg/kg | 0mg/kg - 0mg/kg") +
+          
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>钾含量:" +
+                (item.data.potassium ? item.data.potassium + "mg/kg | " + (item.threshold ? item.threshold
+                  .potassiumThresholdUp + "mg/kg - " + item.threshold.potassiumThresholdDown + "mg/kg" :
+                  "0mg/kg - 0mg/kg") : "0mg/kg | 0mg/kg - 0mg/kg") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "</div>";
             }
+          } else if (item.deviceType == 4) {
             // 病虫害监测站
-
+            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";
+            }
+            if (item.data != null) {
+              markersMap.bindPopupHtml +=
+                '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>类型:病虫害传感器" +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>最新识别数量:" +
+                (item.data.newCount ? item.data.newCount : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>最新识别结果:" +
+                (item.data.results ? item.data.results : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>标注后图片:" +
+                "<img class=\"image1\" src=" + item.data.taggingImgUrl + "/>" +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>更新时间:" +
+                (item.data.createTime ? item.data.createTime : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>更新时间:" +
+                (item.data.createTime ? item.data.createTime : "") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "</div>";
+            }
           } else if (item.deviceType == 5) {
-            if (item.workingStatus==1)
-            {
-              markersMap.icon = "sj-icon-map-not-centerdata_atmospheric_sensor";
-            }else if (item.workingStatus==0)
-            {
+            // 大气传感器
+            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>类型:大气传感器" +
+                "</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.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.fineParticle ?
+                  item.data.fineParticle + "ug/m³" :
+                  "0ug/m³") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>大气压:" +
+                (item.data.atmos ?
+                  item.data.atmos + "Kpa" :
+                  "0Kpa") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+          
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>光照度:" +
+                (item.data.illuminance ?
+                  item.data.illuminance + "Lux" :
+                  "0Lux") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>温度:" +
+                (item.data.temperature ? item.data.temperature + "°C | " + (item.threshold ? item.threshold
+                  .temperatureThresholdUp + "°C - " + item.threshold.temperatureThresholdDown + "°C" :
+                  "0°C - 0°C") : "0°C | 0°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 + "%RH" :
+                  "%RH") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>微粒:" +
+                (item.data.suctionParticle ?
+                  item.data.suctionParticle + "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.ozone ?
+                  item.data.ozone + "ug/m³" :
+                  "0ug/m³") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "</div>";
             }
-            // 大气传感器
-            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.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) {
-            if (item.workingStatus==1)
-            {
-              markersMap.icon = "sj-icon-map-not-centerdata_water_pressure_sensor";
-            }else  if (item.workingStatus==0)
-            {
+            // 水压传感器
+            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){
+            if (item.data != null) {
               markersMap.bindPopupHtml +=
                 '<div class="map-tip">' +
                 "<span>" +
@@ -984,22 +1151,14 @@ export default {
                 "                </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 style='color:"+(item.data.hydraulicThresholdMax>=item.data.hydraulicValue>=item.data.hydraulicThresholdMin?'green':'red')+"'"+">水压力值:" +
-                (item.data.hydraulicValue ? item.data.hydraulicValue + "MPa" : "0MPa") +'   | ' +(item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin + "MPa" : "0MPa")+"-"+ (item.data.hydraulicThresholdMax ? item.data.hydraulicThresholdMax + "MPa" : "0MPa")+
+                "                  <h4 style='color:" + (item.data.hydraulicThresholdMax >= item.data
+                  .hydraulicValue >= item.data.hydraulicThresholdMin ? 'green' : 'red') + "'" + ">水压力值:" +
+                (item.data.hydraulicValue ? item.data.hydraulicValue + "MPa" : "0MPa") + '   | ' + (item.data
+                  .hydraulicThresholdMin ? item.data.hydraulicThresholdMin + "MPa" : "0MPa") + "-" + (item
+                  .data.hydraulicThresholdMax ? item.data.hydraulicThresholdMax + "MPa" : "0MPa") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -1008,33 +1167,60 @@ export default {
             }
           } else if (item.deviceType == 7) {
             //水流速传感器
-            if (item.workingStatus==0)
-            {
-              markersMap.icon ="sj-icon-map-not-centerdata_water_flow_rate";
-            }else (item.workingStatus==1)
-            {
+            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>类型:水流速传感器" +
+                "</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>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水位:" +
+                (item.data.Z ? item.data.Z + "" : "0") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>水深:" +
+                (item.data.Z1 ? item.data.Z1 + "" : "0") +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>" +
+                "</div>";
             }
-            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;