From fd9237476b1c11bf46225b5d1469cff5cc20bc92 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 23:05:54 +0800
Subject: [PATCH] 固废弹框问题修改
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 62 ++++++++++++++----------------
1 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 0db423e..3665692 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -4,49 +4,45 @@
<span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
-<!-- <div class="public-bounced-content">-->
-<!-- <div class="public-bounced-content-left">-->
-<!-- <public-tabs :setSolidWaste="displayContentTab" :value="value"-->
-<!-- :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
-<!-- <div class="public-bounced-content-left-bottom">-->
-<!-- <public-table v-if="value === 'gufei'"-->
-<!-- :displayContentTable="displayContentTable"></public-table>-->
-<!-- <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
-<!-- :value="value"-->
-<!-- :getQueryOnlineMonData="getQueryOnlineMonData"-->
-<!-- :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'-->
-<!-- :ManualData="ManualData"-->
-<!-- ref="PublicChart"-->
-<!-- >-->
-<!-- </public-chart>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="public-bounced-content-right">-->
-<!-- <public-video></public-video>-->
-<!-- </div>-->
-<!-- </div>-->
- <PublicSector></PublicSector>
+ <div class="public-bounced-content">
+ <div class="public-bounced-content-left">
+ <public-tabs :setSolidWaste="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
+ <div class="public-bounced-content-left-bottom">
+ <public-table v-if="value === 'gufei'"
+ :displayContentTable="displayContentTable"></public-table>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
+ :value="value"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
+ ref="PublicChart"
+ >
+ </public-chart>
+ </div>
+ </div>
+ <div class="public-bounced-content-right">
+ <public-video></public-video>
+ </div>
+ </div>
</div>
</template>
<script>
import '@/utils/dragBoxes'
-// import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
-// import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
-// import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
-// import PublicChart from './common/PublicChart'
-
-import PublicSector from '@components/BaseNav/PublicSector'
+import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+import PublicChart from './common/PublicChart'
export default {
name: 'PublicBounced',
components: {
- PublicSector
- // PublicTabs,
- // PublicTable,
- // PublicChart,
- // PublicVideo
+ PublicTabs,
+ PublicTable,
+ PublicChart,
+ PublicVideo
},
data () {
return {
--
Gitblit v1.8.0