From 881c1cfbe23c2fc5033bf8656fe37547df43e9d8 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 18 五月 2021 15:17:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index b2f1dde..c6fe249 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -51,7 +51,6 @@
:page-size=pageSize
layout="prev, pager, next"
:total=total
- :current-page=current
class="warnPagination"
>
</el-pagination>
@@ -84,6 +83,7 @@
// 寮曞叆缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
+import { fitBounds, highlight, locate } from '../../helpers/LocateHelper'
export default {
name: 'SewersSearch',
@@ -162,11 +162,11 @@
}
},
handleLocation (val, index) {
- console.log(val)
// console.log(val)
this.activeNum = index
// layer && layer.openPopup()
- window.layerFactory.flyByFeature(val, this.form.dataType.code)
+ const config = this.form.dataType
+ locate(val, config)
},
btnAffiliatedFacilities (val, index) {
this.activeNum = index
@@ -177,7 +177,8 @@
} else {
this.fuShuSheShiShow = false
}
- window.layerFactory.flyByFeature(val, this.form.dataType.code)
+ fitBounds(val, this.form.dataType.code)
+ highlight(val)
}
},
mounted () {
--
Gitblit v1.8.0