From 6ab6b11a0ba0bc20c099b9f7b73e9d03fe7d5b8e Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 29 三月 2021 18:13:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index dab29fe..93afb60 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,14 +1,18 @@
<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">
- <div class="public-bounced-content-left"></div>
- <div class="public-bounced-content-right"></div>
-<!-- <span>鍐呭</span>-->
- <popup-gas></popup-gas>
+ <div class="public-bounced-content-left">
+ <GasTable></GasTable>
+ <GasECharts></GasECharts>
+<!-- <GasTabs></GasTabs>-->
+ </div>
+ <div class="public-bounced-content-right">
+ <GasVideo></GasVideo>
+ </div>
</div>
</div>
</template>
@@ -16,18 +20,24 @@
<script>
import '@/components/BaseNav/SolidWaste/directive'
+import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
+import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+// import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
-import PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
+ components: {
+ // GasTabs,
+ GasTable,
+ GasECharts,
+ GasVideo
+ },
data () {
return {
displayContent: [],
flag: false
}
- },
- components: {
- PopupGas
},
methods: {
setData (data) {
@@ -80,15 +90,15 @@
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