From fb3ed04d97a50b48717be11f37af41da08fd6062 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 09:51:53 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/service/WfsLayerService.js | 5 +-
src/assets/css/map/map-panel-style.less | 2
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 2
src/conf/MapConfig.js | 4 -
src/components/LayerController/service/LayerFactory.js | 44 ++++++++++++++--------
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 4 +
6 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 17257c8..5c5a3a9 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -335,6 +335,7 @@
/*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/
.el-table{
+ border-bottom: 1px solid #fff;
.el-table__body-wrapper::-webkit-scrollbar {
width: 0;
height: 0;
@@ -353,7 +354,6 @@
.el-table--border th{
border-right: none;
border-left: 1px solid #ddd;
-
}
.el-table--border th.gutter{border-left: none}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 6e5a7da..e37dbec 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -56,7 +56,7 @@
center
v-dialogDrag
>
- <div class="el-dialog-div" style="height: 500px">
+ <div class="el-dialog-div">
<public-detailed-list v-bind="$attrs"></public-detailed-list>
</div>
</el-dialog>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 7c0ce24..077bf5f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,6 +1,6 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="600px" border>
+ <el-table :data="tableData" max-height="600px" border >
<el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
<el-table-column label="姘哀鍖栫墿">
<el-table-column prop="MonQty" width="70">
@@ -77,5 +77,7 @@
<style scoped>
.PublicDetailedList{
/*height: 100%*/
+ .gutter{display: none !important;width: 0 !important}
}
+
</style>
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index d12719b..b617ae5 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -11,13 +11,17 @@
init (layerConfig) {
// 1. 閬嶅巻layer config
- for (var i = 0, l = layerConfig.length; i < l; i++) {
- var config = layerConfig[i]
- var layers = config.layers
- layers && this.init(config.layers)
+ if (layerConfig) {
+ for (var i = 0, l = layerConfig.length; i < l; i++) {
+ var config = layerConfig[i]
+ var layers = config.layers
+ var childLayer = config.childLayer
+ layers && this.init(config.layers)
+ childLayer && this.init(config.childLayer)
- var checked = config.checked
- checked && this.load(config)
+ var checked = config.checked
+ checked && this.load(config)
+ }
}
}
@@ -72,17 +76,25 @@
}
/**
- * 璁剧疆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()
+ * todo 杩欓噷鏃犳晥锛岃矊浼兼槸鍥犱负geojson鍔犺浇鍒板湴鍥句篃鏄釜layergroup
+ *
+ * 璁剧疆index,绾垮湪鏈�涓嬮潰锛岀偣鍦ㄤ笂闈�
+ * @param layerGroup 鍥惧眰缁�
+ */
+ setZIndex (layer) {
+ if (Array.isArray(layer)) {
+ for (var i = 0; i < layer.length; i++) {
+ this.setZIndex(layer[i])
+ }
+ } else {
+ if (layer.getLayers) {
+ this.setZIndex(layer.getLayers())
} else {
- layerGroup.bringToFront()
+ if (layer.feature && (layer.feature.geometry.type === 'LineString' || layer.feature.geometry.type === 'MultiLineString')) {
+ layer.bringToBack()
+ } else {
+ layer.bringToFront()
+ }
}
}
}
diff --git a/src/components/LayerController/service/WfsLayerService.js b/src/components/LayerController/service/WfsLayerService.js
index b263e46..f00eaeb 100644
--- a/src/components/LayerController/service/WfsLayerService.js
+++ b/src/components/LayerController/service/WfsLayerService.js
@@ -1,7 +1,6 @@
/**
* 鍔犺浇涓氬姟鏁版嵁鍥惧眰
*/
-
import { STYLES } from '../../../conf/Constants'
import AjaxUtils from '../../../utils/AjaxUtils'
@@ -30,14 +29,13 @@
loadData (wfsUrl) {
AjaxUtils.get4JsonDataByUrl(wfsUrl, this.params, (res) => {
- console.log(res)
this.draw(res.data.features)
})
}
draw (features) {
const icon = this.config.icon
- this.L.geoJSON(features, {
+ const geojsonLayer = this.L.geoJSON(features, {
style: function (feature) {
return {
fill: STYLES.FILL,
@@ -75,6 +73,7 @@
.on('mouseover', (e) => this.mouseOverListener(e, layer)).on('mouseout', (e) => this.mouseOutListener(e, layer))
}
}).addTo(this.layer)
+ window.layerFactory.setZIndex(geojsonLayer)
}
mouseOverListener (e, layer) {
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index a89c954..6e6ea34 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,6 +1,5 @@
锘縤mport * as L from 'leaflet'
import TDT from './TDT'
-import { LayerSewersPoint } from './layers/LayerSewers'
import { LayerTopic } from './LayerTopic'
import { LayerBasin } from './layers/LayerBasin'
@@ -42,8 +41,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerBasin, LayerTopic],
- layerSewersPoint: LayerSewersPoint
+ LayerSewersLine: [LayerBasin, LayerTopic]
} // 姹￠洦姘村浘灞傞厤缃�
}
--
Gitblit v1.8.0