From f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 11:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 706f5e2..ad48f87 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)" >闄勫睘璁炬柦</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>
@@ -51,7 +51,6 @@
:page-size=pageSize
layout="prev, pager, next"
:total=total
- :current-page=current
class="warnPagination"
>
</el-pagination>
@@ -65,7 +64,7 @@
</el-tab-pane>
</el-tabs>
<!-- 闄勫睘璁炬柦闈㈡澘 -->
- <affiliated-facilities :facilitiesParameter="facilitiesParameter" :fuShuSheShiSubItems="fuShuSheShiSubItems" ></affiliated-facilities>
+ <affiliated-facilities :facilitiesParameter="facilitiesParameter" v-if="fuShuSheShiShow" ></affiliated-facilities>
</div>
</template>
@@ -99,9 +98,10 @@
list: [],
items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
subItems: LayerPipeLines.layers,
+ pageSize: 10,
total: 0,
form: {
- pipelineType: '绠＄綉',
+ pipelineType: '绠＄嚎',
dataType: '',
keyword: ''
},
@@ -110,9 +110,10 @@
isWaybillHover: true,
isRouteHover: false,
facilitiesParameter: null,
- // fuShuSheShiShow: false,
-
- activeNum: -1
+ fuShuSheShiShow: true,
+ fuShuSheShiPanelShow: true,
+ activeNum: -1,
+ wfsHelper: null
}
},
props: ['title'],
@@ -123,6 +124,10 @@
},
handleClick (tab, event) {
console.log(tab, event)
+ },
+ handlePage (page) {
+ this.wfsHelper.setPage(page)
+ this.handleSearch()
},
// 璁炬柦绫诲瀷绛涢��
handlePipelineType (val) {
@@ -142,34 +147,40 @@
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
}
},
handleLocation (val, index) {
+ console.log(val)
+ // console.log(val)
this.activeNum = index
-
- this.facilitiesParameter = val
// layer && layer.openPopup()
+ window.layerFactory.flyByFeature(val, this.form.dataType.code)
+ },
+ btnAffiliatedFacilities (val, index) {
+ this.activeNum = index
+ this.facilitiesParameter = val
// 鍒ゆ柇閫夋嫨鏄惁鏄绾匡紝濡傛灉鏄垯鏄剧ず銆婇檮灞炶鏂姐�嬪脊妗�
- /* if (this.form.pipelineType === '绠＄嚎') {
- for (let i = 0; i < this.items.length; i++) {
- const item = this.items[i]
- if (item.name === '闄勫睘璁炬柦') {
- this.fuShuSheShiSubItems = item.layers
- // console.log(this.fuShuSheShiSubItems)
- }
- }
- } */
+ if (this.form.pipelineType === '绠＄嚎') {
+ this.fuShuSheShiShow = true
+ } else {
+ this.fuShuSheShiShow = false
+ }
window.layerFactory.flyByFeature(val, this.form.dataType.code)
}
+ },
+ mounted () {
+ this.wfsHelper = new WfsHelper()
}
}
</script>
--
Gitblit v1.8.0