From fa8fee96d1ca9341d54c86c6c75cf578761d7b2f Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 14:43:34 +0800
Subject: [PATCH] 修改文件名称
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index fbc8c8c..ba5ac37 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,14 +1,17 @@
<template>
- <div class="public-bounced" v-draw v-show="flag">
+ <div class="public-bounced" v-draw v-if="flag">
<div class="public-bounced-title">
- <span>{{ displayContent.Name }}</span>
+ <span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTab :displayContent="displayContent"></GasTab>
- <!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
- <!-- <GasECharts v-else></GasECharts>-->
+ <GasTab :displayContentTab="displayContentTab" ></GasTab>
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
+<!-- <GasECharts v-else></GasECharts>-->
+ <PublicTab v-else></PublicTab>
+ </div>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -21,29 +24,36 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
-// import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+import PublicTab from './GasComponents/PublicTab'
export default {
name: 'PublicBounced',
components: {
GasTab,
- // PublicTable,
+ PublicTable,
// GasECharts,
- GasVideo
+ GasVideo,
+ PublicTab
},
data () {
return {
- displayContent: [],
+ displayContentTitle: '',
+ displayContentTab: '',
flag: false
}
},
methods: {
- setData (data) {
- this.displayContent = data
+ setData (data, value) {
+ // data.forEach((item, index) => {
+ // // console.log(item.StoragePlaceName)
+ // // this.displayContentTitle = item.StoragePlaceName
+ // })
+ this.displayContentTab = data
this.flag = true
- // this.value = value
+ this.value = value
},
closePopup () {
this.flag = false
@@ -85,16 +95,19 @@
.public-bounced-content {
margin: 15px auto;
display: flex;
- align-items: center;
+ //align-items: center;
justify-content: space-around;
+ padding: 10px;
.public-bounced-content-left {
- width: 48%;
+ flex: 3;
height: 100%;
+ margin-right: 10px;
}
.public-bounced-content-right {
- width: 48%;
+ flex: 2;
+ //width: 48%;
height: 100%;
}
}
--
Gitblit v1.8.0