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/SolidWaste/SolidWaste.js | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/components/BaseNav/SolidWaste/SolidWaste.js b/src/components/BaseNav/SolidWaste/SolidWaste.js
index 6df5e3e..7cedfa6 100644
--- a/src/components/BaseNav/SolidWaste/SolidWaste.js
+++ b/src/components/BaseNav/SolidWaste/SolidWaste.js
@@ -67,9 +67,9 @@
// console.log(this.map.setCenter([e.target.getLatLng().lat, e.target.getLatLng().lng]))
// this.map.flyTo([e.target.getLatLng().lat, e.target.getLatLng().lng])
// this.map.panTo([e.target.getLatLng().lat, e.target.getLatLng().lng], 100)
- this.setPanTo(e.target.getLatLng(), 30)
+ this.setPanTo(e.target.getLatLng(), 250)
this.EffectOfPulse(e.target.getLatLng())
- this.SolidWastePopup.setData(data[i], 'gufei')
+ // this.SolidWastePopup.setData(data[i], 'gufei')
return this.SolidWastePopup.$el
} catch (error) {
console.log(error)
@@ -87,8 +87,9 @@
position = this.map.latLngToLayerPoint(position)
position.y += value
position = this.map.layerPointToLatLng(position)
- this.map.setView(position)
- // this.map.flyTo(position)
+ // this.map.setView(position)
+ this.map.flyTo(position)
+ // this.map.panTo(position)
}
// 鍥哄簾鐐瑰嚮杩涜鐨� 鍐呭鐨勮缃�
@@ -121,32 +122,32 @@
// 鑴夊啿鏁堟灉璁剧疆瀹炵幇
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璁剧疆 // 楂樹寒鍥惧眰
--
Gitblit v1.8.0