|
|
@@ -204,7 +204,7 @@
|
|
|
this.getTreeselect()
|
|
|
this.deptId = Cookies.get("deptId")
|
|
|
this.getMonitorDeviceAndDataLists()
|
|
|
- this.getDlblistBydeptIds()
|
|
|
+ this.getDlblistBydeptIds()
|
|
|
this.selectDeviceType(-1)
|
|
|
// this.showTVWall();
|
|
|
},
|
|
|
@@ -214,7 +214,7 @@
|
|
|
data() {
|
|
|
return {
|
|
|
//摄像头名称
|
|
|
- cgqData:[],
|
|
|
+ cgqData: [],
|
|
|
rightDeptName: undefined,
|
|
|
visuForestCloudCameraBOListSearch: [],
|
|
|
// 部门名称
|
|
|
@@ -327,42 +327,35 @@
|
|
|
// },
|
|
|
/* 电视墙替换开始 */
|
|
|
showTVWall(channelCode, channelName) {
|
|
|
- let tvListJson = [
|
|
|
- {
|
|
|
- "switchTab": "2",
|
|
|
- "treeLabels": [
|
|
|
- {
|
|
|
- "id": null,
|
|
|
- "labelCode": "999",
|
|
|
- "labelName": "电视墙",
|
|
|
- "cameraType": null,
|
|
|
- "parentLabelCode": ""
|
|
|
- },
|
|
|
- {
|
|
|
- "id": "spcamera00010",
|
|
|
- "labelCode": channelCode,
|
|
|
- "labelName": channelName,
|
|
|
- "cameraType": "1",
|
|
|
- "parentLabelCode": "999"
|
|
|
- }
|
|
|
- ],
|
|
|
- "labelChannels": [
|
|
|
- {
|
|
|
- "labelCode": channelCode,
|
|
|
- "channelDates": [
|
|
|
- {
|
|
|
- "channelCode": channelCode,
|
|
|
- "channelName": channelName,
|
|
|
- "channelSn": null,
|
|
|
- "cameraType": "1",
|
|
|
- "online": "1",
|
|
|
- "cameraCode": "1"
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
- ]
|
|
|
+ let tvListJson = [{
|
|
|
+ "switchTab": "2",
|
|
|
+ "treeLabels": [{
|
|
|
+ "id": null,
|
|
|
+ "labelCode": "999",
|
|
|
+ "labelName": "电视墙",
|
|
|
+ "cameraType": null,
|
|
|
+ "parentLabelCode": ""
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "id": "spcamera00010",
|
|
|
+ "labelCode": channelCode,
|
|
|
+ "labelName": channelName,
|
|
|
+ "cameraType": "1",
|
|
|
+ "parentLabelCode": "999"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "labelChannels": [{
|
|
|
+ "labelCode": channelCode,
|
|
|
+ "channelDates": [{
|
|
|
+ "channelCode": channelCode,
|
|
|
+ "channelName": channelName,
|
|
|
+ "channelSn": null,
|
|
|
+ "cameraType": "1",
|
|
|
+ "online": "1",
|
|
|
+ "cameraCode": "1"
|
|
|
+ }]
|
|
|
+ }]
|
|
|
+ }]
|
|
|
this.$refs.TVWall.showTVWall(tvListJson, [{
|
|
|
"channelId": channelCode
|
|
|
}]);
|
|
|
@@ -483,13 +476,13 @@
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
that.$refs.supermap.clearM();
|
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
+ that.$refs.supermap.clearMRadius()
|
|
|
that.$refs.supermap.setMarkers(markersList);
|
|
|
}, 2000);
|
|
|
} else {
|
|
|
setTimeout(() => {
|
|
|
that.$refs.supermap.clearM();
|
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
+ that.$refs.supermap.clearMRadius()
|
|
|
}, 2000);
|
|
|
}
|
|
|
})
|
|
|
@@ -501,19 +494,20 @@
|
|
|
let that = this;
|
|
|
|
|
|
getDlblistBydeptId(that.deptId).then(function(res) {
|
|
|
- that.loudspeakerNum = res.data.length
|
|
|
- })
|
|
|
+ that.loudspeakerNum = res.data.length
|
|
|
+ })
|
|
|
.catch(function(error) {
|
|
|
console.error(error);
|
|
|
});
|
|
|
},
|
|
|
+
|
|
|
getMonitorDeviceAndDataList() {
|
|
|
let list = []
|
|
|
let markersList = [];
|
|
|
getMonitorDeviceAndDataList(this.deptId).then((res) => {
|
|
|
this.visuForestCloudCameraBOListSearch = []
|
|
|
list = res.data
|
|
|
- // this.sensorNum = list.length
|
|
|
+ //this.sensorNum = list.length
|
|
|
list.forEach(item => {
|
|
|
let dat = {
|
|
|
cameraName: item.deviceName,
|
|
|
@@ -568,25 +562,7 @@
|
|
|
' <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>" +
|
|
|
@@ -595,7 +571,7 @@
|
|
|
' <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>" +
|
|
|
@@ -604,7 +580,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>" +
|
|
|
@@ -613,30 +589,11 @@
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
" <h4>水温：" +
|
|
|
- (item.data.waterTemperature ? item.data.waterTemperature : "") +
|
|
|
+ (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.version ? item.data.version : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>水质悬浮物：" +
|
|
|
- (item.data.waterQualitySuspension ? item.data.waterQualitySuspension : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
-
|
|
|
"</div>";
|
|
|
|
|
|
} else if (item.deviceType == '002') { // 水尺
|
|
|
@@ -650,7 +607,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>" +
|
|
|
@@ -659,7 +616,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>" +
|
|
|
@@ -668,16 +625,7 @@
|
|
|
' <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>" +
|
|
|
@@ -686,7 +634,7 @@
|
|
|
' <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>" +
|
|
|
@@ -695,7 +643,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>" +
|
|
|
@@ -704,25 +652,7 @@
|
|
|
' <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>" +
|
|
|
@@ -731,16 +661,7 @@
|
|
|
' <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>" +
|
|
|
@@ -754,44 +675,8 @@
|
|
|
"<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>" +
|
|
|
@@ -800,25 +685,7 @@
|
|
|
' <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>" +
|
|
|
@@ -827,25 +694,7 @@
|
|
|
' <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>" +
|
|
|
@@ -854,25 +703,7 @@
|
|
|
' <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>" +
|
|
|
@@ -884,17 +715,8 @@
|
|
|
"<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>" +
|
|
|
@@ -903,16 +725,7 @@
|
|
|
' <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>" +
|
|
|
@@ -921,7 +734,7 @@
|
|
|
' <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>" +
|
|
|
@@ -930,7 +743,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>" +
|
|
|
@@ -940,76 +753,21 @@
|
|
|
' <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>" +
|
|
|
-
|
|
|
"</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>流量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>" +
|
|
|
@@ -1017,8 +775,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>" +
|
|
|
@@ -1064,19 +822,19 @@
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: false,
|
|
|
};
|
|
|
- if (res.data[i].deviceType == 1) { // 水质传感器
|
|
|
+ if (res.data[i].deviceType == 1) { // 水质传感器
|
|
|
markersMap.icon = "sj-icon-map-centerdata_water_quality_sensor";
|
|
|
- } else if (res.data[i].deviceType == '002') { // 水尺
|
|
|
+ } else if (res.data[i].deviceType == '002') { // 水尺
|
|
|
markersMap.icon = "sj-icon-map-centerdata_water_gauge";
|
|
|
- } else if (res.data[i].deviceType == '003') { // 水文监测设备
|
|
|
+ } else if (res.data[i].deviceType == '003') { // 水文监测设备
|
|
|
markersMap.icon = "sj-icon-map-centerdata_hydrological_monitoring_equipment";
|
|
|
- } else if (res.data[i].deviceType == 2) { // 土壤监测设备
|
|
|
+ } else if (res.data[i].deviceType == 2) { // 土壤监测设备
|
|
|
markersMap.icon = "sj-icon-map-centerdata_soil_monitoring_equipment";
|
|
|
- } else if (res.data[i].deviceType == 4) { // 病虫害监测站
|
|
|
+ } 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) { // 大气传感器
|
|
|
+ } else if (res.data[i].deviceType == 5) { // 大气传感器
|
|
|
markersMap.icon = "sj-icon-map-centerdata_atmospheric_sensor";
|
|
|
- } else if (res.data[i].deviceType == 6) { // 水压传感器
|
|
|
+ } else if (res.data[i].deviceType == 6) { // 水压传感器
|
|
|
markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
|
|
|
}
|
|
|
|
|
|
@@ -1088,18 +846,18 @@
|
|
|
// that.setcgqValue()
|
|
|
setTimeout(() => {
|
|
|
that.$refs.supermap.clearM();
|
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
+ that.$refs.supermap.clearMRadius()
|
|
|
that.$refs.supermap.setMarkers(markersList);
|
|
|
}, 2000);
|
|
|
} else {
|
|
|
setTimeout(() => {
|
|
|
that.$refs.supermap.clearM();
|
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
+ that.$refs.supermap.clearMRadius()
|
|
|
}, 2000);
|
|
|
}
|
|
|
that.onLa = false
|
|
|
- that.onShe = false
|
|
|
- that.onChuan = true
|
|
|
+ that.onShe = false
|
|
|
+ that.onChuan = true
|
|
|
})
|
|
|
.catch(function(error) {
|
|
|
console.error(error);
|
|
|
@@ -1108,9 +866,9 @@
|
|
|
getSensorListByDeptIds() {
|
|
|
let that = this;
|
|
|
getSensorListByDeptId(that.deptId).then(function(res) {
|
|
|
- that.sensorNum = res.data.length
|
|
|
+ that.sensorNum = res.data.length
|
|
|
|
|
|
- })
|
|
|
+ })
|
|
|
.catch(function(error) {
|
|
|
console.error(error);
|
|
|
});
|
|
|
@@ -1137,7 +895,7 @@
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
that.$refs.supermap.clearG()
|
|
|
- that.$refs.supermap.setGraphicsList(this.graphicsList, 'red',0.8)
|
|
|
+ that.$refs.supermap.setGraphicsList(this.graphicsList, 'red', 0.8)
|
|
|
}, 1000)
|
|
|
} else {
|
|
|
that.$refs.supermap.clearG()
|
|
|
@@ -1309,13 +1067,13 @@
|
|
|
// longitude: "125.3333"
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM();
|
|
|
+ that.$refs.supermap.clearM();
|
|
|
that.$refs.supermap.clearMRadius()
|
|
|
that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
|
|
|
}, 3000)
|
|
|
} else {
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM();
|
|
|
+ that.$refs.supermap.clearM();
|
|
|
that.$refs.supermap.clearMRadius()
|
|
|
}, 1000)
|
|
|
}
|
|
|
@@ -1397,12 +1155,12 @@
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
that.$refs.supermap.clearMRadius()
|
|
|
- that.$refs.supermap.clearM();
|
|
|
+ that.$refs.supermap.clearM();
|
|
|
that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
|
|
|
}, 3000)
|
|
|
} else {
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM();
|
|
|
+ that.$refs.supermap.clearM();
|
|
|
that.$refs.supermap.clearMRadius()
|
|
|
}, 1000)
|
|
|
}
|
|
|
@@ -1528,9 +1286,9 @@
|
|
|
})
|
|
|
|
|
|
that.oWebControl.JS_CreateWnd('playWnd', 1020, 600).then(
|
|
|
- function() { //JS_CreateWnd创建视频播放窗口，宽高可设定
|
|
|
- that.init(newappkey, newloginIp, newsecret, newloginPort) // 创建播放实例成功后初始化
|
|
|
- })
|
|
|
+ function() { //JS_CreateWnd创建视频播放窗口，宽高可设定
|
|
|
+ that.init(newappkey, newloginIp, newsecret, newloginPort) // 创建播放实例成功后初始化
|
|
|
+ })
|
|
|
}, function() { // 启动插件服务失败
|
|
|
})
|
|
|
},
|
|
|
@@ -1663,4 +1421,4 @@
|
|
|
height: 600px;
|
|
|
border: 1px solid red;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
JX.LI
