From 2ccfcb5a17c31ade0b532d7cc77c9a65aed1343c Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 09:55:05 +0800
Subject: [PATCH] echarts实时数据
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 80 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 5a43649..38a75de 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,7 +56,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonHourData: [],
+ getQueryOnlineMonDateData: []
}
},
methods: {
@@ -82,12 +83,15 @@
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, hourData, value) {
+ setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getQueryOnlineMonData = hourData
+ this.getWasteWaterMonitoringDetails = dataDetail // 鏄庣粏琛ㄦ暟鎹�
+ // console.log(dataDetail)
+ this.getQueryOnlineMonHourData = hourData // 灏忔椂鏁版嵁
// console.log(drawData)
- this.getWasteWaterMonitoringDetails = dataDetail
+ this.getQueryOnlineMonDateData = dateData // 鏃ユ暟鎹�
+ // console.log(dateData)
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
@@ -104,6 +108,8 @@
left: 20%;
background-color: #002432;
border: 1px #9fc5c8 solid;
+ width: 6rem;
+ height: 3rem;
.public-bounced-title {
height: 0.1rem;
--
Gitblit v1.8.0