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/WmsLayerService.js | 98 ++++++++++++++++----------------
src/conf/layers/LayerPipeLines.js | 22 +++++--
src/components/LayerController/service/WfsLayerService.js | 25 +++----
3 files changed, 77 insertions(+), 68 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({
diff --git a/src/components/LayerController/service/WmsLayerService.js b/src/components/LayerController/service/WmsLayerService.js
index a303cc8..e102f0c 100644
--- a/src/components/LayerController/service/WmsLayerService.js
+++ b/src/components/LayerController/service/WmsLayerService.js
@@ -74,24 +74,25 @@
}
clickListener () {
- 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) {
+ 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()
- const params = Object.assign({
- LAYERS: this.layers.join(','),
- QUERY_LAYERS: this.layers.join(','),
- WIDTH: size.x,
- HEIGHT: size.y,
- X: Math.round(point.x),
- Y: Math.round(point.y),
- BBOX: this.map.getBounds().toBBoxString()
- }, this.params)
- AjaxUtils.get4JsonDataByUrl(PIPELINE_WMS, params, (res) => {
- const features = res.data.features
- /**
+ const params = Object.assign({
+ LAYERS: this.layers.join(','),
+ QUERY_LAYERS: this.layers.join(','),
+ WIDTH: size.x,
+ HEIGHT: size.y,
+ X: Math.round(point.x),
+ Y: Math.round(point.y),
+ BBOX: this.map.getBounds().toBBoxString()
+ }, this.params)
+ AjaxUtils.get4JsonDataByUrl(PIPELINE_WMS, params, (res) => {
+ const features = res.data.features
+ /**
* {
* title: 'New Tab',
* name: newTabName,
@@ -99,39 +100,40 @@
* }
* @type {*[]}
*/
- const popupDatas = []
- if (features) {
- for (var i = 0; i < features.length; i++) {
- const feature = features[i]
- const properties = feature.properties
- this.highlight(feature)
- // const coordinates = feature.geometry.coordinates
- popupDatas.push({
- title: properties.wellname || properties.devicename || properties.name,
- name: feature.id,
- content: properties
- })
+ const popupDatas = []
+ if (features) {
+ for (var i = 0; i < features.length; i++) {
+ const feature = features[i]
+ const properties = feature.properties
+ this.highlight(feature)
+ // const coordinates = feature.geometry.coordinates
+ popupDatas.push({
+ title: properties.wellname || properties.devicename || properties.name,
+ name: feature.id,
+ content: properties
+ })
+ }
}
- }
- if (popupDatas.length > 0) {
- var myIcon = this.L.divIcon({ className: 'my-div-icon' })
- this.L.marker(e.latlng, {
- icon: myIcon
- }).addTo(this.featureGroup)
- .bindPopup((layer) => {
- this.popupComp.setDatas(popupDatas)
- this.popupComp.setShow()
- return this.popupComp.$el
- }, {
- className: 's-map-popup',
- minWidth: 300,
- closeButton: false,
- autoClose: false
- })
- .openPopup()
- }
+ if (popupDatas.length > 0) {
+ var myIcon = this.L.divIcon({ className: 'my-div-icon' })
+ this.L.marker(e.latlng, {
+ icon: myIcon
+ }).addTo(this.featureGroup)
+ .bindPopup((layer) => {
+ this.popupComp.setDatas(popupDatas)
+ this.popupComp.setShow()
+ return this.popupComp.$el
+ }, {
+ className: 's-map-popup',
+ minWidth: 300,
+ closeButton: false,
+ autoClose: false
+ })
+ .openPopup()
+ }
+ })
})
- })
+ }
}
reverse (feature) {
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index a60e15b..bb746d9 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -32,7 +32,7 @@
},
{
code: 'accidentline',
- name: '浜嬫晠姘寸嚎',
+ name: '浜嬫晠姘�',
sname: '浜嬫晠姘�',
checked: false,
// wmsLayers: 'sewer:pipeline_accident',
@@ -42,7 +42,7 @@
},
{
code: 'oilline',
- name: '鍚补姹℃按绾�',
+ name: '鍚补姹℃按',
sname: '鍚补姹℃按',
checked: false,
type: 0,
@@ -57,7 +57,7 @@
},
{
code: 'saltline',
- name: '鍚洂姹℃按绾�',
+ name: '鍚洂姹℃按',
sname: '鍚洂姹℃按',
checked: false,
type: 0,
@@ -66,11 +66,21 @@
},
{
code: 'alkaliline',
- name: '鍚⒈姹℃按绾�',
+ name: '鍚⒈姹℃按',
sname: '鍚⒈姹℃按',
checked: false,
type: 0,
wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
+ minZoom: 10
+ },
+ {
+ code: 'sulfurline',
+ name: '鍚～姹℃按',
+ sname: '鍚～姹℃按',
+ checked: false,
+ type: 0,
+ wmsLayers: 'sewer:pipeline_sulfur',
+ // wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
minZoom: 10
},
{
@@ -84,7 +94,7 @@
},
{
code: 'purifyline',
- name: '鍑�鍖栨按绾�',
+ name: '鍑�鍖栨按',
sname: '鍑�鍖栨按',
checked: false,
type: 0,
@@ -93,7 +103,7 @@
},
{
code: 'loopline',
- name: '寰幆姘寸嚎',
+ name: '寰幆姘�',
sname: '寰幆姘�',
type: 0,
checked: false,
--
Gitblit v1.8.0