From 7a2bcf4e66e794a66c2c568dd3503c350a018366 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 31 三月 2021 14:14:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/WasteWater/WasteWater.js | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/WasteWater.js b/src/components/BaseNav/WasteWater/WasteWater.js
index c2f3d6b..05f7b50 100644
--- a/src/components/BaseNav/WasteWater/WasteWater.js
+++ b/src/components/BaseNav/WasteWater/WasteWater.js
@@ -52,16 +52,17 @@
const Icon = new WasteWaterIcon({ iconUrl: iconUrl })
// let url = Icon.options.iconUrl
- const marker = this.L.marker.magic([positionX, positionY], { icon: Icon, magic: 'vanishIn' })
+ // const marker = this.L.marker.magic([positionX, positionY], { icon: Icon, magic: 'vanishIn' }) // 甯︽樉绀哄姩鐢�
+ const marker = this.L.marker([positionX, positionY], { icon: Icon })
- marker.bindPopup(() => {
- return this.WasteWaterPopup.$el
- }, {
- className: 's-map-popup',
- minWidth: 1000,
- closeButton: true,
- autoClose: false
- })
+ // marker.bindPopup(() => {
+ // return this.WasteWaterPopup.$el
+ // }, {
+ // className: 's-map-popup',
+ // minWidth: 1000,
+ // closeButton: true,
+ // autoClose: false
+ // })
// 鍒掕繃鍑虹幇 灞曠ず鏁版嵁
marker.bindTooltip(data[i].Name, {
permanent: true,
@@ -74,7 +75,7 @@
try {
// console.log(e)
this.EffectOfPulse(e.target.getLatLng())
- this.WasteWaterPopup.setDate(data[i])
+ this.WasteWaterPopup.setData(data[i])
return this.WasteWaterPopup.$el
} catch (error) {
console.log(error)
--
Gitblit v1.8.0