From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 40677f1..3976569 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)">
@@ -137,10 +136,10 @@
console.log(tab, event)
if (tab.label === '鍒嗘瀽') {
// 鍏抽棴寮圭獥
- window.layerFactory.clickSwitch = false
+ window.mapManager.clickDialogSwitch = false
} else {
// 鎵撳紑寮圭獥
- window.layerFactory.clickSwitch = true
+ window.mapManager.clickDialogSwitch = true
}
},
// 鏍规嵁杩斿洖鏁版嵁 纭灞曠ず鍥剧墖
@@ -174,17 +173,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)
}
+ 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(), {})
- console.log(res)
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