From 40807d1405147455b3da38f5f89f841314c0973d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 30 三月 2021 12:42:19 +0800
Subject: [PATCH] 弹框文件修改
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 36 +++++++++---------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 27 ++++++-------
2 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 12f1a91..2c878b8 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -1,23 +1,23 @@
<template>
<div class="public-table">
- <el-table
- :data="tableData"
- style="width: 100%">
- <el-table-column
- prop="date"
- label="鏃ユ湡"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="濮撳悕"
- width="180">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍦板潃">
- </el-table-column>
- </el-table>
+ <table border="1">
+ <tr>
+ <th>111</th>
+ <th>111</th>
+ <th>111</th>
+ <th>111</th>
+ <th>111</th>
+ <th>111</th>
+ </tr>
+ <tr>
+ <td>4444444444</td>
+ <td>4444444444</td>
+ <td>4444444444</td>
+ <td>4444444444</td>
+ <td>4444444444</td>
+ <td>4444444444</td>
+ </tr>
+ </table>
</div>
</template>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 9bc2d71..275b86e 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'"></PublicTable>
+ <GasECharts v-else></GasECharts>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -19,14 +20,16 @@
<script>
import '@/components/BaseNav/SolidWaste/directive'
-import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
+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,
+ GasTab,
+ PublicTable,
GasECharts,
GasVideo
},
@@ -37,9 +40,10 @@
}
},
methods: {
- setData (data) {
+ setData (data, value) {
this.displayContent = data
this.flag = true
+ this.value = value
},
closePopup () {
this.flag = false
@@ -51,11 +55,10 @@
<style lang="less" scoped>
.public-bounced {
z-index: 999;
- position: fixed;
+ position: absolute;
top: 50%;
left: 50%;
- //transform: translate(-50%, -50%);
- background-color: #0f1432;
+ background-color: #002432;
border: 1px #9fc5c8 solid;
.public-bounced-title {
@@ -64,7 +67,6 @@
align-items: center;
justify-content: space-between;
padding: 5px 0;
- background-color: #002433;
span {
color: #f4f7ff;
@@ -83,18 +85,13 @@
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>
+</style>
\ No newline at end of file
--
Gitblit v1.8.0