From bbeeffa8d3524be7e19929ecead7fe054059a373 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 15:59:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 140187c..acee023 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,14 +6,14 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTab :displayContentTab="displayContentTab"></GasTab>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
- <GasECharts v-else></GasECharts>
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <PublicChart v-else></PublicChart>
</div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <PublicVideo></PublicVideo>
</div>
</div>
</div>
@@ -22,19 +22,18 @@
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-// import GasTabs from './GasComponents/GasTabs'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- GasTab,
+ PublicTabs,
PublicTable,
- GasECharts,
- GasVideo
+ PublicChart,
+ PublicVideo
},
data () {
return {
@@ -54,6 +53,12 @@
this.flag = true
this.value = value
},
+ setGasData (data, value) {
+ this.displayContentTitle = data.Name
+ this.displayContentTab = data
+ this.flag = true
+ this.value = value
+ },
closePopup () {
this.flag = false
}
--
Gitblit v1.8.0