From 175db8fd0f26c8f7b01c7bc717cbf46cebad9805 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 01 四月 2021 18:10:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index fa40860..7ef971b 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 :displayContent="displayContentTab" ></GasTab>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></PublicTabs>
<div class="public-bounced-content-left-bottom">
<PublicTable v-if="value === 'gufei'"></PublicTable>
- <GasECharts v-else></GasECharts>
+ <PublicChart v-else></PublicChart>
</div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <PublicVideo></PublicVideo>
</div>
</div>
</div>
@@ -22,34 +22,42 @@
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+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/GasVideo'
-// 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 {
+ setWasteGasdata: '',
displayContentTitle: '',
displayContentTab: '',
- flag: false
+ displayContentTable: '',
+ flag: false,
+ value: ''
}
},
methods: {
- setData (data, value) {
- // data.forEach((item, index) => {
- // // console.log(item.StoragePlaceName)
- // // this.displayContentTitle = item.StoragePlaceName
- // })
- this.displayContentTab = data
+ setData (dataBasic, dataDetailed, value) {
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
+ this.flag = true
+ this.value = value
+ },
+ setGasData (data, value) {
+ this.setWasteGasdata = data
+ this.displayContentTitle = data.Name
this.flag = true
this.value = value
},
--
Gitblit v1.8.0