From 3cc3e812218257698771b5e33df8beeb19cdda8d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 17:15:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 100 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 20 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 73a8df7..af891c5 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,60 +1,117 @@
<template>
- <div class="public-bounced" v-draw v-if="flag">
+ <div class="public-bounced" v-drag 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">
- <GasTab :displayContentTab="displayContentTab" ></GasTab>
+ <public-tabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'"></PublicTable>
- <GasECharts v-else></GasECharts>
+ <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>
+<!-- <el-dialog-->
+<!-- :visible.sync="flag"-->
+<!-- width="70%"-->
+<!-- v-drag-->
+<!-- :modal="false">-->
+<!-- <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">-->
+<!-- <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"-->
+<!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="public-bounced-content-right">-->
+<!-- <public-video></public-video>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </el-dialog>-->
</div>
</template>
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+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 GasTabs from './GasComponents/GasTabs'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- GasTab,
+ PublicTabs,
PublicTable,
- GasECharts,
- GasVideo
+ PublicChart,
+ PublicVideo
},
data () {
return {
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
- flag: false
+ displayContentTable: '',
+ flag: false,
+ value: '',
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getWasteWaterMonitoring: []
}
},
methods: {
- setData (data, value) {
- data.forEach((item, index) => {
- console.log(item.StoragePlaceName)
+ closePopup () {
+ this.flag = false
+ },
+ setData (dataBasic, dataDetailed, value) {
+ this.flag = true
+ this.value = value
+ dataBasic.forEach(item => {
this.displayContentTitle = item.StoragePlaceName
})
- this.displayContentTab = data
+ 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
}
}
}
@@ -63,6 +120,8 @@
<style lang="less" scoped>
.public-bounced {
width: 75%;
+ //height: 520px;
+ height: 40%;
z-index: 999;
position: absolute;
bottom: 5%;
@@ -87,11 +146,12 @@
color: white;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
}
}
.public-bounced-content {
- margin: 15px auto;
+ margin: 15px 0;
display: flex;
//align-items: center;
justify-content: space-around;
--
Gitblit v1.8.0