From 375d6a7318aeac9b3e11dc65b96c9b50abd3686c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期五, 09 四月 2021 15:45:22 +0800
Subject: [PATCH] echarts功能完善
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 4c186ce..c32bc19 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,6 @@
<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>
@@ -13,7 +14,8 @@
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
- :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getQueryOnlineMonHourData="getQueryOnlineMonHourData"
+ :getQueryOnlineMonDateData="getQueryOnlineMonDateData"
:getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
</public-chart>
</div>
@@ -27,6 +29,8 @@
<script>
+// 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'
@@ -36,6 +40,7 @@
export default {
name: 'PublicBounced',
components: {
+ // Echarts
PublicTabs,
PublicTable,
PublicChart,
@@ -52,7 +57,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonHourData: [],
+ getQueryOnlineMonDateData: []
}
},
methods: {
@@ -78,12 +84,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
@@ -94,16 +103,10 @@
<style lang="less" scoped>
.public-bounced {
- width: 8rem;
- //height: 2.6rem;
- //width: 70vw;
- //height: 30vh;
z-index: 999;
position: absolute;
- //bottom: 2rem;
- //left: 5rem;
top: 15%;
- left: 15%;
+ left: 20%;
background-color: #002432;
border: 1px #9fc5c8 solid;
@@ -130,17 +133,18 @@
}
.public-bounced-content {
- margin: 0.2rem auto !important;
+ padding: 0.1rem;
display: flex;
//align-items: center;
- justify-content: space-around;
+ //justify-content: space-around;
.public-bounced-content-left {
- width: 4.8rem;
+ //width: 4.8rem;
}
.public-bounced-content-right {
- width: 3rem;
+ //width: 3rem;
+ margin-left: 0.1rem;
}
}
}
--
Gitblit v1.8.0