|
@@ -72,7 +72,7 @@
|
|
<!-- 地图 -->
|
|
<!-- 地图 -->
|
|
<supermapDialog1 ref="supermapDialog1" style="position: absolute; top:0;left: 0;"
|
|
<supermapDialog1 ref="supermapDialog1" style="position: absolute; top:0;left: 0;"
|
|
:mapDiv="'forestWarmSuperMap'"
|
|
:mapDiv="'forestWarmSuperMap'"
|
|
- :mapSite="{zoom:16,doubleClickZoom:true,dragging:true,scrollWheelZoom:true}" :codes="['9fa5']"
|
|
|
|
|
|
+ :mapSite="{doubleClickZoom:true,dragging:true,scrollWheelZoom:true}" :codes="['9fa5']"
|
|
:isSideBySide="false" @preview="preview" />
|
|
:isSideBySide="false" @preview="preview" />
|
|
<!-- 地图end -->
|
|
<!-- 地图end -->
|
|
</div>
|
|
</div>
|
|
@@ -2077,12 +2077,12 @@ export default {
|
|
obj.type = data.type;
|
|
obj.type = data.type;
|
|
obj.count = data.num;
|
|
obj.count = data.num;
|
|
obj.icon = icon;
|
|
obj.icon = icon;
|
|
- _this.resourcesList.push(obj);
|
|
|
|
|
|
+ _this.resourcesList1.push(obj);
|
|
console.log("icon_" + (index + 1) + "=", icon);
|
|
console.log("icon_" + (index + 1) + "=", icon);
|
|
//每个图标对应固定颜色
|
|
//每个图标对应固定颜色
|
|
- _this.$set(_this.resourcesList[index], "bg", getIconBg(icon));
|
|
|
|
|
|
+ _this.$set(_this.resourcesList1[index], "bg", getIconBg(icon));
|
|
});
|
|
});
|
|
- _this.resourcesList.push({
|
|
|
|
|
|
+ _this.resourcesList1.push({
|
|
resourceName: "摄像头",
|
|
resourceName: "摄像头",
|
|
type: "sxt",
|
|
type: "sxt",
|
|
count: "1",
|
|
count: "1",
|
|
@@ -3183,11 +3183,14 @@ export default {
|
|
markersMapList.push(markersMap)
|
|
markersMapList.push(markersMap)
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- that.$refs.supermapDialog1.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
|
|
|
|
- that.$refs.supermapDialog1.clearM(false)
|
|
|
|
- that.$refs.supermapDialog1.clearM(true)
|
|
|
|
- that.$refs.supermapDialog1.setMarkersRadius(markersMapList)
|
|
|
|
- }, 2000)
|
|
|
|
|
|
+ that.$refs.supermapDialog1.dropLocation10(
|
|
|
|
+ res.data.catalogue.latitude,
|
|
|
|
+ res.data.catalogue.longitude
|
|
|
|
+ );
|
|
|
|
+ that.$refs.supermapDialog1.clearM(false);
|
|
|
|
+ that.$refs.supermapDialog1.clearM(true);
|
|
|
|
+ that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
|
|
|
|
+ }, 2000);
|
|
})
|
|
})
|
|
},
|
|
},
|
|
refreshEvent(eventCode) {
|
|
refreshEvent(eventCode) {
|
|
@@ -3280,11 +3283,14 @@ export default {
|
|
markersMapList.push(markersMap)
|
|
markersMapList.push(markersMap)
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- that.$refs.supermapDialog1.clearM(false)
|
|
|
|
- that.$refs.supermapDialog1.clearM(true)
|
|
|
|
- that.$refs.supermapDialog1.setMarkersRadius(markersMapList)
|
|
|
|
- that.$refs.supermapDialog1.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
|
|
|
|
- }, 2000)
|
|
|
|
|
|
+ that.$refs.supermapDialog1.dropLocation10(
|
|
|
|
+ res.data.catalogue.latitude,
|
|
|
|
+ res.data.catalogue.longitude
|
|
|
|
+ );
|
|
|
|
+ that.$refs.supermapDialog1.clearM(false);
|
|
|
|
+ that.$refs.supermapDialog1.clearM(true);
|
|
|
|
+ that.$refs.supermapDialog1.setMarkersRadius(markersMapList);
|
|
|
|
+ }, 2000);
|
|
})
|
|
})
|
|
},
|
|
},
|
|
refreshEventDialog(eventCode) {
|
|
refreshEventDialog(eventCode) {
|