From ac1c7ea6d29679b221847db076044caeaf27b84c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 11:27:50 +0800
Subject: [PATCH] 废水图表日数据功能添加
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 29f6209..abc4da6 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,7 +1,6 @@
<template>
- <div class="public-bounced" v-drag v-if="flag">
- <!-- <Echarts></Echarts>-->
- <div class="public-bounced-title">
+ <div class="public-bounced map-background" v-drag v-if="flag">
+ <div class="public-bounced-title panel-title" ref="publicBounced">
<span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
@@ -16,8 +15,7 @@
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
- :getGasQueryOnlineMonData = 'getGasQueryOnlineMonData'
->
+ >
</public-chart>
</div>
</div>
@@ -30,9 +28,7 @@
<script>
-// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
-
-import '@/components/BaseNav/SolidWaste/directive/dir'
+import '@/utils/dragBoxes'
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
@@ -41,7 +37,6 @@
export default {
name: 'PublicBounced',
components: {
- // Echarts,
PublicTabs,
PublicTable,
PublicChart,
@@ -58,8 +53,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: [],
- getGasQueryOnlineMonData: []
+ getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
@@ -80,13 +75,13 @@
setGasData (data, dataDetails, GasHourData, value) {
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
- this.getGasQueryOnlineMonData = GasHourData
- // console.log(dataDetails)
+ this.getQueryOnlineMonData = GasHourData
+ console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
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
@@ -102,16 +97,14 @@
<style lang="less" scoped>
.public-bounced {
- z-index: 999;
+ z-index: 2000;
position: absolute;
- top: 15%;
+ top: 45%;
left: 20%;
- background-color: #002432;
- border: 1px #9fc5c8 solid;
.public-bounced-title {
+ cursor: move;
height: 0.1rem;
- border: 1px #a4c0d8 solid;
padding: 10px 0;
display: flex;
align-items: center;
@@ -124,11 +117,15 @@
}
i {
- color: white;
+ color: #C0C4CC;
margin: 0 15px;
font-size: 22px;
cursor: pointer;
}
+
+ i:hover {
+ color: #00fff6;
+ }
}
.public-bounced-content {
--
Gitblit v1.8.0