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 | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue index 8326dfa..61286b1 100644 --- a/src/components/BaseNav/PublicBounced/PublicBounced.vue +++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue @@ -1,33 +1,49 @@ <template> - <div class="public-bounced" v-show="flag"> + <div class="public-bounced" v-draw v-show="flag"> <div class="public-bounced-title"> <span>{{ displayContent.Name }}</span> <i class="el-icon-circle-close" @click="closePopup"></i> </div> <div class="public-bounced-content"> -<!-- <span>鍐呭</span>--> - <popup-gas></popup-gas> + <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> <script> -import PopupGas from '@components/flueGas/popup-gas' + +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: [], flag: false } }, - components: { - PopupGas - }, methods: { - setData (data) { + setData (data, value) { this.displayContent = data this.flag = true + this.value = value }, closePopup () { this.flag = false @@ -38,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 #a5bfd8 solid; + border: 1px #9fc5c8 solid; .public-bounced-title { - width: 100%; border: 1px #a4c0d8 solid; display: flex; align-items: center; @@ -69,5 +81,17 @@ } } + .public-bounced-content { + display: flex; + align-items: center; + justify-content: space-around; + + .public-bounced-content-left { + } + + .public-bounced-content-right { + } + } + } </style> -- Gitblit v1.8.0