From dac4ce9c559a5ddd3d4666c9ac93d25dde97cacc Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:07:23 +0800
Subject: [PATCH] 修改函数名大小写
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index fbc8c8c..5848dc0 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<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>
<i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,8 +7,11 @@
<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>-->
+<!-- <div class="public-bounced-content-left-bottom">-->
+ <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+<!-- <GasECharts v-else></GasECharts>-->
+ <GasTabs v-else></GasTabs>
+<!-- </div>-->
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -21,14 +24,18 @@
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 GasTabs from './GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
+ GasTabs,
GasTab,
+ PublicTable,
+ // GasECharts,
// PublicTable,
// GasECharts,
GasVideo
@@ -40,10 +47,13 @@
}
},
methods: {
- setData (data) {
+ setData (data, value) {
+ console.log(data)
+ console.log(value)
this.displayContent = data
this.flag = true
- // this.value = value
+ this.value = value
+ console.log(this.flag)
},
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