From bbeeffa8d3524be7e19929ecead7fe054059a373 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 15:59:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 131 ++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 46 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 550e6e8..acee023 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,26 +1,63 @@
<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-if="flag">
+ <div class="public-bounced-title">
+ <span>{{ displayContentTitle }}</span>
+ <i class="el-icon-circle-close" @click="closePopup"></i>
+ </div>
+ <div class="public-bounced-content">
+ <div class="public-bounced-content-left">
+ <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <PublicChart v-else></PublicChart>
+ </div>
+ </div>
+ <div class="public-bounced-content-right">
+ <PublicVideo></PublicVideo>
+ </div>
</div>
</div>
</template>
<script>
+import '@/components/BaseNav/SolidWaste/directive/dir'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
+
export default {
name: 'PublicBounced',
+ components: {
+ PublicTabs,
+ PublicTable,
+ PublicChart,
+ PublicVideo
+ },
data () {
return {
- displayContent: [],
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
flag: false
}
},
methods: {
- setData (data) {
- this.displayContent = data
+ setData (dataBasic, dataDetailed, value) {
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
this.flag = true
+ this.value = value
+ },
+ setGasData (data, value) {
+ this.displayContentTitle = data.Name
+ this.displayContentTab = data
+ this.flag = true
+ this.value = value
},
closePopup () {
this.flag = false
@@ -29,52 +66,54 @@
}
</script>
-<style scoped>
+<style lang="less" scoped>
.public-bounced {
- width: 80%;
- z-index: 499;
+ width: 75%;
+ z-index: 999;
position: absolute;
- top: 15%;
- left: 10%;
- background-color: rgba(128, 128, 128, 0.507);
- padding: 1%;
- border-radius: 20px;
- margin: 10% auto;
-}
+ bottom: 5%;
+ left: 15%;
+ background-color: #002432;
+ 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;
-.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 {
+ margin: 15px auto;
+ display: flex;
+ //align-items: center;
+ justify-content: space-around;
+ padding: 10px;
-button:nth-child(1) {
- background-color: orangered;
- color: white;
- font-size: 20px;
-}
+ .public-bounced-content-left {
+ flex: 3;
+ height: 100%;
+ margin-right: 10px;
+ }
-button:nth-child(2) {
- background-color: gray;
- color: black;
- font-size: 20px;
+ .public-bounced-content-right {
+ flex: 2;
+ //width: 48%;
+ height: 100%;
+ }
+ }
}
</style>
--
Gitblit v1.8.0