From d4fca49a4b70fe60c730d7e32e2035153a91fcc5 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期一, 31 五月 2021 17:13:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 164 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 121 insertions(+), 43 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 444dcdc..48524dd 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"
@@ -17,8 +17,8 @@
</el-select>
</el-form-item>
<el-form-item :label="form.pipelineType+'锛�'" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" value-key="code" :popper-class="'select-down'">
- <!-- @change="handleDataType"-->
+ <el-select style="width: 100%" v-model="form.dataType" value-key="code"
+ :popper-class="'select-down'" @change="handleDataType">
<el-option
v-for="item in subItems"
:key="item.code"
@@ -27,20 +27,32 @@
</el-option>
</el-select>
</el-form-item>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{ total }}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
- </el-input>
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
- <el-scrollbar style="height:380.44px;">
- <div class="environmental-risk-list" v-for="(item,index) in list" :key="index">
+ <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)">{{ item.properties.pipename }}</h3>
- <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgcode }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.teetype }}</span></p>
+ <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code }}</h3>
+ <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</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)">
+ 闄勫睘璁炬柦
+ </el-button>
+ </p>
</div>
</div>
</el-scrollbar>
@@ -51,7 +63,6 @@
:page-size=pageSize
layout="prev, pager, next"
:total=total
- :current-page=current
class="warnPagination"
>
</el-pagination>
@@ -64,83 +75,150 @@
<SewersHistory></SewersHistory>
</el-tab-pane>
</el-tabs>
+ <!-- 闄勫睘璁炬柦闈㈡澘 -->
+ <affiliated-facilities :facilitiesParameter="facilitiesParameter"
+ v-if="fuShuSheShiShow"></affiliated-facilities>
</div>
</template>
<script>
+// 寮曞叆缁勪欢鍐呭 =銆� 闄勫睘璁炬柦
+import AffiliatedFacilities from '@components/base-page/pipeline/AffiliatedFacilities'
+// 绠＄嚎鍒嗘瀽鍔熻兘
+import SewersAnalysis from '@components/panel/topicSearch/sewers-select/SewersAnalysis'
+// 绠＄嚎鏌ヨ鍘嗗彶鍔熻兘
+import SewersHistory from '@components/panel/topicSearch/sewers-select/SewersHistory'
+// form绫诲瀷鍙�夋嫨鏁版嵁 鍥惧眰鎺у埗
import { LayerPipeLines } from '@src/conf/layers/LayerPipeLines'
import { LayerFsss } from '@src/conf/layers/LayerFsss'
import { LayerHbss } from '@src/conf/layers/LayerHbss'
import { LayerPk } from '@src/conf/layers/LayerPk'
import { LayerArea } from '@src/conf/layers/LayerArea'
-
+// 鏂规硶
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
-
-// 寮曞叆缁勪欢鍐呭
-import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
-import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
+import { fitBounds, highlight, locate } from '../../helpers/LocateHelper'
export default {
name: 'SewersSearch',
+ props: ['title'],
components: {
SewersAnalysis,
- SewersHistory
+ SewersHistory,
+ AffiliatedFacilities
},
data () {
return {
- activeName: 'first',
+ // 鍒ゆ柇鏄剧ず/闅愯棌
gdVisible: true,
+ // tab鍒囨崲 缁戝畾褰撳墠鍊�
+ activeName: 'first',
+ // 鎼滅储鏁版嵁 鐢ㄤ簬灞曠ず鏁版嵁瀛樺偍
list: [],
+ // 鍥惧眰鎺у埗
items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
- subItems: LayerPipeLines.layers,
+ // 鍒嗛〉
+ pageSize: 10,
total: 0,
+ // form琛ㄥ崟缁戝畾鏁版嵁
form: {
- pipelineType: '绠＄綉',
+ pipelineType: '绠＄嚎',
dataType: '',
keyword: ''
},
- // pageSize: 10,
- // current: 1,
- isWaybillHover: true,
- isRouteHover: false
+ facilitiesParameter: null,
+ fuShuSheShiShow: true,
+ activeNum: -1,
+ wfsHelper: null
}
},
- props: ['title'],
+ 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 () {
+ this.wfsHelper = new WfsHelper()
+ },
methods: {
+ // tab鍒囨崲
+ handleClick (tab, event) {
+ console.log(tab, event)
+ if (tab.label === '鍒嗘瀽') {
+ // 鍏抽棴寮圭獥
+ window.mapManager.clickDialogSwitch = false
+ } else {
+ // 鎵撳紑寮圭獥
+ window.mapManager.clickDialogSwitch = true
+ }
+ },
+ // 鏍规嵁杩斿洖鏁版嵁 纭灞曠ず鍥剧墖
getImgSrc () {
const icon = this.form.dataType.icon
return icon ? 'assets/images/map/' + icon : ''
},
- handleClick (tab, event) {
- console.log(tab, event)
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+ handlePage (page) {
+ this.wfsHelper.setPage(page)
+ this.handleSearch()
},
- handlePipelineType (val) {
- for (var 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 = []
},
+ // 鎼滅储鍔熻兘
async handleSearch () {
- var wfsHelper = new WfsHelper()
+ // console.log(this.form.dataType.sname, this.form.keyword)
+ this.list = []
+ this.wfsHelper.clearFilter()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- wfsHelper.addTypeName(this.form.dataType.sname)
- wfsHelper.addLike('name', this.form.keyword)
+ 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(wfsHelper.getUrl(), {})
+ 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) {
- const bound = this.L.geoJSON([val], {}).getBounds()
- window.map.flyToBounds(bound)
- window.layerFactory.flyByLayerId(this.form.dataType.code, val.id)
+ // 鐐瑰嚮鎼滅储鍒扮殑鏁版嵁 瀹炵幇鍔熻兘 = 瀹氫綅 楂樹寒 寮规
+ handleLocation (val, index) {
+ // console.log(val)
+ this.activeNum = index
// layer && layer.openPopup()
+ const config = this.form.dataType
+ locate(val, config)
+ },
+ // 闄勫睘璁炬柦鍔熻兘缁勪欢
+ btnAffiliatedFacilities (val, index) {
+ this.activeNum = index
+ this.facilitiesParameter = val
+ // 鍒ゆ柇閫夋嫨鏄惁鏄绾匡紝濡傛灉鏄垯鏄剧ず銆婇檮灞炶鏂姐�嬪脊妗�
+ if (this.form.pipelineType === '绠＄嚎') {
+ this.fuShuSheShiShow = true
+ } else {
+ this.fuShuSheShiShow = false
+ }
+ fitBounds(val, this.form.dataType.code)
+ highlight(val)
}
}
}
--
Gitblit v1.8.0