From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index ccff3b1..fdad5d6 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -44,9 +44,11 @@
:class="activeNum===index?'hover':''" @click="handleLocation(item,index)">
<img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/>
<h3>{{changeAmount}}绫诲瀷:{{item.properties.type}}</h3>
- <h5>{{changeAmount}}鍚嶇О:{{item.properties.companyname}}</h5>
+ <h5>{{changeAmount}}鍚嶇О:{{item.properties.name}}</h5>
<p>璐熻矗浜�:<span>{{item.properties.resperson}}</span></p>
<p>鐢佃瘽:<span>{{item.properties.telephone}}</span></p>
+ <p v-if="item.properties.address">鍦板潃:<span>{{item.properties.address}}</span></p>
+ <p v-else>鍦板潃:<span>{{item.properties.adminzonename}}</span></p>
</div>
</el-scrollbar>
</div>
@@ -74,8 +76,8 @@
dataType: '',
keyword: '',
eventNameList: [
- { name: '閲戦櫟鐭冲寲' },
- { name: '鍗椾含鍖栧' }
+ { name: '鎵瓙鐭冲寲' },
+ { name: '浠緛鍖栫氦' }
]
},
// 鎼滅储鍒扮殑鏁版嵁缁戝畾鐨刟ctive鐨勬牱寮�
@@ -129,19 +131,19 @@
async handleSearch () {
this.list = []
this.wfsHelper.clearFilter()
- // todo 鐜板湪浼佷笟搴旀�ヨ繕娌″尯鍒嗗紑绫诲瀷锛屽悗闈㈡敼
- // console.log(this.form.dataType)
- // this.wfsHelper.setTypeName([this.form.dataType.typeName])
this.wfsHelper.setTypeName(['sewer:emergency'])
this.wfsHelper.setMaxFeatures(100)
+ // form琛ㄥ崟閫夋嫨鎼滅储
if (this.form.dataType) {
+ this.wfsHelper.addEquals('orgname', '\'' + this.form.eventName + '\'')
this.wfsHelper.addEquals('type', '\'' + this.form.dataType.name + '\'')
}
+ // 鎼滅储妗唊eyword
if (this.form.keyword) {
this.wfsHelper.addLike('name', this.form.keyword)
}
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
- console.log(res)
+ // console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.list = res.features
}
--
Gitblit v1.8.0