From 2a99c0727f88565eb2b8c0beeb609618413ff3b0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 09:45:45 +0800
Subject: [PATCH] 文件整合，重新分弹框
---
src/components/BaseNav/WasteWater/WasteWater.js | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/components/BaseNav/WasteWater.js b/src/components/BaseNav/WasteWater/WasteWater.js
similarity index 90%
rename from src/components/BaseNav/WasteWater.js
rename to src/components/BaseNav/WasteWater/WasteWater.js
index 4a3e2f4..af1d4fb 100644
--- a/src/components/BaseNav/WasteWater.js
+++ b/src/components/BaseNav/WasteWater/WasteWater.js
@@ -1,7 +1,7 @@
import { requestWasteWater } 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/Waste-water/fs_green.png'
+import Setting from '@assets/images/map-pages/basenav/Waste-water/fs_yellow.png'
// 搴曞浘涓氬姟灞曠ず鐐�
class AddWasteWaterHelper {
@@ -19,7 +19,7 @@
requestData () {
requestWasteWater().then(res => {
this.DrawTheWasteWaterContent(res.Result.DataInfo)
- console.log(res)
+ // console.log(res)
}).catch(err => {
console.log(err)
})
@@ -51,13 +51,13 @@
const Icon = new WasteWaterIcon({ iconUrl: iconUrl })
// let url = Icon.options.iconUrl
- const marker = this.L.marker([positionX, positionY], { icon: Icon })
+ const marker = this.L.marker.magic([positionX, positionY], { icon: Icon, magic: 'vanishIn' })
marker.bindPopup(() => {
return this.WasteWaterPopup.$el
}, {
className: 's-map-popup',
- minWidth: 600,
+ minWidth: 1000,
closeButton: true,
autoClose: false
})
@@ -68,7 +68,7 @@
direction: 'top',
className: ''
})
- // 鐐瑰嚮 浜嬩欢
+ // 鐐瑰嚮浜嬩欢
marker.on('click', (e) => {
try {
// console.log(e)
@@ -84,7 +84,7 @@
}
}
- // 鍥哄簾鐐瑰嚮杩涜鐨� 鍐呭鐨勮缃�
+ // 搴熸按鎸夐挳鐐瑰嚮杩涜鐨� 鍐呭鐨勮缃�
SetWasteWaterContent (config, containerPopup) {
this.WasteWaterPopup = containerPopup
}
@@ -127,9 +127,9 @@
} : position
// 鎻掍欢 鏁堟灉瀹炵幇
const pulsingIcon = this.L.icon.pulse({
- iconSize: [20, 20],
+ iconSize: [20, 20], // 鎺у埗鍏夊湀澶у皬
color: differentColor,
- fillColor: ''
+ fillColor: ' '
})
if (markers) {
// markers.push(this.L.marker(FinalPosition, { icon: pulsingIcon }))
@@ -156,7 +156,7 @@
}, 1000)
}
- // 娓呴櫎 鍥惧眰
+ // 鍦ㄦ墽琛屼笅涓墠娓呴櫎宸插瓨鍦ㄥ浘灞�
pulseClear (pulseinterver) {
clearInterval(pulseinterver)
pulseinterver = null
--
Gitblit v1.8.0