From 06b8e7a0ae832fdf83dcefd069b9cf9b5580f013 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 17:59:57 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index f32abb2..712dc17 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -17,13 +17,13 @@
</el-select>
</el-form-item>
<el-form-item :label="form.pipelineType+'锛�'" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" :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">
+ :value="item">
</el-option>
</el-select>
</el-form-item>
@@ -37,13 +37,12 @@
<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' }]">
+ <h3 class="B-TMD-table-list-title-y">
{{ item.properties.pipename }}</h3>
- <p v-for="itm in labelList" :key="itm.label">
+ <!--<p v-for="itm in labelList" :key="itm.label">
<span>{{ itm.label }}锛�</span>
<span :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
- </p>
+ </p>-->
</div>
</div>
</el-scrollbar>
@@ -126,7 +125,7 @@
async handleSearch () {
var wfsHelper = new WfsHelper()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- wfsHelper.addTypeName('绠＄綉')
+ wfsHelper.addTypeName(this.form.dataType.name)
wfsHelper.addLike('name', this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
@@ -136,10 +135,9 @@
}
},
handleLocation (val) {
- console.log(val)
const bound = this.L.geoJSON([val], {}).getBounds()
- // var layer = window.layerFactory.flyByLayerId(val.id, bound)
window.map.flyToBounds(bound)
+ window.layerFactory.flyByLayerId(this.form.dataType.code, val.id)
// layer && layer.openPopup()
}
}
--
Gitblit v1.8.0