From 49003d0eeae335ba72a89e9c1156237cdd02ebd8 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 15:42:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 03c28d5..db65213 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -33,13 +33,16 @@
</el-form>
</div>
<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 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>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.linenumtype }}</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>
@@ -83,7 +86,7 @@
// 寮曞叆缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
-import { fitBounds, highlight } from '../../helpers/LocateHelper'
+import { fitBounds, highlight, locate } from '../../helpers/LocateHelper'
export default {
name: 'SewersSearch',
@@ -133,7 +136,6 @@
// 璁炬柦绫诲瀷绛涢��
handlePipelineType (val) {
this.list = []
- // debugger
for (let i = 0; i < this.items.length; i++) {
const item = this.items[i]
if (val === item.name) {
@@ -156,18 +158,18 @@
}
// 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
}
},
handleLocation (val, index) {
- console.log(this.form.dataType)
// console.log(val)
this.activeNum = index
// layer && layer.openPopup()
- fitBounds(val, this.form.dataType.code)
- highlight(val, this.form.dataType)
+ const config = this.form.dataType
+ locate(val, config)
},
btnAffiliatedFacilities (val, index) {
this.activeNum = index
--
Gitblit v1.8.0