From aa01135a0d0ab6ba9d726826e71286d5ee52a14b Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 18:42:06 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/service/WmsLayerService.js | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/components/LayerController/service/WmsLayerService.js b/src/components/LayerController/service/WmsLayerService.js
index e102f0c..9e6d2f5 100644
--- a/src/components/LayerController/service/WmsLayerService.js
+++ b/src/components/LayerController/service/WmsLayerService.js
@@ -74,13 +74,13 @@
}
clickListener () {
- if (this.layers && this.layers.length > 0) {
- window.map.on('click', (e) => {
- this.featureGroup.clearLayers()
- var point = this.map.latLngToContainerPoint(e.latlng, this.map.getZoom())
- var size = this.map.getSize()
- // const bbox = this.L.latLngBounds(this.L.latLng(e.latlng.lng, e.latlng.lat)).toBBoxString()
+ window.map.on('click', (e) => {
+ this.featureGroup.clearLayers()
+ var point = this.map.latLngToContainerPoint(e.latlng, this.map.getZoom())
+ var size = this.map.getSize()
+ // const bbox = this.L.latLngBounds(this.L.latLng(e.latlng.lng, e.latlng.lat)).toBBoxString()
+ if (this.layers && this.layers.length > 0) {
const params = Object.assign({
LAYERS: this.layers.join(','),
QUERY_LAYERS: this.layers.join(','),
@@ -93,13 +93,13 @@
AjaxUtils.get4JsonDataByUrl(PIPELINE_WMS, params, (res) => {
const features = res.data.features
/**
- * {
- * title: 'New Tab',
- * name: newTabName,
- * content: 'New Tab content'
- * }
- * @type {*[]}
- */
+ * {
+ * title: 'New Tab',
+ * name: newTabName,
+ * content: 'New Tab content'
+ * }
+ * @type {*[]}
+ */
const popupDatas = []
if (features) {
for (var i = 0; i < features.length; i++) {
@@ -108,7 +108,7 @@
this.highlight(feature)
// const coordinates = feature.geometry.coordinates
popupDatas.push({
- title: properties.wellname || properties.devicename || properties.name,
+ title: properties.wellname || properties.devicename || properties.name || properties.pipename,
name: feature.id,
content: properties
})
@@ -132,8 +132,8 @@
.openPopup()
}
})
- })
- }
+ }
+ })
}
reverse (feature) {
@@ -154,7 +154,7 @@
highlight (feature) {
const type = feature.geometry.type
if (type === 'MultiLineString') {
- this.L.polyline(this.reverse(feature)).addTo(this.featureGroup)
+ this.L.polyline(this.reverse(feature), { color: 'red' }).addTo(this.featureGroup)
} else if (type === 'Point') {
var myIcon = this.L.divIcon({ className: 'my-div-icon' })
this.L.marker(feature.geometry.coordinates.reverse(), {
--
Gitblit v1.8.0