|
@@ -96,7 +96,8 @@
|
|
:class="{on:listCurrentIndex2 == index}" v-on:click="dropLocation(item.latitude,item.longitude,index)">
|
|
:class="{on:listCurrentIndex2 == index}" v-on:click="dropLocation(item.latitude,item.longitude,index)">
|
|
<div class="d-l-l-text">
|
|
<div class="d-l-l-text">
|
|
<i class="iconfont sj-icon-jkzx icon-sxt"></i>
|
|
<i class="iconfont sj-icon-jkzx icon-sxt"></i>
|
|
- <h4>{{ item.cameraName }}</h4><h4 v-if="onChuan" v-html="cgqData[index]"></h4>
|
|
|
|
|
|
+ <h4>{{ item.cameraName }}</h4>
|
|
|
|
+ <h4 v-if="onChuan" v-html="cgqData[index]"></h4>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -201,9 +202,9 @@
|
|
this.selectKeyAreaList()
|
|
this.selectKeyAreaList()
|
|
this.getTreeselect()
|
|
this.getTreeselect()
|
|
this.deptId = Cookies.get("deptId")
|
|
this.deptId = Cookies.get("deptId")
|
|
- // this.getSensorListByDeptIds()
|
|
|
|
|
|
+ // this.getSensorListByDeptIds()
|
|
this.getMonitorDeviceAndDataLists()
|
|
this.getMonitorDeviceAndDataLists()
|
|
- this.getDlblistBydeptIds()
|
|
|
|
|
|
+ this.getDlblistBydeptIds()
|
|
this.chuanSet()
|
|
this.chuanSet()
|
|
this.selectDeviceType(-1)
|
|
this.selectDeviceType(-1)
|
|
this.bottomMenuList() //获取底部公共组件消息和任务
|
|
this.bottomMenuList() //获取底部公共组件消息和任务
|
|
@@ -211,7 +212,7 @@
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
// 部门名称
|
|
// 部门名称
|
|
- cgqData:[],
|
|
|
|
|
|
+ cgqData: [],
|
|
deptName: undefined,
|
|
deptName: undefined,
|
|
deptId: '',
|
|
deptId: '',
|
|
// 部门树选项
|
|
// 部门树选项
|
|
@@ -290,23 +291,23 @@
|
|
jump() { // 跳转大喇叭页面
|
|
jump() { // 跳转大喇叭页面
|
|
window.open("https://sts.sty1818.com");
|
|
window.open("https://sts.sty1818.com");
|
|
},
|
|
},
|
|
- chuanSet()
|
|
|
|
- {
|
|
|
|
- let that =this
|
|
|
|
|
|
+ chuanSet() {
|
|
|
|
+ let that = this
|
|
setInterval(function() {
|
|
setInterval(function() {
|
|
|
|
|
|
that.getMonitorDeviceAndDataList()
|
|
that.getMonitorDeviceAndDataList()
|
|
|
|
|
|
}, 300000)
|
|
}, 300000)
|
|
},
|
|
},
|
|
- getMonitorDeviceAndDataList()
|
|
|
|
- {
|
|
|
|
- let list=[]
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ getMonitorDeviceAndDataList() {
|
|
|
|
+ let list = []
|
|
let markersList = [];
|
|
let markersList = [];
|
|
- getMonitorDeviceAndDataList(this.deptId).then((res)=> {
|
|
|
|
|
|
+ getMonitorDeviceAndDataList(this.deptId).then((res) => {
|
|
this.visuForestCloudCameraBOListSearch = []
|
|
this.visuForestCloudCameraBOListSearch = []
|
|
list = res.data
|
|
list = res.data
|
|
- // this.sensorNum=list.length
|
|
|
|
|
|
+ //this.sensorNum = list.length
|
|
list.forEach(item => {
|
|
list.forEach(item => {
|
|
let dat = {
|
|
let dat = {
|
|
cameraName: item.deviceName,
|
|
cameraName: item.deviceName,
|
|
@@ -361,25 +362,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>水中PH:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -388,7 +371,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>化学需氧量:" +
|
|
" <h4>化学需氧量:" +
|
|
- (item.data.cod ? item.data.cod : "") +
|
|
|
|
|
|
+ (item.data.cod ? item.data.cod + "mg/L" : "0mg/L") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -397,7 +380,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>氨氮:" +
|
|
" <h4>氨氮:" +
|
|
- (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen : "") +
|
|
|
|
|
|
+ (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen + "mg/L" : "0mg/L") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -406,30 +389,11 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>水温:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </span>" +
|
|
" </span>" +
|
|
-
|
|
|
|
"</div>";
|
|
"</div>";
|
|
|
|
|
|
} else if (item.deviceType == '002') { // 水尺
|
|
} else if (item.deviceType == '002') { // 水尺
|
|
@@ -443,7 +407,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>钾含量:" +
|
|
" <h4>钾含量:" +
|
|
- (item.data.potassium ? item.data.potassium : "") +
|
|
|
|
|
|
+ (item.data.potassium ? item.data.potassium + "mg/kg" : "0mg/kg") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -452,7 +416,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>导电率:" +
|
|
" <h4>导电率:" +
|
|
- (item.data.conductivity ? item.data.conductivity : "") +
|
|
|
|
|
|
+ (item.data.conductivity ? item.data.conductivity + "us/cm" : "0us/cm") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -461,16 +425,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>氮含量:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -479,7 +434,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>温度:" +
|
|
" <h4>温度:" +
|
|
- (item.data.temperature ? item.data.temperature : "") +
|
|
|
|
|
|
+ (item.data.temperature ? item.data.temperature + "°C" : "0°C") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -488,7 +443,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>ph值:" +
|
|
" <h4>ph值:" +
|
|
- (item.data.ph ? item.data.ph : "") +
|
|
|
|
|
|
+ (item.data.ph ? item.data.ph + "PH" : "0PH") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -497,25 +452,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>湿度:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -524,16 +461,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>磷含量:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -547,44 +475,8 @@
|
|
"<span>" +
|
|
"<span>" +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <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>二氧化硫:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -593,25 +485,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>一氧化碳:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -620,25 +494,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>温度:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -647,25 +503,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>二氧化氮:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -677,17 +515,8 @@
|
|
"<span>" +
|
|
"<span>" +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <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>下限警报使能:" +
|
|
" <h4>下限警报使能:" +
|
|
- (item.data.thresholdLowEnable ? item.data.thresholdLowEnable : "") +
|
|
|
|
|
|
+ (item.data.thresholdLowEnable ? item.data.thresholdLowEnable + "MPa" : "0MPa") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -696,16 +525,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>上限警报使能:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -714,7 +534,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>水压力值:" +
|
|
" <h4>水压力值:" +
|
|
- (item.data.hydraulicValue ? item.data.hydraulicValue : "") +
|
|
|
|
|
|
+ (item.data.hydraulicValue ? item.data.hydraulicValue + "MPa" : "0MPa") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -723,7 +543,7 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>水压下限阈值:" +
|
|
" <h4>水压下限阈值:" +
|
|
- (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin : "") +
|
|
|
|
|
|
+ (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin + "MPa" : "0MPa") +
|
|
"</h4>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -733,76 +553,21 @@
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
" <h4>水压上限阈值:" +
|
|
" <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </span>" +
|
|
" </span>" +
|
|
-
|
|
|
|
"</div>";
|
|
"</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">' +
|
|
markersMap.bindPopupHtml += '<div class="map-tip">' +
|
|
"<span>" +
|
|
"<span>" +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -810,8 +575,8 @@
|
|
"<span>" +
|
|
"<span>" +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <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>" +
|
|
"</h4>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
" </div>" +
|
|
@@ -829,8 +594,9 @@
|
|
this.$refs.supermap.setMarkers(markersList);
|
|
this.$refs.supermap.setMarkers(markersList);
|
|
}, 2000);
|
|
}, 2000);
|
|
},
|
|
},
|
|
- setcgqValue:function(){
|
|
|
|
- let that=this
|
|
|
|
|
|
+
|
|
|
|
+ setcgqValue: function() {
|
|
|
|
+ let that = this
|
|
for (let i = 0; i < that.visuForestCloudCameraBOListSearch.length; i++) {
|
|
for (let i = 0; i < that.visuForestCloudCameraBOListSearch.length; i++) {
|
|
var color = "green";
|
|
var color = "green";
|
|
var value = Math.random();
|
|
var value = Math.random();
|
|
@@ -855,47 +621,40 @@
|
|
} else {
|
|
} else {
|
|
value = value + "" + down;
|
|
value = value + "" + down;
|
|
}
|
|
}
|
|
- that.cgqData = "<span style='color:" + color + "'>" + value + "</span>";
|
|
|
|
|
|
+ that.cgqData = "<span style='color:" + color + "'>" + value + "</span>";
|
|
}, 1000)
|
|
}, 1000)
|
|
},
|
|
},
|
|
/* 电视墙替换开始 */
|
|
/* 电视墙替换开始 */
|
|
showTVWall(channelCode, channelName) {
|
|
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, [{
|
|
this.$refs.TVWall.showTVWall(tvListJson, [{
|
|
"channelId": channelCode
|
|
"channelId": channelCode
|
|
}]);
|
|
}]);
|
|
@@ -1010,13 +769,13 @@
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
that.$refs.supermap.clearM();
|
|
that.$refs.supermap.clearM();
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
|
|
|
+ that.$refs.supermap.clearMRadius()
|
|
that.$refs.supermap.setMarkers(markersList);
|
|
that.$refs.supermap.setMarkers(markersList);
|
|
}, 2000);
|
|
}, 2000);
|
|
} else {
|
|
} else {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
that.$refs.supermap.clearM();
|
|
that.$refs.supermap.clearM();
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
|
|
|
+ that.$refs.supermap.clearMRadius()
|
|
}, 2000);
|
|
}, 2000);
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1028,8 +787,8 @@
|
|
let that = this;
|
|
let that = this;
|
|
|
|
|
|
getDlblistBydeptId(that.deptId).then(function(res) {
|
|
getDlblistBydeptId(that.deptId).then(function(res) {
|
|
- that.loudspeakerNum = res.data.length
|
|
|
|
- })
|
|
|
|
|
|
+ that.loudspeakerNum = res.data.length
|
|
|
|
+ })
|
|
.catch(function(error) {
|
|
.catch(function(error) {
|
|
console.error(error);
|
|
console.error(error);
|
|
});
|
|
});
|
|
@@ -1039,7 +798,7 @@
|
|
let that = this;
|
|
let that = this;
|
|
let markersList = [];
|
|
let markersList = [];
|
|
getSensorListByDeptId(that.deptId).then(function(res) {
|
|
getSensorListByDeptId(that.deptId).then(function(res) {
|
|
- that.setcgqValue()
|
|
|
|
|
|
+ that.setcgqValue()
|
|
that.visuForestCloudCameraBOListSearch = []
|
|
that.visuForestCloudCameraBOListSearch = []
|
|
// that.sensorNum = res.data.length
|
|
// that.sensorNum = res.data.length
|
|
if (res.data != null && res.data.length > 0) {
|
|
if (res.data != null && res.data.length > 0) {
|
|
@@ -1062,19 +821,19 @@
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
isAggregation: false,
|
|
isAggregation: false,
|
|
};
|
|
};
|
|
- if (res.data[i].deviceType == 1) { // 水质传感器
|
|
|
|
|
|
+ if (res.data[i].deviceType == 1) { // 水质传感器
|
|
markersMap.icon = "sj-icon-map-centerdata_water_quality_sensor";
|
|
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";
|
|
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";
|
|
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";
|
|
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";
|
|
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";
|
|
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";
|
|
markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1086,18 +845,18 @@
|
|
that.setcgqValue()
|
|
that.setcgqValue()
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
that.$refs.supermap.clearM();
|
|
that.$refs.supermap.clearM();
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
|
|
|
+ that.$refs.supermap.clearMRadius()
|
|
that.$refs.supermap.setMarkers(markersList);
|
|
that.$refs.supermap.setMarkers(markersList);
|
|
}, 2000);
|
|
}, 2000);
|
|
} else {
|
|
} else {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
that.$refs.supermap.clearM();
|
|
that.$refs.supermap.clearM();
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
|
|
|
+ that.$refs.supermap.clearMRadius()
|
|
}, 2000);
|
|
}, 2000);
|
|
}
|
|
}
|
|
- that.onLa = false
|
|
|
|
- that.onShe = false
|
|
|
|
- that.onChuan = true
|
|
|
|
|
|
+ that.onLa = false
|
|
|
|
+ that.onShe = false
|
|
|
|
+ that.onChuan = true
|
|
})
|
|
})
|
|
.catch(function(error) {
|
|
.catch(function(error) {
|
|
console.error(error);
|
|
console.error(error);
|
|
@@ -1108,9 +867,9 @@
|
|
let markersList = [];
|
|
let markersList = [];
|
|
getSensorListByDeptId(that.deptId).then(function(res) {
|
|
getSensorListByDeptId(that.deptId).then(function(res) {
|
|
|
|
|
|
- that.sensorNum = res.data.length
|
|
|
|
|
|
+ that.sensorNum = res.data.length
|
|
|
|
|
|
- })
|
|
|
|
|
|
+ })
|
|
.catch(function(error) {
|
|
.catch(function(error) {
|
|
console.error(error);
|
|
console.error(error);
|
|
});
|
|
});
|
|
@@ -1137,7 +896,7 @@
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
that.$refs.supermap.clearG()
|
|
that.$refs.supermap.clearG()
|
|
- that.$refs.supermap.setGraphicsList(this.graphicsList, 'red',0.8)
|
|
|
|
|
|
+ that.$refs.supermap.setGraphicsList(this.graphicsList, 'red', 0.8)
|
|
}, 1000)
|
|
}, 1000)
|
|
} else {
|
|
} else {
|
|
that.$refs.supermap.clearG()
|
|
that.$refs.supermap.clearG()
|
|
@@ -1310,13 +1069,13 @@
|
|
// longitude: "125.3333"
|
|
// longitude: "125.3333"
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- that.$refs.supermap.clearM();
|
|
|
|
|
|
+ that.$refs.supermap.clearM();
|
|
that.$refs.supermap.clearMRadius()
|
|
that.$refs.supermap.clearMRadius()
|
|
that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
|
|
that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
|
|
}, 3000)
|
|
}, 3000)
|
|
} else {
|
|
} else {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- that.$refs.supermap.clearM();
|
|
|
|
|
|
+ that.$refs.supermap.clearM();
|
|
that.$refs.supermap.clearMRadius()
|
|
that.$refs.supermap.clearMRadius()
|
|
}, 1000)
|
|
}, 1000)
|
|
}
|
|
}
|
|
@@ -1413,13 +1172,13 @@
|
|
// longitude: "125.3333"
|
|
// longitude: "125.3333"
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- that.$refs.supermap.clearM();
|
|
|
|
|
|
+ that.$refs.supermap.clearM();
|
|
that.$refs.supermap.clearMRadius()
|
|
that.$refs.supermap.clearMRadius()
|
|
that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
|
|
that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
|
|
}, 1000)
|
|
}, 1000)
|
|
} else {
|
|
} else {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- that.$refs.supermap.clearM();
|
|
|
|
|
|
+ that.$refs.supermap.clearM();
|
|
that.$refs.supermap.clearMRadius()
|
|
that.$refs.supermap.clearMRadius()
|
|
}, 1000)
|
|
}, 1000)
|
|
}
|
|
}
|
|
@@ -1545,9 +1304,9 @@
|
|
})
|
|
})
|
|
|
|
|
|
that.oWebControl.JS_CreateWnd('playWnd', 1020, 600).then(
|
|
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() { // 启动插件服务失败
|
|
}, function() { // 启动插件服务失败
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -1680,4 +1439,4 @@
|
|
height: 600px;
|
|
height: 600px;
|
|
border: 1px solid red;
|
|
border: 1px solid red;
|
|
}
|
|
}
|
|
-</style>
|
|
|
|
|
|
+</style>
|