From 07a0b054953d628a1e4b34c88b974166927ea62d Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期二, 30 三月 2021 11:37:46 +0800 Subject: [PATCH] 弹框修改 --- src/components/BaseNav/PublicBounced/PublicBounced.vue | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue index ed22e56..61286b1 100644 --- a/src/components/BaseNav/PublicBounced/PublicBounced.vue +++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue @@ -5,8 +5,14 @@ <i class="el-icon-circle-close" @click="closePopup"></i> </div> <div class="public-bounced-content"> - <div class="public-bounced-content-left"></div> - <div class="public-bounced-content-right"></div> + <div class="public-bounced-content-left"> + <GasTab :displayContent="displayContent"></GasTab> + <PublicTable v-if="value === 'gufei'"></PublicTable> + <GasECharts v-else></GasECharts> + </div> + <div class="public-bounced-content-right"> + <GasVideo></GasVideo> + </div> </div> </div> </template> @@ -14,9 +20,19 @@ <script> import '@/components/BaseNav/SolidWaste/directive' +import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab' +import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable' +import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts' +import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo' export default { name: 'PublicBounced', + components: { + GasTab, + PublicTable, + GasECharts, + GasVideo + }, data () { return { displayContent: [], @@ -24,9 +40,10 @@ } }, methods: { - setData (data) { + setData (data, value) { this.displayContent = data this.flag = true + this.value = value }, closePopup () { this.flag = false @@ -37,18 +54,14 @@ <style lang="less" scoped> .public-bounced { - width: 80%; - height: 450px; z-index: 999; position: absolute; - top: 25%; - left: 10%; + top: 50%; + left: 50%; background-color: #002432; - margin: 1% auto; border: 1px #9fc5c8 solid; .public-bounced-title { - width: 100%; border: 1px #a4c0d8 solid; display: flex; align-items: center; @@ -69,20 +82,14 @@ } .public-bounced-content { - width: 100%; - height: 100%; display: flex; align-items: center; justify-content: space-around; + .public-bounced-content-left { - width: 48%; - height: 400px; - border: 1px red solid; } + .public-bounced-content-right { - width: 48%; - height: 400px; - border: 1px red solid; } } -- Gitblit v1.8.0