From 564d0ab88c6ddf0b3d56a9eeba5ee72d6fff01b9 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 15:33:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 177 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 112 insertions(+), 65 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 275b86e..b2caeb2 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,47 +1,86 @@
<template>
- <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 class="public-bounced" v-draw v-if="flag">
+ <div class="public-bounced-title">
+ <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 :displayContentTab="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"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
+ :getWasteWaterMonitoring="getWasteWaterMonitoring">
+ </public-chart>
+ </div>
+ </div>
+ <div class="public-bounced-content-right">
+ <public-video></public-video>
+ </div>
+ </div>
</div>
- <div class="public-bounced-content">
- <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 '@/components/BaseNav/SolidWaste/directive'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+import '@/components/BaseNav/SolidWaste/directive/dir'
+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 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 {
- displayContent: [],
- flag: false
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
+ flag: false,
+ value: '',
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getWasteWaterMonitoring: []
}
},
methods: {
- setData (data, value) {
- this.displayContent = data
+ setData (dataBasic, dataDetailed, value) {
+ this.flag = true
+ this.value = value
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
+ this.flag = true
+ this.value = value
+ },
+ setGasData (data, dataDetails, value) {
+ this.setWasteGasdata = data
+ this.getWasteGasDetails = dataDetails
+ // console.log(dataDetails)
+ this.displayContentTitle = data.Name
+ this.flag = true
+ this.value = value
+ },
+ setWaterData (dataWater, dataDetail, drawData, value) {
+ this.setWasteWaterdata = dataWater
+ // console.log(data)
+ this.getWasteWaterMonitoring = drawData
+ console.log(drawData)
+ this.getWasteWaterMonitoringDetails = dataDetail
+ this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
},
@@ -53,45 +92,53 @@
</script>
<style lang="less" scoped>
-.public-bounced {
- z-index: 999;
- position: absolute;
- top: 50%;
- left: 50%;
- background-color: #002432;
- border: 1px #9fc5c8 solid;
+ .public-bounced {
+ width: 75%;
+ z-index: 999;
+ position: absolute;
+ bottom: 5%;
+ left: 15%;
+ background-color: #002432;
+ border: 1px #9fc5c8 solid;
- .public-bounced-title {
- border: 1px #a4c0d8 solid;
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 5px 0;
+ .public-bounced-title {
+ border: 1px #a4c0d8 solid;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 5px 0;
- span {
- color: #f4f7ff;
- margin: 0 15px;
- font-size: 14px;
+ span {
+ color: #f4f7ff;
+ margin: 0 15px;
+ font-size: 14px;
+ }
+
+ i {
+ color: white;
+ margin: 0 15px;
+ font-size: 22px;
+ }
+ }
+
+ .public-bounced-content {
+ margin: 15px auto;
+ display: flex;
+ //align-items: center;
+ justify-content: space-around;
+ padding: 10px;
+
+ .public-bounced-content-left {
+ flex: 3;
+ height: 100%;
+ margin-right: 10px;
+ }
+
+ .public-bounced-content-right {
+ flex: 2;
+ //width: 48%;
+ height: 100%;
+ }
+ }
}
-
- i {
- color: white;
- margin: 0 15px;
- font-size: 22px;
- }
- }
-
- .public-bounced-content {
- display: flex;
- align-items: center;
- justify-content: space-around;
-
- .public-bounced-content-left {
- }
-
- .public-bounced-content-right {
- }
- }
-
-}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0