From 83d2044b6b47d26ff77ec25de8d6787ceaf83e3a Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 17:00:39 +0800
Subject: [PATCH] 1
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 850980d..c0b4e4f 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,14 +1,21 @@
<template>
- <div class="public-bounced" v-draw v-show="flag">
+ <div class="public-bounced" v-draw v-if="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">
- <GasTable :displayContent="displayContent"></GasTable>
+ <GasTab :displayContent="displayContent"></GasTab>
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+ <GasECharts v-else></GasECharts>
+ </div>
+<!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
<GasECharts></GasECharts>
<!-- <GasTabs></GasTabs>-->
+ <!-- <PublicTable></PublicTable>-->
+<!-- <GasECharts></GasECharts>-->
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -19,17 +26,18 @@
<script>
-import '@/components/BaseNav/SolidWaste/directive'
-import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
+import '@/components/BaseNav/SolidWaste/directive/dir'
+import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+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 '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
+// import GasTabs from './GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
- // GasTabs,
- GasTable,
+ GasTab,
+ PublicTable,
GasECharts,
GasVideo
},
@@ -40,10 +48,19 @@
}
},
methods: {
- setData (data) {
+ setData (data, value) {
+ console.log(data)
+ console.log(value)
this.displayContent = data
this.flag = true
+ this.value = value
+ console.log(this.flag)
},
+ // setData (data) {
+ // this.displayContent = data
+ // this.flag = true
+ // // this.value = value
+ // },
closePopup () {
this.flag = false
}
@@ -53,12 +70,12 @@
<style lang="less" scoped>
.public-bounced {
+ width: 75%;
z-index: 999;
- position: fixed;
- top: 50%;
- left: 50%;
+ position: absolute;
+ bottom: 5%;
+ left: 15%;
background-color: #002432;
- margin: 1% auto;
border: 1px #9fc5c8 solid;
.public-bounced-title {
@@ -82,17 +99,23 @@
}
.public-bounced-content {
+ margin: 15px auto;
display: flex;
- align-items: center;
+ //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%;
}
}
-
}
</style>
--
Gitblit v1.8.0