From 181c63668c5d81002fa2dd4f5312318cf81f2180 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 29 三月 2021 15:50:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/flueGas/flueGas.js | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/components/flueGas/flueGas.js b/src/components/flueGas/flueGas.js
index eef18b1..e192167 100644
--- a/src/components/flueGas/flueGas.js
+++ b/src/components/flueGas/flueGas.js
@@ -55,16 +55,16 @@
// // 绾�
// var polyline = this.L.polyline(latlngs, { color: 'red' }).addTo(this.map)
// console.log(polyline)
- marker.bindPopup(() => {
- return this.FlueGasPopup.$el
- }, {
- className: 's-map-popup',
- minWidth: 1548,
- closeButton: true,
- autoClose: false
- })
+ // marker.bindPopup(() => {
+ // return this.FlueGasPopup.$el
+ // }, {
+ // className: 's-map-popup',
+ // minWidth: 1548,
+ // closeButton: true,
+ // autoClose: false
+ // })
// 鍒掕繃鍑虹幇 灞曠ず鏁版嵁
- marker.bindTooltip(data[i].StoragePlaceName, {
+ marker.bindTooltip(data[i].porltName, {
permanent: true,
offset: [0, -16],
direction: 'top',
@@ -75,7 +75,9 @@
try {
// console.log(e)
this.EffectOfPulse(e.target.getLatLng())
- this.FlueGasPopup.setDate(data[i])
+ this.FlueGasPopup.setData(data[i])
+ // this.FlueGasPopup.setData(data[i])
+ return this.FlueGasPopup.$el
} catch (error) {
console.log(error)
}
@@ -116,7 +118,7 @@
// 鑴夊啿鏁堟灉璁剧疆瀹炵幇
EffectOfPulse (position, markers, layerGroup) {
// // 鍖哄垎鐩存帴鎵ц 鍜屽垽鏂墽琛岀殑涓嶅悓鍖哄埆
- let differentColor = ''
+ var differentColor = ''
if (markers) {
differentColor = '#ff0000'
} else {
--
Gitblit v1.8.0