From b4fa7ad9c8e0051e9851c3bfbe398d5ff4cbfafe Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期三, 19 五月 2021 16:05:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/popup/Popup.vue | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index 98ba35b..242aea0 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -1,6 +1,6 @@
<template>
<div id="popup" class="s-map-popup-panel" style="min-width: 280px;max-width: 280px;padding: 0 10px">
- <el-tabs type="card" :value="0">
+ <el-tabs type="card" v-model="tabIndex" @tab-click="handleClick">
<el-tab-pane
:key="index"
v-for="(item,index) in datas"
@@ -11,6 +11,22 @@
<el-col :span="12"><B>{{key}}锛�</B></el-col>
<el-col :span="12">{{item}}</el-col>
</el-row>
+ <el-table v-if="item.tableList"
+ :data="item.tableList"
+ style="width: 100%">
+ <el-table-column
+ prop="pipesegcode"
+ label="绠℃缂栫爜">
+ </el-table-column>
+ <el-table-column
+ prop="startpointdepth"
+ label="璧风偣鍩嬫繁(m)">
+ </el-table-column>
+ <el-table-column
+ prop="startpointz"
+ label="璧风偣楂樼▼(m)">
+ </el-table-column>
+ </el-table>
</el-tab-pane>
</el-tabs>
</div>
@@ -19,13 +35,15 @@
<script>
// import '@/assets/css/map/map-popup.scss'
+import { highlight } from '../../components/helpers/LocateHelper'
+
export default {
name: 'Popup',
props: ['datas'],
data () {
return {
tabsValue: '',
- tabIndex: 2,
+ tabIndex: 0,
isShow: false,
properties: {}
}
@@ -47,9 +65,10 @@
// this.style.display='auto'
this.isShow = true
},
- onClick () {
- const param = 1111
- this.$emit('callPopup', param)
+ handleClick (tab, event) {
+ const data = this.datas[this.tabIndex]
+ const feature = data.feature
+ highlight(feature)
}
},
watch: {
--
Gitblit v1.8.0