|
|
@@ -31,7 +31,7 @@
|
|
|
<h5>传感器</h5>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="icon-con w-33 m-btm-no" :class="{on:onLa}" @click="laClick">
|
|
|
+ <div class="icon-con w-33 m-btm-no" :class="{on:onLa}">
|
|
|
<div class="icon icon-dot"></div>
|
|
|
<div class="icon-text">
|
|
|
<h6>{{ loudspeakerNum }}</h6>
|
|
|
@@ -199,9 +199,9 @@
|
|
|
this.bottomMenuList() //获取底部公共组件消息和任务
|
|
|
this.getTreeselect()
|
|
|
this.deptId = Cookies.get("deptId")
|
|
|
- this.chuanSet()
|
|
|
+ // this.chuanSet()
|
|
|
this.getMonitorDeviceAndDataLists()
|
|
|
- this.getDlblistBydeptIds()
|
|
|
+ // this.getDlblistBydeptIds()
|
|
|
this.selectDeviceType(-1)
|
|
|
// this.showTVWall();
|
|
|
},
|
|
|
@@ -391,7 +391,7 @@
|
|
|
} else if (that.localMark == 'chuan') {
|
|
|
that.getMonitorDeviceAndDataList()
|
|
|
} else if (that.localMark == 'la') {
|
|
|
- that.getDlblistBydeptId()
|
|
|
+ // that.getDlblistBydeptId()
|
|
|
}
|
|
|
},
|
|
|
sheClick() {
|
|
|
@@ -436,92 +436,92 @@
|
|
|
})
|
|
|
},
|
|
|
// 云广播
|
|
|
- getDlblistBydeptId() {
|
|
|
- let that = this;
|
|
|
- let markersList = [];
|
|
|
- getDlblistBydeptId(that.deptId).then(function(res) {
|
|
|
- that.loudspeakerNum = res.data.length
|
|
|
- that.visuForestCloudCameraBOListSearch = []
|
|
|
- if (res.data != null && res.data.length > 0) {
|
|
|
- for (let j = 0; j < res.data.length; j++) {
|
|
|
- let dat = {
|
|
|
- cameraName: res.data[j].name,
|
|
|
- longitude: res.data[j].longitude,
|
|
|
- latitude: res.data[j].latitude,
|
|
|
- }
|
|
|
- that.visuForestCloudCameraBOListSearch.push(dat)
|
|
|
- }
|
|
|
- for (let i = 0; i < res.data.length; i++) {
|
|
|
- let markersMap = {
|
|
|
- lng: 124.59,
|
|
|
- lat: 43.02,
|
|
|
- icon: "marker",
|
|
|
- bindPopupHtml: '<div class="map-tip">' +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>名称：" +
|
|
|
- (res.data[i].name ? res.data[i].name : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>位置：" +
|
|
|
- (res.data[i].position ? res.data[i].position : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>备注：" +
|
|
|
- (res.data[i].remark ? res.data[i].remark : "") +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "<span>" +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- " <h4>经纬度：" +
|
|
|
- res.data[i].longitude + "," + res.data[i].latitude +
|
|
|
- "</h4>" +
|
|
|
- " </div>" +
|
|
|
- " </div>" +
|
|
|
- " </span>" +
|
|
|
- "</div>",
|
|
|
- click: "jump",
|
|
|
- parameter: "",
|
|
|
- name: "",
|
|
|
- keepBindPopup: false,
|
|
|
- isAggregation: false,
|
|
|
- };
|
|
|
- markersMap.icon = "big-horn";
|
|
|
-
|
|
|
- markersMap.lng = res.data[i].longitude;
|
|
|
- markersMap.lat = res.data[i].latitude;
|
|
|
- markersList.push(markersMap);
|
|
|
- }
|
|
|
- setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM();
|
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
- that.$refs.supermap.setMarkers(markersList);
|
|
|
- }, 2000);
|
|
|
- } else {
|
|
|
- setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM();
|
|
|
- that.$refs.supermap.clearMRadius()
|
|
|
- }, 2000);
|
|
|
- }
|
|
|
- })
|
|
|
- .catch(function(error) {
|
|
|
- console.error(error);
|
|
|
- });
|
|
|
- },
|
|
|
+ // getDlblistBydeptId() {
|
|
|
+ // let that = this;
|
|
|
+ // let markersList = [];
|
|
|
+ // getDlblistBydeptId(that.deptId).then(function(res) {
|
|
|
+ // that.loudspeakerNum = res.data.length
|
|
|
+ // that.visuForestCloudCameraBOListSearch = []
|
|
|
+ // if (res.data != null && res.data.length > 0) {
|
|
|
+ // for (let j = 0; j < res.data.length; j++) {
|
|
|
+ // let dat = {
|
|
|
+ // cameraName: res.data[j].name,
|
|
|
+ // longitude: res.data[j].longitude,
|
|
|
+ // latitude: res.data[j].latitude,
|
|
|
+ // }
|
|
|
+ // that.visuForestCloudCameraBOListSearch.push(dat)
|
|
|
+ // }
|
|
|
+ // for (let i = 0; i < res.data.length; i++) {
|
|
|
+ // let markersMap = {
|
|
|
+ // lng: 124.59,
|
|
|
+ // lat: 43.02,
|
|
|
+ // icon: "marker",
|
|
|
+ // bindPopupHtml: '<div class="map-tip">' +
|
|
|
+ // "<span>" +
|
|
|
+ // ' <div class="d-l-con">' +
|
|
|
+ // ' <div class="d-l-l-text">' +
|
|
|
+ // " <h4>名称：" +
|
|
|
+ // (res.data[i].name ? res.data[i].name : "") +
|
|
|
+ // "</h4>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </span>" +
|
|
|
+ // "<span>" +
|
|
|
+ // ' <div class="d-l-con">' +
|
|
|
+ // ' <div class="d-l-l-text">' +
|
|
|
+ // " <h4>位置：" +
|
|
|
+ // (res.data[i].position ? res.data[i].position : "") +
|
|
|
+ // "</h4>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </span>" +
|
|
|
+ // "<span>" +
|
|
|
+ // ' <div class="d-l-con">' +
|
|
|
+ // ' <div class="d-l-l-text">' +
|
|
|
+ // " <h4>备注：" +
|
|
|
+ // (res.data[i].remark ? res.data[i].remark : "") +
|
|
|
+ // "</h4>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </span>" +
|
|
|
+ // "<span>" +
|
|
|
+ // ' <div class="d-l-con">' +
|
|
|
+ // ' <div class="d-l-l-text">' +
|
|
|
+ // " <h4>经纬度：" +
|
|
|
+ // res.data[i].longitude + "," + res.data[i].latitude +
|
|
|
+ // "</h4>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </div>" +
|
|
|
+ // " </span>" +
|
|
|
+ // "</div>",
|
|
|
+ // click: "jump",
|
|
|
+ // parameter: "",
|
|
|
+ // name: "",
|
|
|
+ // keepBindPopup: false,
|
|
|
+ // isAggregation: false,
|
|
|
+ // };
|
|
|
+ // markersMap.icon = "big-horn";
|
|
|
+ //
|
|
|
+ // markersMap.lng = res.data[i].longitude;
|
|
|
+ // markersMap.lat = res.data[i].latitude;
|
|
|
+ // markersList.push(markersMap);
|
|
|
+ // }
|
|
|
+ // setTimeout(() => {
|
|
|
+ // that.$refs.supermap.clearM();
|
|
|
+ // that.$refs.supermap.clearMRadius()
|
|
|
+ // that.$refs.supermap.setMarkers(markersList);
|
|
|
+ // }, 2000);
|
|
|
+ // } else {
|
|
|
+ // setTimeout(() => {
|
|
|
+ // that.$refs.supermap.clearM();
|
|
|
+ // that.$refs.supermap.clearMRadius()
|
|
|
+ // }, 2000);
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // .catch(function(error) {
|
|
|
+ // console.error(error);
|
|
|
+ // });
|
|
|
+ // },
|
|
|
getDlblistBydeptIds() {
|
|
|
let that = this;
|
|
|
|
qinhouyu