From 70fd7ce1af45948ab2080d2036d345fd3b4c15a6 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 17:55:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/service/WfsLayerService.js | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/components/LayerController/service/WfsLayerService.js b/src/components/LayerController/service/WfsLayerService.js
index 5bc5a9f..b139a63 100644
--- a/src/components/LayerController/service/WfsLayerService.js
+++ b/src/components/LayerController/service/WfsLayerService.js
@@ -63,8 +63,15 @@
})
},
onEachFeature: (feature, layer) => {
+ const popupDatas = []
+ const properties = feature.properties
+ popupDatas.push({
+ title: properties.wellname || properties.devicename || properties.name,
+ name: feature.id,
+ content: properties
+ })
layer.bindPopup((layer) => {
- this.popupComp.setDatas(layer)
+ this.popupComp.setDatas(popupDatas)
this.popupComp.setShow()
return this.popupComp.$el
}, {
@@ -73,11 +80,7 @@
closeButton: false,
autoClose: false
})
- layer.bindTooltip((layer) => this.tooltipListener(layer), {
- direction: 'bottom',
- offset: [0, 15],
- sticky: true
- })
+ .bindTooltip((layer) => this.tooltipListener(layer), { direction: 'bottom', offset: [0, 15], sticky: true })
.on('mouseover', (e) => this.mouseOverListener(e, layer)).on('mouseout', (e) => this.mouseOutListener(e, layer))
}
}).addTo(this.layer)
@@ -89,10 +92,7 @@
const icon = this.config.icon
const type = e.target.feature.geometry.type
if (type === 'LineString' || type === 'MultiLineString') {
- layer.setStyle({
- weight: 8,
- color: '#00ffff'
- })
+ layer.setStyle({ weight: 8, color: '#00ffff' })
} else if (type === 'Point' || type === 'MultiPoint') {
layer.setStyle({
img: {
@@ -108,10 +108,7 @@
const icon = this.config.icon
const type = e.target.feature.geometry.type
if (type === 'LineString' || type === 'MultiLineString') {
- layer.setStyle({
- weight: STYLES.WEIGHT,
- color: STYLES.COLOR
- })
+ layer.setStyle({ weight: STYLES.WEIGHT, color: STYLES.COLOR })
}
if (type === 'Point' || type === 'MultiPoint') {
layer.setStyle({
--
Gitblit v1.8.0