From 219f8c029a2abc029e34f079f6ae43bea929500a Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 15:15:11 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/popup/Popup.vue | 57 +++++++++++++--------------------------------------------
1 files changed, 13 insertions(+), 44 deletions(-)
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index 02703b5..8373db6 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -7,9 +7,9 @@
:label="item.title"
:name="item.name"
>
- <el-row v-for="(v,k) in filter" :key="k">
- <el-col :span="10"><B>{{k}}锛�</B></el-col>
- <el-col :span="14">{{v}}</el-col>
+ <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>
@@ -24,7 +24,7 @@
name: 'Popup',
data () {
return {
- tabsValue: '1',
+ tabsValue: '',
tabs: [],
tabIndex: 2,
isShow: false,
@@ -33,52 +33,21 @@
}
},
computed: {
- filter () {
- var obj = {}
- for (const key in this.properties) {
- if (this.props[key]) {
- obj[this.props[key]] = this.properties[key]
- }
- }
- return obj
- }
},
methods: {
- handleTabsEdit (targetName, action) {
- if (action === 'add') {
- const newTabName = ++this.tabIndex + ''
- this.editableTabs.push({
- title: 'New Tab',
- name: newTabName,
- content: 'New Tab content'
- })
- this.editableTabsValue = newTabName
- }
- if (action === 'remove') {
- const tabs = this.editableTabs
- let activeName = this.editableTabsValue
- if (activeName === targetName) {
- tabs.forEach((tab, index) => {
- if (tab.name === targetName) {
- const nextTab = tabs[index + 1] || tabs[index - 1]
- if (nextTab) {
- activeName = nextTab.name
- }
- }
- })
+ filter (content) {
+ var obj = {}
+ for (const key in content) {
+ if (this.props[key]) {
+ obj[this.props[key]] = content[key]
}
-
- this.editableTabsValue = activeName
- this.editableTabs = tabs.filter(tab => tab.name !== targetName)
}
+ console.log(obj)
+ return obj
},
setDatas (layer) {
- console.log(layer)
- this.tabs = [{
- title: layer.feature.properties.name || layer.feature.id,
- name: '1'
- }]
- this.properties = layer.feature.properties
+ this.tabs = layer
+ this.tabsValue = layer[0].name
},
setShow () {
// this.style.display='auto'
--
Gitblit v1.8.0