|
|
@@ -504,6 +504,7 @@
|
|
|
getMonitorDeviceAndDataList(this.deptId).then((res) => {
|
|
|
this.visuForestCloudCameraBOListSearch = []
|
|
|
list = res.data
|
|
|
+ //this.sensorNum = list.length
|
|
|
list.forEach(item => {
|
|
|
let dat = {
|
|
|
cameraName: item.deviceName,
|
|
|
@@ -558,34 +559,34 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>水中PH：" +
|
|
|
- (item.data.waterPh ? item.data.waterPh : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>生化需氧量：" +
|
|
|
- (item.data.bod ? item.data.bod : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>信号强度：" +
|
|
|
- (item.data.signalStrength ? item.data.signalStrength : "") +
|
|
|
+ (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 : "") +
|
|
|
+ (item.data.cod ? item.data.cod+"mg/L" : "0mg/L") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -594,7 +595,7 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>氨氮：" +
|
|
|
- (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen : "") +
|
|
|
+ (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen+"mg/L" : "0mg/L") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -603,29 +604,20 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>水温：" +
|
|
|
- (item.data.waterTemperature ? item.data.waterTemperature : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>版本号：" +
|
|
|
- (item.data.version ? item.data.version : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>水质悬浮物：" +
|
|
|
- (item.data.waterQualitySuspension ? item.data.waterQualitySuspension : "") +
|
|
|
+ (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>";
|
|
|
|
|
|
@@ -640,7 +632,7 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>钾含量：" +
|
|
|
- (item.data.potassium ? item.data.potassium : "") +
|
|
|
+ (item.data.potassium ? item.data.potassium+"mg/kg" : "0mg/kg") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -649,7 +641,7 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>导电率：" +
|
|
|
- (item.data.conductivity ? item.data.conductivity : "") +
|
|
|
+ (item.data.conductivity ? item.data.conductivity+"us/cm" : "0us/cm") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -658,25 +650,25 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>氮含量：" +
|
|
|
- (item.data.nitrogen ? item.data.nitrogen : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>信号强度：" +
|
|
|
- (item.data.signalStrength ? item.data.signalStrength : "") +
|
|
|
+ (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 : "") +
|
|
|
+ (item.data.temperature ? item.data.temperature+"°C" : "0°C") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -685,7 +677,7 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>ph值：" +
|
|
|
- (item.data.ph ? item.data.ph : "") +
|
|
|
+ (item.data.ph ? item.data.ph+"PH" : "0PH") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -694,197 +686,197 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>湿度：" +
|
|
|
- (item.data.humidity ? item.data.humidity : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>错误码：" +
|
|
|
- (item.data.errorCode ? item.data.errorCode : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>版本号：" +
|
|
|
- (item.data.version ? item.data.version : "") +
|
|
|
+ (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 : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>电压：" +
|
|
|
- (item.data.voltage ? item.data.voltage : "") +
|
|
|
+ (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>";
|
|
|
} else if (item.deviceType == 4) { // 病虫害监测站
|
|
|
markersMap.icon = "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
|
|
|
} else if (item.deviceType == 5) { // 大气传感器
|
|
|
markersMap.icon = "sj-icon-map-centerdata_atmospheric_sensor";
|
|
|
markersMap.bindPopupHtml += '<div class="map-tip">' +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>总挥发性有机物：" +
|
|
|
- (item.data.tvoc ? item.data.tvoc : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
+ // "<span>" +
|
|
|
+ // ' <div class="d-l-con">' +
|
|
|
+ // ' <div class="d-l-l-text">' +
|
|
|
+ // " <h4>总挥发性有机物：" +
|
|
|
+ // (item.data.tvoc ? item.data.tvoc : "") +
|
|
|
+ // "</h4>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </span>" +
|
|
|
"<span>" +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>二氧化硫：" +
|
|
|
- (item.data.sulfurDioxide ? item.data.sulfurDioxide : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>电池电压：" +
|
|
|
- (item.data.batteryVoltage ? item.data.batteryVoltage : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>信号强度：" +
|
|
|
- (item.data.signalStrength ? item.data.signalStrength : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>可吸入颗粒物：" +
|
|
|
- (item.data.suctionParticle ? item.data.suctionParticle : "") +
|
|
|
+ (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 : "") +
|
|
|
- "</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 : "") +
|
|
|
+ (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 : "") +
|
|
|
- "</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 : "") +
|
|
|
+ (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 : "") +
|
|
|
- "</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 : "") +
|
|
|
+ (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>";
|
|
|
} 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.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 : "") +
|
|
|
+ (item.data.thresholdLowEnable ? item.data.thresholdLowEnable+"MPa" : "0MPa") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -893,25 +885,25 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>上限警报使能：" +
|
|
|
- (item.data.thresholdHighEnable ? item.data.thresholdHighEnable : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>信号强度：" +
|
|
|
- (item.data.signalPower ? item.data.signalPower : "") +
|
|
|
+ (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 : "") +
|
|
|
+ (item.data.hydraulicValue ? item.data.hydraulicValue+"MPa" : "0MPa") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -920,7 +912,7 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>水压下限阈值：" +
|
|
|
- (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin : "") +
|
|
|
+ (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin+"MPa" : "0MPa") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -930,76 +922,76 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>水压上限阈值：" +
|
|
|
- (item.data.hydraulicThresholdMax ? item.data.hydraulicThresholdMax : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>水压力值：" +
|
|
|
- (item.data.hydraulicValue ? item.data.hydraulicValue : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>心跳周期：" +
|
|
|
- (item.data.heartbeatTime ? item.data.heartbeatTime : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>电池电压：" +
|
|
|
- (item.data.batteryVoltage ? item.data.batteryVoltage : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>电池电量：" +
|
|
|
- (item.data.batteryValue ? item.data.batteryValue : "") +
|
|
|
+ (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>";
|
|
|
} else if (item.deviceType == 7) //水流速传感器
|
|
|
{
|
|
|
- markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
|
|
|
+ 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.Q ? item.data.Q : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>流量Q1：" +
|
|
|
- (item.data.Q1 ? item.data.Q1 : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>流量Q2：" +
|
|
|
- (item.data.Q2 ? item.data.Q2 : "") +
|
|
|
+ " <h4>瞬时流速：" +
|
|
|
+ (item.data.Q2 ? item.data.Q2+"m/s" : "0m/s") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
|
|
@@ -1007,8 +999,8 @@
|
|
|
"<span>" +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- " <h4>Q1累计流量：" +
|
|
|
- (item.data.CQ1 ? item.data.CQ1 : "") +
|
|
|
+ " <h4>瞬时流量：" +
|
|
|
+ (item.data.CQ1 ? item.data.CQ1+"m³/s": "0m³/s") +
|
|
|
"</h4>" +
|
|
|
" </div>" +
|
|
|
" </div>" +
|
王通
