|
|
@@ -97,7 +97,7 @@
|
|
|
<div class="d-l-l-text">
|
|
|
<i class="iconfont sj-icon-jkzx icon-sxt"></i>
|
|
|
<h4>{{ item.cameraName }}</h4>
|
|
|
-<!-- <h4 v-if="onChuan" v-html="cgqData[index]"></h4>-->
|
|
|
+ <!-- <h4 v-if="onChuan" v-html="cgqData[index]"></h4>-->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -143,15 +143,16 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {
|
|
|
- selectDeviceType,
|
|
|
- selectCameraByDeptId,
|
|
|
- getSensorListByDeptId,
|
|
|
- getDlblistBydeptId,
|
|
|
- selectKeyAreaList,
|
|
|
- getRegionalFlag,
|
|
|
- getCamerasByDeptId, getMonitorDeviceAndDataList
|
|
|
-} from '@/api/monitor'
|
|
|
+ import {
|
|
|
+ selectDeviceType,
|
|
|
+ selectCameraByDeptId,
|
|
|
+ getSensorListByDeptId,
|
|
|
+ getDlblistBydeptId,
|
|
|
+ selectKeyAreaList,
|
|
|
+ getRegionalFlag,
|
|
|
+ getCamerasByDeptId,
|
|
|
+ getMonitorDeviceAndDataList
|
|
|
+ } from '@/api/monitor'
|
|
|
import {
|
|
|
treeselect
|
|
|
} from '@/api/system/dept'
|
|
|
@@ -214,7 +215,7 @@ import {
|
|
|
rightDeptName: undefined,
|
|
|
visuForestCloudCameraBOListSearch: [],
|
|
|
// 部门名称
|
|
|
- cgqData:[],
|
|
|
+ cgqData: [],
|
|
|
deptName: undefined,
|
|
|
deptId: '',
|
|
|
// 部门树选项
|
|
|
@@ -423,14 +424,13 @@ import {
|
|
|
this.deptId = Cookies.get("deptId")
|
|
|
this.getMonitorDeviceAndDataList()
|
|
|
},
|
|
|
- chuanSet()
|
|
|
- {
|
|
|
- let that =this
|
|
|
- setInterval(function() {
|
|
|
+ chuanSet() {
|
|
|
+ let that = this
|
|
|
+ setInterval(function() {
|
|
|
|
|
|
- that.getMonitorDeviceAndDataList()
|
|
|
+ that.getMonitorDeviceAndDataList()
|
|
|
|
|
|
- }, 300000)
|
|
|
+ }, 300000)
|
|
|
},
|
|
|
//传感器2
|
|
|
getMonitorDeviceAndDataLists() {
|
|
|
@@ -500,14 +500,14 @@ import {
|
|
|
});
|
|
|
},
|
|
|
|
|
|
- getMonitorDeviceAndDataList()
|
|
|
- {
|
|
|
- let list=[]
|
|
|
+
|
|
|
+ getMonitorDeviceAndDataList() {
|
|
|
+ let list = []
|
|
|
let markersList = [];
|
|
|
- getMonitorDeviceAndDataList(this.deptId).then((res)=> {
|
|
|
+ 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,
|
|
|
@@ -562,25 +562,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -589,7 +571,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -598,7 +580,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -607,30 +589,11 @@ import {
|
|
|
' <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>" +
|
|
|
-
|
|
|
"</div>";
|
|
|
|
|
|
} else if (item.deviceType == '002') { // 水尺
|
|
|
@@ -644,7 +607,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -653,7 +616,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -662,16 +625,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -680,7 +634,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -689,7 +643,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -698,25 +652,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -725,16 +661,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -748,44 +675,8 @@ import {
|
|
|
"<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>" +
|
|
|
@@ -794,25 +685,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -821,25 +694,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -848,25 +703,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -878,17 +715,8 @@ import {
|
|
|
"<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>" +
|
|
|
@@ -897,16 +725,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -915,7 +734,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -924,7 +743,7 @@ import {
|
|
|
' <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>" +
|
|
|
@@ -934,76 +753,21 @@ import {
|
|
|
' <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)//水流速传感器
|
|
|
+ } 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>" +
|
|
|
@@ -1011,8 +775,8 @@ import {
|
|
|
"<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>" +
|
|
|
@@ -1022,7 +786,7 @@ import {
|
|
|
markersMap.lat = item.latitude;
|
|
|
markersList.push(markersMap);
|
|
|
})
|
|
|
-console.log(markersList)
|
|
|
+ console.log(markersList)
|
|
|
})
|
|
|
setTimeout(() => {
|
|
|
this.$refs.supermap.clearM();
|
|
|
@@ -1105,9 +869,9 @@ console.log(markersList)
|
|
|
getSensorListByDeptId(that.deptId).then(function(res) {
|
|
|
that.sensorNum = res.data.length
|
|
|
|
|
|
- taht.onLa = false
|
|
|
- this.onShe = false
|
|
|
- this.onChuan = true
|
|
|
+ taht.onLa = false
|
|
|
+ this.onShe = false
|
|
|
+ this.onChuan = true
|
|
|
})
|
|
|
.catch(function(error) {
|
|
|
console.error(error);
|
|
|
@@ -1661,4 +1425,4 @@ console.log(markersList)
|
|
|
height: 600px;
|
|
|
border: 1px solid red;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
JX.LI
