From 23cbd5155a69311bc5ac5bee3aa4d9b2612199bb Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 13:56:01 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 2 +-
src/conf/layers/LayerPipeLines.js | 6 +++++-
src/components/LayerController/service/WfsLayerService.js | 5 ++++-
src/components/panel/ToolBoxPanel.vue | 6 +++---
src/components/LayerController/modules/LcServiceLayerFilter.vue | 7 +++----
src/components/panel/LegendPanel.vue | 18 ++++++++++++------
src/components/LayerController/LayerController.vue | 6 +++---
src/conf/layers/LayerSewers.js | 8 ++++----
8 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index 2fa037c..7476f09 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -2,12 +2,12 @@
<div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
<div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style=" position: absolute;top:0;left: 0;">
<img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon">
- <span class="icon-name">鍥惧眰</span>
+<!-- <span class="icon-name">鍥惧眰</span>-->
</div>
<transition name="animationChange">
<div :class="'legend-content map-background'" v-show="layerControllerVisible">
<lc-service-layer></lc-service-layer>
- <buttom @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></buttom>
+ <button @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></button>
</div>
</transition>
</div>
@@ -247,7 +247,7 @@
background:@background-color;
}
.legend-content{
- width: 1.79167rem;
+ width: 2.2rem;
}
}
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index ffc77a5..92ec212 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -77,9 +77,9 @@
swSubFilter (url, item) {
item.checked = !item.checked
if (item.checked) {
- window.serviceLayerHelper.loadGeojsonLayer(url, item)
+ window.layerFactory.show(item)
} else {
- window.serviceLayerHelper.removeLayer(item)
+ window.layerFactory.hide(item)
}
// window.serviceLayerHelper.loadLayers()
}
@@ -99,12 +99,11 @@
<style scoped lang="less">
.inner-panel {
- width: 500px;
color: #90c8e0;
font-size: 13px;
position: absolute;
- left: 260px;
+ left: 270px;
z-index: 1000;
height: 220px;
top: 0;
diff --git a/src/components/LayerController/service/WfsLayerService.js b/src/components/LayerController/service/WfsLayerService.js
index 7f10aee..3aae541 100644
--- a/src/components/LayerController/service/WfsLayerService.js
+++ b/src/components/LayerController/service/WfsLayerService.js
@@ -29,7 +29,10 @@
}
loadData (wfsUrl) {
- AjaxUtils.get4JsonDataByUrl(wfsUrl, this.params, (res) => this.draw(res.data.features))
+ AjaxUtils.get4JsonDataByUrl(wfsUrl, this.params, (res) => {
+ console.log(res)
+ this.draw(res.data.features)
+ })
}
draw (features) {
diff --git a/src/components/panel/LegendPanel.vue b/src/components/panel/LegendPanel.vue
index b3c4784..fe6d347 100644
--- a/src/components/panel/LegendPanel.vue
+++ b/src/components/panel/LegendPanel.vue
@@ -23,17 +23,23 @@
</div>
</template>
<script>
+import { LayerWasteWater } from '../../conf/layers/LayerWasteWater'
+import { LayerWasteGas } from '../../conf/layers/LayerWasteGas'
+import { LayerWasteSolid } from '../../conf/layers/LayerWasteSolid'
+import { LayerAirQuality } from '../../conf/layers/LayerAirQuality'
+import { LayerEnvRisk } from '../../conf/layers/LayerEnvRisk'
+import { LayerSoilGroundWater } from '../../conf/layers/LayerSoilGroundWater'
+import { LayerPipeLines } from '../../conf/layers/LayerPipeLines'
+import { LayerPk } from '../../conf/layers/LayerPk'
+import { LayerArea } from '../../conf/layers/LayerArea'
+
export default {
name: 'LegendPanel',
data () {
return {
// 鎺у埗鍥句緥 鍐呭鐨� 鏄剧ず/闅愯棌
- legendControl: false
- }
- },
- computed: {
- serviceLayers () {
- return this.$store.state.map.serviceLayers.LayerSewersLine
+ legendControl: false,
+ serviceLayers: [LayerSoilGroundWater, LayerEnvRisk, LayerAirQuality, LayerWasteSolid, LayerWasteGas, LayerWasteWater, LayerArea, LayerPk, LayerPipeLines]
}
},
methods: {
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index e309125..a2cdb5f 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -7,7 +7,7 @@
<div class="container">
<ul>
<li style="text-align: right">
- <buttom type="button" class="el-button special-button el-button--default el-icon-d-arrow-right"></buttom>
+ <button type="button" class="el-button special-button el-button--default el-icon-d-arrow-right"></button>
</li>
</ul>
<ul v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" >
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index ce0c138..f42d6d9 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -3,7 +3,7 @@
<div class="specific-tools">
<el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice" @click.enter.native="changeSelectMouse">
<img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
- <span class="span-default">宸ュ叿</span>
+ <!--<span class="span-default">宸ュ叿</span>-->
</el-button>
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
@@ -20,8 +20,8 @@
@click.native="changeChoose(index)">
<img :src="item.iconSelecd" alt="" v-if="active === index"/>
<img :src="item.icon" alt="" v-else/>
- <span v-if="active === index">{{ item.label }}</span>
- <span v-else class="default-span">{{ item.label }}</span>
+ <!--<span v-if="active === index">{{ item.label }}</span>
+ <span v-else class="default-span">{{ item.label }}</span>-->
</el-button>
<el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
v-show="item.index!=='2'">
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 4209ddc..5ea2a19 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -1,6 +1,9 @@
/**
* 绠＄綉
*/
+import { LayerHbss } from './LayerHbss'
+import { LayerFsss } from './LayerFsss'
+
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
@@ -8,6 +11,7 @@
code: 'sewersPipeLines',
name: '绠＄嚎',
checked: true,
+ childLayer: [LayerFsss, LayerHbss],
layers: [
{
code: 'rainline',
@@ -15,7 +19,7 @@
sname: '闆ㄦ按绾�',
checked: true,
wfs: WFS_URL + '?TYPENAME=绠＄綉',
- minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+ minZoom: 10
},
{
code: 'accidentline',
diff --git a/src/conf/layers/LayerSewers.js b/src/conf/layers/LayerSewers.js
index c61b00a..433b67d 100644
--- a/src/conf/layers/LayerSewers.js
+++ b/src/conf/layers/LayerSewers.js
@@ -103,7 +103,7 @@
export const LayerSewersPoint = [
{
- code: 'fsss',
+ code: 'sewersFsss',
name: '闄勫睘璁炬柦',
checked: false, // 榛樿閫変腑鐘舵��
type: 'geojson',
@@ -171,7 +171,7 @@
]
},
{
- code: 'hbss',
+ code: 'sewersHbss',
name: '鐜繚璁炬柦',
checked: false, // 榛樿閫変腑鐘舵��
type: 'geojson',
@@ -233,7 +233,7 @@
]
},
{
- code: 'pk',
+ code: 'sewersPk',
name: '鎺掑彛',
checked: false, // 榛樿閫変腑鐘舵��
type: 'geojson',
@@ -249,7 +249,7 @@
]
},
{
- code: 'qyxx',
+ code: 'sewersQyxx',
name: '鍖哄煙淇℃伅',
checked: false, // 榛樿閫変腑鐘舵��
type: 'geojson',
--
Gitblit v1.8.0