From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/popup/Popup.vue | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 deletions(-)
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index 5bc6926..242aea0 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -1,53 +1,92 @@
<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" class="s-map-popup-panel" style="min-width: 280px;max-width: 280px;padding: 0 10px">
+ <el-tabs type="card" v-model="tabIndex" @tab-click="handleClick">
+ <el-tab-pane
+ :key="index"
+ v-for="(item,index) in datas"
+ :label="item.title"
+ :name="index.toString()"
+ >
+ <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>
</template>
<script>
// import '@/assets/css/map/map-popup.scss'
+
+import { highlight } from '../../components/helpers/LocateHelper'
+
export default {
name: 'Popup',
+ props: ['datas'],
data () {
return {
-
+ tabsValue: '',
+ tabIndex: 0,
isShow: false,
- data: ''
+ properties: {}
}
},
-
+ 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
+ },
setShow () {
// this.style.display='auto'
- this.data = 'adsfadfsadfsdafsdfsdfdsafsdafsdafa'
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) {
+ if (newVal != null) {
+ this.tabsValue = newVal[0].name
+ }
}
}
}
</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