From 003ec8342f446b977e3674940a1c2f2867ad861c Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 15:35:13 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/SolidWaste/SolidWaste.js | 83 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/src/components/BaseNav/SolidWaste/SolidWaste.js b/src/components/BaseNav/SolidWaste/SolidWaste.js
index 54107a5..8babe45 100644
--- a/src/components/BaseNav/SolidWaste/SolidWaste.js
+++ b/src/components/BaseNav/SolidWaste/SolidWaste.js
@@ -1,7 +1,8 @@
import { QueryStoragePlaceListByCompanyAndName } from '@/api/request'
// 灞曠ず鍥剧墖
-import defaultImg from '@assets/images/map-pages/basenav/solidwaste/voc.png'
-import Setting from '@assets/images/map-pages/basenav/solidwaste/gf_green.png'
+
+import defaultImg from '../../../../public/assets/images/map/solidwaste/voc.png'
+import setting from '../../../../public/assets/images/map/solidwaste/gf_green.png'
// 搴曞浘涓氬姟灞曠ず鐐�
class AddSolidWasteHelper {
@@ -52,20 +53,20 @@
// var url = Icon.options.iconUrl
const marker = this.L.marker([positionX, positionY], { icon: Icon })
-
// 鍒掕繃鍑虹幇 灞曠ず鏁版嵁
marker.bindTooltip(data[i].Name, {
permanent: true,
- offset: [0, 16],
- direction: 'bottom',
+ offset: [0, -16],
+ direction: 'top',
className: ''
})
// 鐐瑰嚮 浜嬩欢
marker.on('click', (e) => {
try {
- console.log(e)
+ // console.log(e)
+ this.setPanTo(e.target.getLatLng(), 200)
this.EffectOfPulse(e.target.getLatLng())
- this.SolidWastePopup.setData(data[i])
+ this.SolidWastePopup.setData(data[i], 'gufei')
return this.SolidWastePopup.$el
} catch (error) {
console.log(error)
@@ -75,6 +76,17 @@
this.SolidWasteLayerGroup.addLayer(marker)
}
}
+ }
+
+ // panTo
+ setPanTo (pos, value) {
+ var position = pos
+ position = this.map.latLngToLayerPoint(position)
+ position.y += value
+ position = this.map.layerPointToLatLng(position)
+ // this.map.setView(position)
+ this.map.flyTo(position)
+ // this.map.panTo(position)
}
// 鍥哄簾鐐瑰嚮杩涜鐨� 鍐呭鐨勮缃�
@@ -99,40 +111,40 @@
EffectOfChange = defaultImg
this.EffectOfPulse(position, this.solidWasteMarkersLabels, this.SolidWasteLayerGroup)
} else {
- EffectOfChange = Setting
+ EffectOfChange = setting
}
return EffectOfChange
}
// 鑴夊啿鏁堟灉璁剧疆瀹炵幇
EffectOfPulse (position, markers, layerGroup) {
- // // 鍖哄垎鐩存帴鎵ц 鍜屽垽鏂墽琛岀殑涓嶅悓鍖哄埆
- var differentColor = ''
- if (markers) {
- differentColor = '#ff0000'
- } else {
- differentColor = '#98FB98'
- }
- // 鍧愭爣鏁版嵁锛氭姤璀︿紶杩涙潵鐨勬槸鏁扮粍 / 鐐瑰嚮浼犺繘鏉ョ殑鏄痮bject
- var FinalPosition = position instanceof Array ? {
- lat: position[0],
- lng: position[1]
- } : position
- // 鎻掍欢 鏁堟灉瀹炵幇
- var pulsingIcon = this.L.icon.pulse({
- iconSize: [20, 20],
- color: differentColor,
- fillColor: ''
- })
- if (markers) {
- // markers.push(this.L.marker(FinalPosition, { icon: pulsingIcon }))
- // this.L.layerGroup(markers).addLayer(layerGroup)
- } else {
- var picGroupMarker = new this.L.FeatureGroup()
- this.L.marker(FinalPosition, { icon: pulsingIcon }).addTo(picGroupMarker)
- this.pulseHeighLightMarker = picGroupMarker.addTo(this.SolidWasteLayerGroup)
- this.PulseCountSetting()
- }
+ // 鍖哄垎鐩存帴鎵ц 鍜屽垽鏂墽琛岀殑涓嶅悓鍖哄埆
+ // var differentColor = ''
+ // if (markers) {
+ // differentColor = '#ff0000'
+ // } else {
+ // differentColor = '#98FB98'
+ // }
+ // // 鍧愭爣鏁版嵁锛氭姤璀︿紶杩涙潵鐨勬槸鏁扮粍 / 鐐瑰嚮浼犺繘鏉ョ殑鏄痮bject
+ // var FinalPosition = position instanceof Array ? {
+ // lat: position[0],
+ // lng: position[1]
+ // } : position
+ // // 鎻掍欢 鏁堟灉瀹炵幇
+ // var pulsingIcon = this.L.icon.pulse({
+ // iconSize: [20, 20],
+ // color: differentColor,
+ // fillColor: ''
+ // })
+ // if (markers) {
+ // // markers.push(this.L.marker(FinalPosition, { icon: pulsingIcon }))
+ // // this.L.layerGroup(markers).addLayer(layerGroup)
+ // } else {
+ // var picGroupMarker = new this.L.FeatureGroup()
+ // this.L.marker(FinalPosition, { icon: pulsingIcon }).addTo(picGroupMarker)
+ // this.pulseHeighLightMarker = picGroupMarker.addTo(this.SolidWasteLayerGroup)
+ // this.PulseCountSetting()
+ // }
}
// 瀵瑰浘鏍囪剦鍐� 杩涜set璁剧疆 // 楂樹寒鍥惧眰
@@ -140,7 +152,6 @@
var HeightLightTime = 5
var PulseNumber = 5
const pulseinterver = setInterval((e) => {
- console.log(e)
if (PulseNumber > 0) {
PulseNumber--
} else {
--
Gitblit v1.8.0