From de7390c66ef3e3fe316e804495a78d05a01f0160 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期六, 29 五月 2021 18:39:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
index a96d691..709627b 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
@@ -37,7 +37,8 @@
return {
// 鐐瑰嚮瀹氫綅缁戝畾鏁版嵁
clickLocation: '',
- searchList: []
+ searchList: [],
+ marker: null
}
},
methods: {
@@ -88,7 +89,7 @@
// iconSize: 16
// })
const htmls = '<div><ul><li>' + val.name + '</li> <br/> <li>' + val.address + '</li> <br/> <li>' + val.phone + '</li></ul></div>'
- const marker = window.L.marker([ps[1], ps[0]], {
+ this.marker = window.L.marker([ps[1], ps[0]], {
icon: window.L.icon({
iconUrl: iconUrl,
iconSize: [30, 30],
@@ -103,12 +104,14 @@
sticky: true,
className: ''
})
- window.map.addLayer(marker)
+ window.map.addLayer(this.marker)
window.map.setView([ps[1], ps[0]], 17)
pulseEffect([ps[1], ps[0]])
},
// 鐐瑰嚮纭鎸夐挳浜嬩欢
confirm () {
+ window.mapManager.clearHighlight()
+ window.map.removeLayer(this.marker)
this.searchList = []
this.clickLocation = ''
eventBus.$emit('location-setChange', true)
--
Gitblit v1.8.0