From dd48001d9793e5d338d38feebee5fc44e1296005 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 15:33:24 +0800
Subject: [PATCH] 公共弹框修改 固废内容修改
---
src/components/helpers/ServiceLayerHelper.js | 158 ++++++++++++++++++++++++++++------------------------
1 files changed, 84 insertions(+), 74 deletions(-)
diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index 567be72..c53ff99 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -26,11 +26,11 @@
getByLayerId (layerId) {
for (var k in this.layerArray) {
- var layer = this.layerArray[k]
- var geojson = layer.toGeoJSON()
- var features = geojson.features
- for (var j = 0; j < features.length; j++) {
- var feature = features[j]
+ var layerGroup = this.layerArray[k]
+ var layers = layerGroup.getLayers()
+ for (var m = 0; m < layers.length; m++) {
+ var layer = layers[m]
+ var feature = layer.feature
if (feature.id === layerId) {
return layer
}
@@ -39,6 +39,10 @@
return null
}
+ /**
+ * 鎺у埗鏄剧ず鐨勭骇鍒�
+ * @param layerConfig
+ */
initDisplayZoom (layerConfig) {
var that = this
that.map.on('zoomend ', function (e) {
@@ -130,7 +134,8 @@
that.layerArray[code] = layer
}
} else {
- that.layerArray[code].addTo(that.map)
+ var _layer = that.layerArray[code].addTo(that.map)
+ that.setZIndex(_layer)
}
}
@@ -139,11 +144,10 @@
* @param res
*/
loadGeojson (res, opt) {
- var that = this
var icon = opt.icon
- const featureGroup = that.L.featureGroup()
+ const featureGroup = this.L.featureGroup()
const featureList = []
- const geojson = that.L.geoJSON(res.features, {
+ const geojson = this.L.geoJSON(res.features, {
style: function (feature) {
return {
fill: styles.defaultLineStyle.fill,
@@ -156,8 +160,8 @@
dashSpeed: styles.defaultLineStyle.dashSpeed
}
},
- pointToLayer: function (geoJsonPoint, latlng) {
- return that.L.canvasMarker(latlng,
+ pointToLayer: (geoJsonPoint, latlng) => {
+ return this.L.canvasMarker(latlng,
{
img: {
// url: 'assets/images/map/marker-icon.png',
@@ -166,77 +170,83 @@
}
})
},
- onEachFeature: function (feature, layer) {
- console.log(feature)
- console.log(layer)
+ onEachFeature: (feature, layer) => {
featureList.push(layer)
- layer.addTo(featureGroup)
- }
- }).bindPopup(function (layer) {
- that.popupComp.setDatas(layer)
- that.popupComp.setShow()
- return that.popupComp.$el
- }, {
- className: 's-map-popup',
- minWidth: 300,
- closeButton: false,
- autoClose: false
- })
- .bindTooltip(function (layer) {
- const nameId = layer.feature.id
- let name = ''
- if (nameId.indexOf('涓夐��') !== -1 || nameId.indexOf('鍥涢��') !== -1 || nameId.indexOf('绐ㄤ簳') !== -1) {
- name = layer.feature.properties.pointnumber
- } else {
- name = layer.feature.properties.name
- }
- if (name === undefined) {
- name = ''
- }
- return name
- }, { direction: 'bottom', offset: [0, 15], sticky: true })
- .on('mouseover', function (e) {
- const layer = e.layer
- const type = e.layer.feature.geometry.type
- if (type === 'LineString' || type === 'MultiLineString') {
- layer.setStyle({ weight: 8, color: '#00ffff' })
- } else if (type === 'Point' || type === 'MultiPoint') {
- layer.setStyle({
- img: {
- url: '/assets/images/map/' + icon,
- size: [25, 25]
+ layer.bindPopup((layer) => {
+ this.popupComp.setDatas(layer)
+ this.popupComp.setShow()
+ return this.popupComp.$el
+ }, {
+ className: 's-map-popup',
+ minWidth: 300,
+ closeButton: false,
+ autoClose: false
+ })
+ .bindTooltip((layer) => {
+ const nameId = layer.feature.id
+ let name = ''
+ if (nameId.indexOf('涓夐��') !== -1 || nameId.indexOf('鍥涢��') !== -1 || nameId.indexOf('绐ㄤ簳') !== -1) {
+ name = layer.feature.properties.pointnumber
+ } else {
+ name = layer.feature.properties.name
}
- })
+ if (name === undefined) {
+ name = ''
+ }
+ return name
+ }, { direction: 'bottom', offset: [0, 15], sticky: true })
+ .on('mouseover', (e) => {
+ const type = e.target.feature.geometry.type
+ if (type === 'LineString' || type === 'MultiLineString') {
+ layer.setStyle({ weight: 8, color: '#00ffff' })
+ } else if (type === 'Point' || type === 'MultiPoint') {
+ layer.setStyle({
+ img: {
+ url: '/assets/images/map/' + icon,
+ size: [25, 25]
+ }
+ })
- layer.bringToFront()
- }
- }).on('mouseout', function (e) {
- const layer = e.layer
- const type = e.layer.feature.geometry.type
- if (type === 'LineString' || type === 'MultiLineString') {
- layer.setStyle({ weight: styles.defaultLineStyle.weight, color: styles.defaultLineStyle.color })
- }
- if (type === 'Point' || type === 'MultiPoint') {
- layer.setStyle({
- img: {
- url: '/assets/images/map/' + icon,
- size: styles.defaultLineStyle.size
+ layer.bringToFront()
}
- })
- }
- // }).addTo(that.map)
- // }).addTo(featureGroup)
- })
+ }).on('mouseout', (e) => {
+ const type = e.target.feature.geometry.type
+ if (type === 'LineString' || type === 'MultiLineString') {
+ layer.setStyle({ weight: styles.defaultLineStyle.weight, color: styles.defaultLineStyle.color })
+ }
+ if (type === 'Point' || type === 'MultiPoint') {
+ layer.setStyle({
+ img: {
+ url: '/assets/images/map/' + icon,
+ size: styles.defaultLineStyle.size
+ }
+ })
+ }
+ }).addTo(featureGroup)
+ }
+ })
store.commit('addSewersDatas', geojson)
- if (Object.prototype.hasOwnProperty.call(res, 'features') && res.features.length > 0 && (res.features[0].geometry.type === 'LineString' || res.features[0].geometry.type === 'MultiLineString')) {
- geojson.bringToBack()
- } else {
- geojson.bringToFront()
- }
- featureGroup.addTo(that.map)
+ featureGroup.addTo(this.map)
+ this.setZIndex(featureGroup)
return featureGroup
}
+ /**
+ * 璁剧疆index,绾垮湪鏈�涓嬮潰锛岀偣鍦ㄤ笂闈�
+ * @param layerGroup 鍥惧眰缁�
+ */
+ setZIndex (layerGroup) {
+ var layers = layerGroup.getLayers()
+ if (layers.length > 0) {
+ var layer = layers[0]
+ if (layer.feature && (layer.feature.geometry.type === 'LineString' || layer.feature.geometry.type === 'MultiLineString')) {
+ layerGroup.bringToBack()
+ } else {
+ layerGroup.bringToFront()
+ }
+ }
+ }
+
removeLayer (item) {
var layer = this.layerArray[item.code]
layer && this.map.removeLayer(layer)
--
Gitblit v1.8.0