From 10b043568dbe047eface8e417bfc3716e7148fbc Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 08 四月 2021 17:40:35 +0800
Subject: [PATCH] echarts小时数据的修改
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 111 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 40 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 1a63928..91ae6e2 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,19 +1,24 @@
<template>
- <div class="public-bounced" v-if="flag">
+ <div class="public-bounced" v-drag v-if="flag">
<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'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
- <GasECharts v-else></GasECharts>
- <!-- <PublicTable></PublicTable>-->
-<!-- <GasECharts></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"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
+ </div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <public-video></public-video>
</div>
</div>
</div>
@@ -22,41 +27,65 @@
<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 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 {
- displayContent: [],
- flag: false
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
+ flag: false,
+ value: '',
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getQueryOnlineMonData: []
}
},
methods: {
- setData (data, value) {
- console.log(data)
- console.log(value)
- this.displayContent = data
- this.flag = true
- this.value = value
- console.log(this.flag)
- },
- // setData (data) {
- // this.displayContent = data
- // this.flag = true
- // // this.value = value
- // },
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
+ },
+ 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, hourData, value) {
+ this.setWasteWaterdata = dataWater
+ // console.log(data)
+ this.getQueryOnlineMonData = hourData
+ // console.log(drawData)
+ this.getWasteWaterMonitoringDetails = dataDetail
+ this.displayContentTitle = dataWater.Name
+ this.flag = true
+ this.value = value
}
}
}
@@ -64,20 +93,26 @@
<style lang="less" scoped>
.public-bounced {
- width: 75%;
+ width: 8rem;
+ //height: 2.6rem;
+ //width: 70vw;
+ //height: 30vh;
z-index: 999;
position: absolute;
- bottom: 5%;
+ //bottom: 2rem;
+ //left: 5rem;
+ top: 15%;
left: 15%;
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;
@@ -89,26 +124,22 @@
color: white;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
}
}
.public-bounced-content {
- margin: 15px auto;
+ margin: 0.2rem auto !important;
display: flex;
//align-items: center;
justify-content: space-around;
- padding: 10px;
.public-bounced-content-left {
- flex: 3;
- height: 100%;
- margin-right: 10px;
+ width: 4.8rem;
}
.public-bounced-content-right {
- flex: 2;
- //width: 48%;
- height: 100%;
+ width: 3rem;
}
}
}
--
Gitblit v1.8.0