|
@@ -50,8 +50,9 @@
|
|
|
<div
|
|
|
class="icon-con w-33 m-btm-no"
|
|
|
:class="{ on: onLa }"
|
|
|
+ @click="laClick"
|
|
|
>
|
|
|
- <!-- @click="laClick"-->
|
|
|
+
|
|
|
<div class="icon icon-dot"></div>
|
|
|
<div class="icon-text">
|
|
|
<h6>{{ loudspeakerNum }}</h6>
|
|
@@ -175,7 +176,7 @@
|
|
|
class="d-l-con"
|
|
|
v-for="(item, index) in keyAreaList"
|
|
|
:class="{ on: listCurrentIndex3 == index }"
|
|
|
- @click="getRegionalFlag(item.id)"
|
|
|
+ @click="getRegionalFlag(item.id,index)"
|
|
|
>
|
|
|
<div class="d-l-l-text">
|
|
|
<i class="i-small"></i>
|
|
@@ -270,7 +271,7 @@ export default {
|
|
|
this.deptId = Cookies.get("deptId");
|
|
|
// this.getSensorListByDeptIds()
|
|
|
this.getMonitorDeviceAndDataLists(null);
|
|
|
- // this.getDlblistBydeptIds(null);
|
|
|
+ this.getDlblistBydeptIds(null);
|
|
|
// this.chuanSet();
|
|
|
this.selectDeviceType(-1);
|
|
|
}, 2000)
|
|
@@ -896,10 +897,10 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
} else if (that.localMark == "chuan") {
|
|
|
- //that.getSensorListByDeptId()
|
|
|
+ that.getSensorListByDeptId()
|
|
|
that.getMonitorDeviceAndDataList(data.id);
|
|
|
} else if (that.localMark == "la") {
|
|
|
- // that.getDlblistBydeptId();
|
|
|
+ that.getDlblistBydeptId();
|
|
|
}
|
|
|
},
|
|
|
sheClick() {
|
|
@@ -962,7 +963,7 @@ export default {
|
|
|
let markersMap = {
|
|
|
lng: 124.59,
|
|
|
lat: 43.02,
|
|
|
- icon: "marker",
|
|
|
+ icon: "big-horn",
|
|
|
bindPopupHtml:
|
|
|
'<div class="map-tip">' +
|
|
|
"<span>" +
|
|
@@ -1011,7 +1012,11 @@ export default {
|
|
|
isAggregation: false,
|
|
|
};
|
|
|
markersMap.icon = "big-horn";
|
|
|
-
|
|
|
+ if (res.data[i].broadcastUse == '1') {
|
|
|
+ markersMap.icon = "big-horn-emergency";
|
|
|
+ } else if (res.data[i].broadcastUse == '2') {
|
|
|
+ markersMap.icon = "big-horn";
|
|
|
+ }
|
|
|
markersMap.lng = res.data[i].longitude;
|
|
|
markersMap.lat = res.data[i].latitude;
|
|
|
markersList.push(markersMap);
|
|
@@ -1133,7 +1138,7 @@ export default {
|
|
|
},
|
|
|
getRegionalFlag(id) {
|
|
|
//获取重点区域
|
|
|
- this.listCurrentIndex3 = id;
|
|
|
+ this.listCurrentIndex3 = index;
|
|
|
let that = this;
|
|
|
getRegionalFlag(id).then((res) => {
|
|
|
that.graphicsList = [];
|