From 6f4d139abf9f1932833dac0dfe4caab5ab520c1a Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 09 四月 2021 09:42:47 +0800
Subject: [PATCH] 弹框内容修改
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 24 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 2307d3f..e363527 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,17 +1,25 @@
<template>
- <div class="public-bounced" v-draw v-show="flag">
+ <div class="public-bounced" v-drag v-if="flag">
+ <!-- <Echarts></Echarts>-->
<div class="public-bounced-title">
- <span>{{ displayContent.Name }}</span>
+ <span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTab :displayContent="displayContent"></GasTab>
- <PublicTable v-if="value === 'gufei'"></PublicTable>
- <GasECharts v-else></GasECharts>
+ <public-tabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
+ <div class="public-bounced-content-left-bottom">
+ <public-table v-if="value === 'gufei'"
+ :displayContentTable="displayContentTable"></public-table>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
+ :value="value"
+ :getWasteWaterMonitoring="getWasteWaterMonitoring"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
+ </div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <public-video></public-video>
</div>
</div>
</div>
@@ -19,34 +27,69 @@
<script>
-import '@/components/BaseNav/SolidWaste/directive'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
+
+import '@/components/BaseNav/SolidWaste/directive/dir'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- GasTab,
+ // Echarts
+ PublicTabs,
PublicTable,
- GasECharts,
- GasVideo
+ PublicChart,
+ PublicVideo
},
data () {
return {
- displayContent: [],
- flag: false
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
+ flag: false,
+ value: '',
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getWasteWaterMonitoring: []
}
},
methods: {
- setData (data, value) {
- this.displayContent = data
+ closePopup () {
+ this.flag = false
+ },
+ setData (dataBasic, dataDetailed, value) {
+ this.flag = true
+ this.value = value
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
this.flag = true
this.value = value
},
- closePopup () {
- this.flag = false
+ setGasData (data, dataDetails, value) {
+ this.setWasteGasdata = data
+ this.getWasteGasDetails = dataDetails
+ // console.log(dataDetails)
+ this.displayContentTitle = data.Name
+ this.flag = true
+ this.value = value
+ },
+ setWaterData (dataWater, dataDetail, drawData, value) {
+ this.setWasteWaterdata = dataWater
+ // console.log(data)
+ this.getWasteWaterMonitoring = drawData
+ // console.log(drawData)
+ this.getWasteWaterMonitoringDetails = dataDetail
+ this.displayContentTitle = dataWater.Name
+ this.flag = true
+ this.value = value
}
}
}
@@ -56,17 +99,18 @@
.public-bounced {
z-index: 999;
position: absolute;
- top: 50%;
- left: 50%;
+ top: 15%;
+ left: 20%;
background-color: #002432;
border: 1px #9fc5c8 solid;
.public-bounced-title {
+ height: 0.1rem;
border: 1px #a4c0d8 solid;
+ padding: 10px 0;
display: flex;
align-items: center;
justify-content: space-between;
- padding: 5px 0;
span {
color: #f4f7ff;
@@ -78,18 +122,23 @@
color: white;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
}
}
.public-bounced-content {
+ padding: 0.1rem;
display: flex;
- align-items: center;
- justify-content: space-around;
+ //align-items: center;
+ //justify-content: space-around;
.public-bounced-content-left {
+ //width: 4.8rem;
}
.public-bounced-content-right {
+ //width: 3rem;
+ margin-left: 0.1rem;
}
}
}
--
Gitblit v1.8.0