From e2bf4ab5fbcc29209d74101d99c0690d4ffbe234 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 21 五月 2021 17:14:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index ce3356e..c86da0d 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -6,7 +6,7 @@
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ <el-select style="width: 100%" v-model="form.pipelineType"
:popper-class="'select-down'">
<el-option
v-for="item in items"
@@ -38,10 +38,10 @@
: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 +112,6 @@
list: [],
// 鍥惧眰鎺у埗
items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
- subItems: LayerPipeLines.layers,
// 鍒嗛〉
pageSize: 10,
total: 0,
@@ -126,6 +125,20 @@
fuShuSheShiShow: true,
activeNum: -1,
wfsHelper: null
+ }
+ },
+ computed: {
+ subItems () {
+ const val = this.form.pipelineType
+ for (let i = 0; i < this.items.length; i++) {
+ const item = this.items[i]
+ if (val === item.name) {
+ return item.layers.filter(function (value, index, array) {
+ return value.name !== '娴佸悜'
+ })
+ }
+ }
+ return []
}
},
mounted () {
@@ -153,17 +166,6 @@
this.wfsHelper.setPage(page)
this.handleSearch()
},
- // 璁炬柦绫诲瀷绛涢��
- handlePipelineType (val) {
- this.list = []
- for (let i = 0; i < this.items.length; i++) {
- const item = this.items[i]
- if (val === item.name) {
- this.subItems = item.layers
- return
- }
- }
- },
// 浜岀骇form琛ㄥ崟鍒囨崲閫夋嫨娓呯┖宸查�夋嫨鏁版嵁
handleDataType () {
this.list = []
@@ -174,20 +176,22 @@
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)
}
- const filter = this.form.dataType.filter
- if (filter) {
- this.wfsHelper.setFilter(filter)
- }
+ this.wfsHelper.addEquals('type', '\'' + this.form.dataType.sname + '\'')
+ // const filter = this.form.dataType.filter
+ // if (filter) {
+ // this.wfsHelper.setFilter(filter)
+ // }
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.total = res.totalFeatures
this.list = res.features
}
+ this.wfsHelper = new WfsHelper()
},
// 鐐瑰嚮鎼滅储鍒扮殑鏁版嵁 瀹炵幇鍔熻兘 = 瀹氫綅 楂樹寒 寮规
handleLocation (val, index) {
--
Gitblit v1.8.0