From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/popup/Popup.vue | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index a3c7836..242aea0 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -1,16 +1,32 @@
<template>
<div id="popup" class="s-map-popup-panel" style="min-width: 280px;max-width: 280px;padding: 0 10px">
- <el-tabs value="0" type="card">
+ <el-tabs type="card" v-model="tabIndex" @tab-click="handleClick">
<el-tab-pane
- :key="item.name"
+ :key="index"
v-for="(item,index) in datas"
:label="item.title"
- :name="index"
+ :name="index.toString()"
>
- <el-row v-for="(v,k) in filter(item.content)" :key="k">
- <el-col :span="12"><B>{{k}}锛�</B></el-col>
- <el-col :span="12">{{v}}</el-col>
+ <el-row v-for="(item,key) in item.content" :key="key">
+ <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>
@@ -18,7 +34,8 @@
<script>
// import '@/assets/css/map/map-popup.scss'
-import { props } from '../../conf/Constants'
+
+import { highlight } from '../../components/helpers/LocateHelper'
export default {
name: 'Popup',
@@ -26,10 +43,9 @@
data () {
return {
tabsValue: '',
- tabIndex: 2,
+ tabIndex: 0,
isShow: false,
- properties: {},
- props: props
+ properties: {}
}
},
computed: {
@@ -45,23 +61,18 @@
// console.log(obj)
return obj
},
- setDatas (layer) {
- console.log(layer)
- this.datas = layer
- this.tabsValue = layer[0].name
- },
setShow () {
// 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: {
datas (newVal) {
- console.log(newVal)
if (newVal != null) {
this.tabsValue = newVal[0].name
}
--
Gitblit v1.8.0