From dd48001d9793e5d338d38feebee5fc44e1296005 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 15:33:24 +0800
Subject: [PATCH] 公共弹框修改 固废内容修改
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8326dfa..9d1812d 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,34 +1,60 @@
<template>
- <div class="public-bounced" v-show="flag">
+ <div class="public-bounced" 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">
-<!-- <span>鍐呭</span>-->
- <popup-gas></popup-gas>
+ <div class="public-bounced-content-left">
+ <GasTab :displayContent="displayContent"></GasTab>
+ <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+ <GasECharts v-else></GasECharts>
+ <!-- <PublicTable></PublicTable>-->
+ <!-- <GasECharts></GasECharts>-->
+ </div>
+ <div class="public-bounced-content-right">
+ <GasVideo></GasVideo>
+ </div>
</div>
</div>
</template>
<script>
-import PopupGas from '@components/flueGas/popup-gas'
+
+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'
+
export default {
name: 'PublicBounced',
+ components: {
+ GasTab,
+ PublicTable,
+ GasECharts,
+ GasVideo
+ },
data () {
return {
displayContent: [],
flag: false
}
},
- components: {
- PopupGas
- },
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
}
@@ -38,18 +64,15 @@
<style lang="less" scoped>
.public-bounced {
- width: 80%;
- height: 450px;
+ width: 75%;
z-index: 999;
position: absolute;
- top: 25%;
- left: 10%;
+ bottom: 5%;
+ left: 15%;
background-color: #002432;
- margin: 1% auto;
- border: 1px #a5bfd8 solid;
+ border: 1px #9fc5c8 solid;
.public-bounced-title {
- width: 100%;
border: 1px #a4c0d8 solid;
display: flex;
align-items: center;
@@ -69,5 +92,21 @@
}
}
+ .public-bounced-content {
+ margin: 15px auto;
+ display: flex;
+ //align-items: center;
+ justify-content: space-around;
+
+ .public-bounced-content-left {
+ width: 48%;
+ height: 100%;
+ }
+
+ .public-bounced-content-right {
+ width: 48%;
+ height: 100%;
+ }
+ }
}
</style>
--
Gitblit v1.8.0