From 4fef038c7e4ba6a82b77e9679f58e2f9d8c0711b Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 18:54:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/popup/Popup.vue | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index 5bc6926..8e8b877 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -1,40 +1,55 @@
<template>
- <div v-if="isShow" class="s-map-popup-panel" >
-
- <div>
- {{ data }}
- </div>
- <div>
- {{ data }}
- </div>
- <br>
- <br>
- <div>
- {{ data }}
- </div>
- <br>
- <br>
-
- <div>
- {{ data }}
- </div>
- <el-button type="primary" @click="onClick">涓昏鎸夐挳</el-button>
+ <div id="popup" v-if="isShow" class="s-map-popup-panel">
+ <el-tabs v-model="tabsValue" type="card">
+ <el-tab-pane
+ :key="item.name"
+ v-for="(item) in tabs"
+ :label="item.title"
+ :name="item.name"
+ >
+ <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>
+ </el-tab-pane>
+ </el-tabs>
</div>
</template>
<script>
// import '@/assets/css/map/map-popup.scss'
+import { props } from '../../conf/Constants'
+
export default {
name: 'Popup',
data () {
return {
-
+ tabsValue: '',
+ tabs: [],
+ tabIndex: 2,
isShow: false,
- data: ''
+ properties: {},
+ props: props
}
},
-
+ computed: {
+ },
methods: {
+ filter (content) {
+ var obj = {}
+ for (const key in content) {
+ if (this.props[key]) {
+ obj[this.props[key]] = content[key]
+ }
+ }
+ console.log(obj)
+ return obj
+ },
+ setDatas (layer) {
+ console.log(layer)
+ this.tabs = layer
+ this.tabsValue = layer[0].name
+ },
setShow () {
// this.style.display='auto'
this.data = 'adsfadfsadfsdafsdfsdfdsafsdafsdafa'
@@ -48,6 +63,12 @@
}
</script>
-<style lang="less">
+<style lang="less" >
@import '../../assets/css/map/map-popup.less';
+#popup{
+ .el-tabs__content{
+ max-height: 240px;
+ overflow-y: scroll;
+ }
+}
</style>
--
Gitblit v1.8.0