From 9cf09818be0c2db5070a5b1342ca46d9e6497fad Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期日, 25 四月 2021 10:36:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 91 ++++++++++++++++++++++++++++++---------------
1 files changed, 60 insertions(+), 31 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index dedb740..2213bef 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -6,41 +6,40 @@
<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" :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
<el-option
- v-for="item in items"
- :key="item.code"
- :label="item.name"
- :value="item.name">
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="form.pipelineType+'锛�'" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'">
+ <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"
- :label="item.name"
- :value="item.name">
- </el-option>
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item">
+ </el-option>
</el-select>
</el-form-item>
<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">
- <div @click="handleLocation(item)">
- <h3 class="B-TMD-table-list-title-y"
- :class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]">
- {{ item.properties.pipename }}</h3>
- <p v-for="itm in labelList" :key="itm.label">
- <span>{{ itm.label }}锛�</span>
- <span :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
+ <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 btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="btnAffiliatedFacilities(item,index)" >闄勫睘璁炬柦</el-button>
</p>
</div>
</div>
@@ -65,6 +64,8 @@
<SewersHistory></SewersHistory>
</el-tab-pane>
</el-tabs>
+ <!-- 闄勫睘璁炬柦闈㈡澘 -->
+ <affiliated-facilities :facilitiesParameter="facilitiesParameter" v-if="fuShuSheShiShow" ></affiliated-facilities>
</div>
</template>
@@ -78,6 +79,8 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
+import AffiliatedFacilities from '@components/BaseNav/pipeline/AffiliatedFacilities'
+
// 寮曞叆缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
@@ -86,7 +89,8 @@
name: 'SewersSearch',
components: {
SewersAnalysis,
- SewersHistory
+ SewersHistory,
+ AffiliatedFacilities
},
data () {
return {
@@ -97,23 +101,34 @@
subItems: LayerPipeLines.layers,
total: 0,
form: {
- pipelineType: '绠＄綉',
+ pipelineType: '绠＄嚎',
dataType: '',
keyword: ''
},
// pageSize: 10,
// current: 1,
isWaybillHover: true,
- isRouteHover: false
+ isRouteHover: false,
+ facilitiesParameter: null,
+ fuShuSheShiShow: true,
+ fuShuSheShiPanelShow: true,
+ activeNum: -1
}
},
props: ['title'],
methods: {
+ getImgSrc () {
+ const icon = this.form.dataType.icon
+ return icon ? 'assets/images/map/' + icon : ''
+ },
handleClick (tab, event) {
console.log(tab, event)
},
+ // 璁炬柦绫诲瀷绛涢��
handlePipelineType (val) {
- for (var i = 0; i < this.items.length; i++) {
+ this.list = []
+ // debugger
+ for (let i = 0; i < this.items.length; i++) {
const item = this.items[i]
if (val === item.name) {
this.subItems = item.layers
@@ -121,10 +136,15 @@
}
}
},
+ handleDataType () {
+ this.list = []
+ },
async handleSearch () {
+ // console.log(this.form.dataType.sname, this.form.keyword)
+ this.list = []
var wfsHelper = new WfsHelper()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- wfsHelper.addTypeName('绠＄綉')
+ wfsHelper.addTypeName(this.form.dataType.sname)
wfsHelper.addLike('name', this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
@@ -133,12 +153,21 @@
this.list = res.features
}
},
- handleLocation (val) {
- console.log(val)
- const bound = this.L.geoJSON([val], {}).getBounds()
- // var layer = window.layerFactory.flyByLayerId(val.id, bound)
- window.map.flyToBounds(bound)
+ handleLocation (val, index) {
+ this.activeNum = index
// layer && layer.openPopup()
+ window.layerFactory.flyByFeature(val, this.form.dataType.code)
+ },
+ btnAffiliatedFacilities (val, index) {
+ this.activeNum = index
+ this.facilitiesParameter = val
+ // 鍒ゆ柇閫夋嫨鏄惁鏄绾匡紝濡傛灉鏄垯鏄剧ず銆婇檮灞炶鏂姐�嬪脊妗�
+ if (this.form.pipelineType === '绠＄嚎') {
+ this.fuShuSheShiShow = true
+ } else {
+ this.fuShuSheShiShow = false
+ }
+ window.layerFactory.flyByFeature(val, this.form.dataType.code)
}
}
}
--
Gitblit v1.8.0