From 9f5456f88b8397ffbab1ad80331aaa834c15d882 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期一, 17 五月 2021 17:19:52 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/popup/Popup.vue | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index a3c7836..98ba35b 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -1,15 +1,15 @@
<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" :value="0">
<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-tab-pane>
</el-tabs>
@@ -18,7 +18,6 @@
<script>
// import '@/assets/css/map/map-popup.scss'
-import { props } from '../../conf/Constants'
export default {
name: 'Popup',
@@ -28,8 +27,7 @@
tabsValue: '',
tabIndex: 2,
isShow: false,
- properties: {},
- props: props
+ properties: {}
}
},
computed: {
@@ -45,11 +43,6 @@
// 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
@@ -61,7 +54,6 @@
},
watch: {
datas (newVal) {
- console.log(newVal)
if (newVal != null) {
this.tabsValue = newVal[0].name
}
--
Gitblit v1.8.0