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 | 108 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 64 insertions(+), 44 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 550e6e8..9bc2d71 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,16 +1,35 @@
<template>
- <div class="public-bounced" v-show="flag">
- <div class="popup_title">{{ displayContent.Name }}</div>
- <div class="popup_bottom">
- <button @click="closePopup">纭畾</button>
+ <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">
+ <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: [],
@@ -29,52 +48,53 @@
}
</script>
-<style scoped>
+<style lang="less" scoped>
.public-bounced {
- width: 80%;
- z-index: 499;
- position: absolute;
- top: 15%;
- left: 10%;
- background-color: rgba(128, 128, 128, 0.507);
- padding: 1%;
- border-radius: 20px;
- margin: 10% auto;
-}
+ z-index: 999;
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ //transform: translate(-50%, -50%);
+ background-color: #0f1432;
+ border: 1px #9fc5c8 solid;
-.popup_title {
- text-align: center;
- font-weight: 600;
- font-size: 30px;
-}
+ .public-bounced-title {
+ border: 1px #a4c0d8 solid;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 5px 0;
+ background-color: #002433;
-.popup_center {
- padding: 10%;
- font-size: 20px;
-}
+ span {
+ color: #f4f7ff;
+ margin: 0 15px;
+ font-size: 14px;
+ }
-.popup_bottom {
- display: flex;
- justify-content: space-around;
-}
+ i {
+ color: white;
+ margin: 0 15px;
+ font-size: 22px;
+ }
+ }
-button {
- width: 25%;
- height: 20%;
- padding: 2%;
- border: 1px solid gray;
- border-radius: 10px;
-}
+ .public-bounced-content {
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ padding: 12px;
-button:nth-child(1) {
- background-color: orangered;
- color: white;
- font-size: 20px;
-}
+ .public-bounced-content-left {
+ //flex: 1;
+ flex-direction: column;
+ margin-right: 13px;
+ }
-button:nth-child(2) {
- background-color: gray;
- color: black;
- font-size: 20px;
+ .public-bounced-content-right {
+ //flex: 1;
+ }
+ }
+
}
</style>
--
Gitblit v1.8.0