From 4a80ef5544ff210d9e0aaa4cb1eaf3dba8c39645 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 11:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 8038349..2431ff5 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -32,14 +32,14 @@
</div>
</el-form>
</div>
- <el-scrollbar style="height:380.44px;">
+ <el-scrollbar style="height:413px;">
<div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum==index?'hover':''">
<img class="state" :src="getImgSrc()" style="background: none"/>
<div>
<h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
<p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgcode }}</span>
<p>璁炬柦绫诲瀷锛�<span>{{ item.properties.teetype }}</span>
- <el-button v-if="fuShuSheShiShow" class="rt" size="mini" style="margin-right: 0.04rem" @click="btnAffiliatedFacilities(item,index)" >闄勫睘璁炬柦</el-button>
+ <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="btnAffiliatedFacilities(item,index)" >闄勫睘璁炬柦</el-button>
</p>
</div>
</div>
@@ -99,6 +99,7 @@
list: [],
items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
subItems: LayerPipeLines.layers,
+ pageSize: 10,
total: 0,
form: {
pipelineType: '绠＄嚎',
@@ -112,7 +113,8 @@
facilitiesParameter: null,
fuShuSheShiShow: true,
fuShuSheShiPanelShow: true,
- activeNum: -1
+ activeNum: -1,
+ wfsHelper: null
}
},
props: ['title'],
@@ -123,6 +125,10 @@
},
handleClick (tab, event) {
console.log(tab, event)
+ },
+ handlePage (page) {
+ this.wfsHelper.setPage(page)
+ this.handleSearch()
},
// 璁炬柦绫诲瀷绛涢��
handlePipelineType (val) {
@@ -142,14 +148,16 @@
async handleSearch () {
// console.log(this.form.dataType.sname, this.form.keyword)
this.list = []
- var wfsHelper = new WfsHelper()
+ this.wfsHelper.clearFilter()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- wfsHelper.addTypeName(this.form.dataType.sname)
- wfsHelper.addLike('name', this.form.keyword)
+ this.wfsHelper.setTypeName([this.form.dataType.typeName])
+ if (this.form.keyword) {
+ this.wfsHelper.addLike('name', this.form.keyword)
+ }
// const _this = this
- const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
- console.log(res)
+ 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
}
},
@@ -169,6 +177,9 @@
}
window.layerFactory.flyByFeature(val, this.form.dataType.code)
}
+ },
+ mounted () {
+ this.wfsHelper = new WfsHelper()
}
}
</script>
--
Gitblit v1.8.0