From 17ba6febdaacf7563f7688bae473a4a89e914ff5 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 16:04:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/flueGas/flueGas.js | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/components/flueGas/flueGas.js b/src/components/flueGas/flueGas.js
index ab62d6a..6ea7391 100644
--- a/src/components/flueGas/flueGas.js
+++ b/src/components/flueGas/flueGas.js
@@ -15,8 +15,8 @@
}
// 鑾峰彇鏁版嵁
- requestData () {
- FlueGas().then(res => {
+ requestData (data) {
+ FlueGas(data).then(res => {
console.log(res)
this.DrawFlueGasContent(res.Result.DataInfo)
}).catch(err => {
@@ -35,8 +35,8 @@
}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
- const positionX = data[i].positionX
- const positionY = data[i].positionY
+ const positionX = data[i].Latitude
+ const positionY = data[i].Longitude
// 鍒ゆ柇 缁忕含搴︿綅缃俊鎭槸鍚﹀瓨鍦�
// if (positionX != null && positionY != null) {
@@ -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',
@@ -73,9 +73,10 @@
// 鐐瑰嚮 浜嬩欢
marker.on('click', (e) => {
try {
- // console.log(e)
+ console.log(e)
this.EffectOfPulse(e.target.getLatLng())
- this.FlueGasPopup.setDate(data[i])
+ this.FlueGasPopup.setData(data[i])
+ return this.FlueGasPopup.$el
} catch (error) {
console.log(error)
}
@@ -116,7 +117,7 @@
// 鑴夊啿鏁堟灉璁剧疆瀹炵幇
EffectOfPulse (position, markers, layerGroup) {
// // 鍖哄垎鐩存帴鎵ц 鍜屽垽鏂墽琛岀殑涓嶅悓鍖哄埆
- var differentColor = ''
+ let differentColor = ''
if (markers) {
differentColor = '#ff0000'
} else {
--
Gitblit v1.8.0