From f7ba8b6aab4a763feee8938e93c97079b52baf1d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 30 三月 2021 12:30:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 003f1dc..9bc2d71 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,19 +1,35 @@
<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">
- <span>鍐呭</span>
+ <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>
<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'
+
export default {
name: 'PublicBounced',
+ components: {
+ GasTable,
+ GasECharts,
+ GasVideo
+ },
data () {
return {
displayContent: [],
@@ -34,23 +50,21 @@
<style lang="less" scoped>
.public-bounced {
- width: 80%;
- height: 450px;
z-index: 999;
- position: absolute;
- top: 25%;
- left: 10%;
- background-color: #002432;
- margin: 1% auto;
- border: 1px #a5bfd8 solid;
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ //transform: translate(-50%, -50%);
+ background-color: #0f1432;
+ border: 1px #9fc5c8 solid;
.public-bounced-title {
- width: 100%;
border: 1px #a4c0d8 solid;
display: flex;
align-items: center;
justify-content: space-between;
padding: 5px 0;
+ background-color: #002433;
span {
color: #f4f7ff;
@@ -65,5 +79,22 @@
}
}
+ .public-bounced-content {
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ padding: 12px;
+
+ .public-bounced-content-left {
+ //flex: 1;
+ flex-direction: column;
+ margin-right: 13px;
+ }
+
+ .public-bounced-content-right {
+ //flex: 1;
+ }
+ }
+
}
</style>
--
Gitblit v1.8.0