From b92a4b9486907f453463cd3a545a11ac7a629840 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期五, 21 五月 2021 14:39:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 1948348..69ca571 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -38,10 +38,9 @@
:class="activeNum===index?'hover':''">
<img class="state" :src="getImgSrc()" style="background: none"/>
<div>
- <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}
- {{item.properties.companyname }}</h3>
+ <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code }}</h3>
<p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{form.pipelineType}}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.type }}</span>
<el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
style="margin-right: 0.04rem;"
@click="btnAffiliatedFacilities(item,index)">
@@ -112,7 +111,6 @@
list: [],
// 鍥惧眰鎺у埗
items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
- subItems: LayerPipeLines.layers,
// 鍒嗛〉
pageSize: 10,
total: 0,
@@ -132,16 +130,18 @@
this.wfsHelper = new WfsHelper()
},
methods: {
+ subItems () {
+ const layers = LayerPipeLines.layers
+ console.log(layers)
+ const filtered = layers.filter(function (value, index, array) {
+ console.log(value)
+ return value.name !== '娴佸悜'
+ })
+ return filtered
+ },
// tab鍒囨崲
handleClick (tab, event) {
console.log(tab, event)
- if (tab.label === '鍒嗘瀽') {
- // 鍏抽棴寮圭獥
- window.mapManager.clickDialogSwitch = false
- } else {
- // 鎵撳紑寮圭獥
- window.mapManager.clickDialogSwitch = true
- }
},
// 鏍规嵁杩斿洖鏁版嵁 纭灞曠ず鍥剧墖
getImgSrc () {
@@ -174,11 +174,11 @@
this.list = []
this.wfsHelper.clearFilter()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- this.wfsHelper.setTypeName([this.form.dataType.typeName])
+ this.wfsHelper.setTypeName(['sewer:view_pipeline'])
if (this.form.keyword) {
this.wfsHelper.addLike('name', this.form.keyword)
- this.wfsHelper.setFilter(this.form.keyword)
}
+ this.wfsHelper.addEquals('type', '\'' + this.form.dataType.sname + '\'')
// const filter = this.form.dataType.filter
// if (filter) {
// this.wfsHelper.setFilter(filter)
@@ -189,6 +189,7 @@
this.total = res.totalFeatures
this.list = res.features
}
+ this.wfsHelper = new WfsHelper()
},
// 鐐瑰嚮鎼滅储鍒扮殑鏁版嵁 瀹炵幇鍔熻兘 = 瀹氫綅 楂樹寒 寮规
handleLocation (val, index) {
--
Gitblit v1.8.0