From 7cb769fa01008d3ad0d5ec3cf3ad56c0156f9153 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 29 三月 2021 18:31:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index dab29fe..152f458 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,14 +1,17 @@
<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">
+ <GasTable :displayContent="displayContent"></GasTable>
+ <GasECharts></GasECharts>
+ </div>
+ <div class="public-bounced-content-right">
+ <GasVideo></GasVideo>
+ </div>
</div>
</div>
</template>
@@ -16,18 +19,24 @@
<script>
import '@/components/BaseNav/SolidWaste/directive'
+import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
+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 PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
+ components: {
+ // GasTabs,
+ GasTable,
+ GasECharts,
+ GasVideo
+ },
data () {
return {
displayContent: [],
flag: false
}
- },
- components: {
- PopupGas
},
methods: {
setData (data) {
@@ -43,18 +52,14 @@
<style lang="less" scoped>
.public-bounced {
- width: 80%;
- height: 450px;
z-index: 999;
- position: absolute;
- top: 25%;
- left: 10%;
+ position: fixed;
+ top: 50%;
+ left: 50%;
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,20 +80,14 @@
}
.public-bounced-content {
- width: 100%;
- height: 100%;
display: flex;
align-items: center;
justify-content: space-around;
+
.public-bounced-content-left {
- width: 48%;
- height: 400px;
- border: 1px red solid;
}
+
.public-bounced-content-right {
- width: 48%;
- height: 400px;
- border: 1px red solid;
}
}
--
Gitblit v1.8.0