From a96e7a6704cb34ece8835066ff9f069014062e3d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 30 三月 2021 21:32:36 +0800
Subject: [PATCH] 文件合并方法
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 9bc2d71..0b78c9c 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,8 +6,9 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTable :displayContent="displayContent"></GasTable>
- <GasECharts></GasECharts>
+ <GasTab :displayContent="displayContent"></GasTab>
+ <!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
+ <!-- <GasECharts v-else></GasECharts>-->
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -18,16 +19,18 @@
<script>
-import '@/components/BaseNav/SolidWaste/directive'
-import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+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'
export default {
name: 'PublicBounced',
components: {
- GasTable,
- GasECharts,
+ GasTab,
+ // PublicTable,
+ // GasECharts,
GasVideo
},
data () {
@@ -40,6 +43,7 @@
setData (data) {
this.displayContent = data
this.flag = true
+ // this.value = value
},
closePopup () {
this.flag = false
@@ -50,12 +54,12 @@
<style lang="less" scoped>
.public-bounced {
+ width: 75%;
z-index: 999;
- position: fixed;
- top: 50%;
- left: 50%;
- //transform: translate(-50%, -50%);
- background-color: #0f1432;
+ position: absolute;
+ bottom: 5%;
+ left: 15%;
+ background-color: #002432;
border: 1px #9fc5c8 solid;
.public-bounced-title {
@@ -64,7 +68,6 @@
align-items: center;
justify-content: space-between;
padding: 5px 0;
- background-color: #002433;
span {
color: #f4f7ff;
@@ -80,19 +83,19 @@
}
.public-bounced-content {
+ margin: 15px auto;
display: flex;
align-items: center;
justify-content: space-around;
- padding: 12px;
.public-bounced-content-left {
- //flex: 1;
- flex-direction: column;
- margin-right: 13px;
+ width: 48%;
+ height: 100%;
}
.public-bounced-content-right {
- //flex: 1;
+ width: 48%;
+ height: 100%;
}
}
--
Gitblit v1.8.0