From 2f3695cf0962c35021e6ad76495e7a38e7d3878d Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 25 三月 2021 17:10:40 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/SolidWaste/SolidWaste.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/BaseNav/SolidWaste.js b/src/components/BaseNav/SolidWaste/SolidWaste.js
similarity index 94%
rename from src/components/BaseNav/SolidWaste.js
rename to src/components/BaseNav/SolidWaste/SolidWaste.js
index 1724257..616bf11 100644
--- a/src/components/BaseNav/SolidWaste.js
+++ b/src/components/BaseNav/SolidWaste/SolidWaste.js
@@ -1,7 +1,7 @@
import { requestSolidWaste } from '@/api/request'
// 灞曠ず鍥剧墖
-import defaultImg from '@components/BaseNav/magicMarker.png'
-import Setting from '@components/BaseNav/voc.png'
+import defaultImg from '@assets/images/map-pages/basenav/solidwaste/voc.png'
+import Setting from '@assets/images/map-pages/basenav/solidwaste/gf_green.png'
// 搴曞浘涓氬姟灞曠ず鐐�
class AddSolidWasteHelper {
@@ -132,8 +132,8 @@
fillColor: ''
})
if (markers) {
- // markers.push(this.L.marker(FinalPosition, { icon: pulsingIcon }))
- // this.L.layerGroup(markers).addLayer(layerGroup)
+ markers.push(this.L.marker(FinalPosition, { icon: pulsingIcon }))
+ this.L.layerGroup(markers).addLayer(layerGroup)
} else {
const picGroupMarker = new this.L.FeatureGroup()
this.L.marker(FinalPosition, { icon: pulsingIcon }).addTo(picGroupMarker)
--
Gitblit v1.8.0