From 8bb5942235c86ea771c4215a77c46b1245c30a93 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 11:31:58 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 84 ++++++++++++++++++++----------------------
1 files changed, 40 insertions(+), 44 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 38a75de..9d03215 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,49 +1,49 @@
<template>
<div class="public-bounced" v-drag v-if="flag">
- <Echarts></Echarts>
- <!-- <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"-->
- <!-- :value="value"-->
- <!-- :getQueryOnlineMonData="getQueryOnlineMonData"-->
- <!-- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">-->
- <!-- </public-chart>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div class="public-bounced-content-right">-->
- <!-- <public-video></public-video>-->
- <!-- </div>-->
- <!-- </div>-->
+<!-- <Echarts></Echarts>-->
+ <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"
+ :value="value"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ </public-chart>
+ </div>
+ </div>
+ <div class="public-bounced-content-right">
+ <public-video></public-video>
+ </div>
+ </div>
</div>
</template>
<script>
-import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
+// 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 PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-// import PublicChart from './GasComponents/PublicChart'
+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: {
- Echarts
- // PublicTabs,
- // PublicTable,
- // PublicChart,
- // PublicVideo
+ // Echarts
+ PublicTabs,
+ PublicTable,
+ PublicChart,
+ PublicVideo
},
data () {
return {
@@ -56,8 +56,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonHourData: [],
- getQueryOnlineMonDateData: []
+ getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
@@ -75,10 +75,11 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, value) {
+ setGasData (data, dataDetails, GasHourData, value) {
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
- // console.log(dataDetails)
+ this.getQueryOnlineMonData = GasHourData
+ console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
this.value = value
@@ -86,12 +87,9 @@
setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getWasteWaterMonitoringDetails = dataDetail // 鏄庣粏琛ㄦ暟鎹�
- // console.log(dataDetail)
- this.getQueryOnlineMonHourData = hourData // 灏忔椂鏁版嵁
+ this.getQueryOnlineMonData = hourData
// console.log(drawData)
- this.getQueryOnlineMonDateData = dateData // 鏃ユ暟鎹�
- // console.log(dateData)
+ this.getWasteWaterMonitoringDetails = dataDetail
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
@@ -108,8 +106,6 @@
left: 20%;
background-color: #002432;
border: 1px #9fc5c8 solid;
- width: 6rem;
- height: 3rem;
.public-bounced-title {
height: 0.1rem;
--
Gitblit v1.8.0