From e904d8923e3bd070682dd8279001a8732016b82e Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 10:14:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 146a06e..dedb740 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -61,7 +61,9 @@
<el-tab-pane label="鍒嗘瀽" name="second">
<SewersAnalysis></SewersAnalysis>
</el-tab-pane>
- <el-tab-pane label="鍘嗗彶" name="third">鍘嗗彶</el-tab-pane>
+ <el-tab-pane label="鍘嗗彶" name="third">
+ <SewersHistory></SewersHistory>
+ </el-tab-pane>
</el-tabs>
</div>
</template>
@@ -76,13 +78,15 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
-// 寮曞叆鍒嗘瀽缁勪欢鍐呭
+// 寮曞叆缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
+import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
export default {
name: 'SewersSearch',
components: {
- SewersAnalysis
+ SewersAnalysis,
+ SewersHistory
},
data () {
return {
@@ -124,11 +128,13 @@
wfsHelper.addLike('name', this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.list = res.features
}
},
handleLocation (val) {
+ console.log(val)
const bound = this.L.geoJSON([val], {}).getBounds()
// var layer = window.layerFactory.flyByLayerId(val.id, bound)
window.map.flyToBounds(bound)
--
Gitblit v1.8.0