From 94ae577b548d2f4c51f82f57feadde0048a69f9a Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期一, 31 五月 2021 13:35:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
index f468b7a..d25e3f2 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
@@ -20,9 +20,9 @@
<el-col :span="12">
<div class=search-list>
<!-- <h4 :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛�<h3 style="display: inline-block">{{ item.name }}</h3></h4>-->
- <h3 :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛歿{ item.name }}</h3>
+ <h3 style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden" :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛歿{ item.name }}</h3>
<p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">鍦板潃锛�<span>{{ item.address }}</span>
- <p>鐢佃瘽锛�<span>{{ item.phone }}</span></p>
+ <p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">鐢佃瘽锛�<span>{{ item.phone }}</span></p>
</div>
</el-col>
<el-col :span="8" style="text-align: right">
@@ -43,7 +43,7 @@
<el-col :span="12">
<div class=search-list>
<!-- <h4 :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛�<h3 style="display: inline-block">{{ item.name }}</h3></h4>-->
- <h3 :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛歿{ item.name }}</h3>
+ <h3 :class="activeNum===index?'hover':''" @click="handleLocation(index)" >鍚嶇О锛歿{ item.name }}</h3>
<p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">鍦板潃锛�<span>{{ item.address }}</span>
<p>鐢佃瘽锛�<span>{{ item.phone }}</span></p>
</div>
@@ -55,9 +55,6 @@
</el-col>
<!-- </div>-->
</el-row>
-<!-- <div v-if="item.resultType === 2">-->
-<!-- <span>娌℃湁鏁版嵁浜�</span>-->
-<!-- </div>-->
<div v-if="total > 5">
<el-pagination
small
@@ -118,6 +115,7 @@
// 姣忔杩涜鎼滅储 閮藉涔嬪墠鏁扮粍鍒楄〃杩涜缃┖
this.searchList = []
this.total = ''
+ this.searchListStatistics = []
// 鎼滅储鏁版嵁data鍙傛暟
const getBoundsData = '' + window.map.getBounds().getSouthWest().lng + ',' + window.map.getBounds().getSouthWest().lat + ',' + window.map.getBounds().getNorthEast().lng + ',' + window.map.getBounds().getNorthEast().lat
const data = {
@@ -126,7 +124,7 @@
level: window.map.getZoom(),
mapBound: getBoundsData,
queryType: 7,
- count: 20,
+ count: 50,
start: 0,
queryTerminal: 10000
},
@@ -138,11 +136,14 @@
// 杩斿洖鏁版嵁绫诲瀷 1锛堟櫘閫歅OI锛�
if (res.resultType === 1) {
this.searchList = res.pois
+ // this.total = res.count
this.total = res.pois.length
} else if (res.resultType === 2) {
// 杩斿洖鏁版嵁绫诲瀷 2锛堢粺璁�
this.searchListStatistics = res.statistics.priorityCitys
this.total = res.statistics.priorityCitys.length
+ } else if (res.resultType === 3) {
+ // 杩斿洖鏁版嵁绫诲瀷 3 area 鍖哄煙
}
})
},
--
Gitblit v1.8.0