From f425c4dd7d48529f7f2e50bba8188463f8d60ee2 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 21 五月 2021 11:35:06 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index 8db99ba..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>
@@ -131,12 +133,13 @@
this.wfsHelper.clearFilter()
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.setFilter(this.form.keyword)
this.wfsHelper.addLike('name', this.form.keyword)
}
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
--
Gitblit v1.8.0