From 636bc7b594860875c49cf8d6fb6ed2a7e4520d62 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 15:13:49 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index dab29fe..8756e92 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,38 +1,50 @@
<template>
- <div class="public-bounced" v-show="flag">
+ <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>
<div class="public-bounced-content">
- <div class="public-bounced-content-left"></div>
- <div class="public-bounced-content-right"></div>
-<!-- <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>-->
+ <PublicTable></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 '@/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 PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
+ components: {
+ GasTab,
+ PublicTable,
+ // GasECharts,
+ GasVideo
+ },
data () {
return {
displayContent: [],
flag: false
}
},
- components: {
- PopupGas
- },
methods: {
setData (data) {
this.displayContent = data
this.flag = true
+ // this.value = value
},
closePopup () {
this.flag = false
@@ -43,18 +55,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 #9fc5c8 solid;
.public-bounced-title {
- width: 100%;
border: 1px #a4c0d8 solid;
display: flex;
align-items: center;
@@ -75,22 +84,23 @@
}
.public-bounced-content {
- width: 100%;
- height: 100%;
+ margin: 15px auto;
display: flex;
- align-items: center;
+ //align-items: center;
justify-content: space-around;
+ padding: 10px;
+
.public-bounced-content-left {
- width: 48%;
- height: 400px;
- border: 1px red solid;
+ flex: 3;
+ height: 100%;
+ margin-right: 10px;
}
+
.public-bounced-content-right {
- width: 48%;
- height: 400px;
- border: 1px red solid;
+ flex: 2;
+ //width: 48%;
+ height: 100%;
}
}
-
}
</style>
--
Gitblit v1.8.0