From 6d4e23a29f40b4739aa46436e5b703ecde4b39aa Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 11:37:00 +0800
Subject: [PATCH] table数据
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 5a43649..47b7762 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-show="flag">
+ <div class="public-bounced-title panel-title" ref="publicBounced">
<span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
@@ -15,7 +14,10 @@
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
+ ref="PublicChart"
+ >
</public-chart>
</div>
</div>
@@ -28,18 +30,15 @@
<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'
-import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-import PublicChart from './GasComponents/PublicChart'
+import '@/utils/dragBoxes'
+import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+import PublicChart from './common/PublicChart'
export default {
name: 'PublicBounced',
components: {
- // Echarts,
PublicTabs,
PublicTable,
PublicChart,
@@ -56,8 +55,16 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
+ // getGasQueryOnlineMonData: []
}
+ },
+ mounted () {
+ // this.$nextTick(() => {
+ // console.log(this.$refs.publicBounced)
+ console.log(this.$refs.PublicChart)
+ // })
},
methods: {
closePopup () {
@@ -74,15 +81,18 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
+ // console.log(this.$refs)
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
- // console.log(dataDetails)
+ this.getQueryOnlineMonData = GasHourData
+ this.ManualData = ManualData
+ // 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
@@ -98,16 +108,14 @@
<style lang="less" scoped>
.public-bounced {
- z-index: 999;
+ z-index: 2000;
position: absolute;
top: 15%;
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;
@@ -120,11 +128,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