From 2ce343785f7adc709fdc1b843fe42c64129280d6 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 29 三月 2021 18:29:06 +0800
Subject: [PATCH] 添加弹窗模块边框角高亮
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8326dfa..29294dc 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,28 +1,43 @@
<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>-->
- <popup-gas></popup-gas>
+ <div class="public-bounced-content-left">
+ <GasTable></GasTable>
+ <GasECharts></GasECharts>
+<!-- <GasTabs></GasTabs>-->
+ </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'
+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'
+
export default {
name: 'PublicBounced',
+ components: {
+ // GasTabs,
+ GasTable,
+ GasECharts,
+ GasVideo
+ },
data () {
return {
displayContent: [],
flag: false
}
- },
- components: {
- PopupGas
},
methods: {
setData (data) {
@@ -46,7 +61,7 @@
left: 10%;
background-color: #002432;
margin: 1% auto;
- border: 1px #a5bfd8 solid;
+ border: 1px #9fc5c8 solid;
.public-bounced-title {
width: 100%;
@@ -69,5 +84,24 @@
}
}
+ .public-bounced-content {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ //align-items: center;
+ justify-content: space-around;
+
+ .public-bounced-content-left {
+ //flex: 1;
+ width: 48%;
+ height: 400px;
+ }
+
+ .public-bounced-content-right {
+ width: 48%;
+ height: 400px;
+ }
+ }
+
}
</style>
--
Gitblit v1.8.0