From dbc1ed9ade5f26e77d2551dd2c79ece341b02cd8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 11:43:44 +0800
Subject: [PATCH] 弹框问题修改
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 72 +++++++++++++----------------------
1 files changed, 27 insertions(+), 45 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8e57e7d..b9f66ff 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,6 +1,6 @@
<template>
- <div class="public-bounced" v-drag v-if="flag">
- <div class="public-bounced-title">
+ <div class="public-bounced" v-if="flag">
+ <div class="public-bounced-title" draggable="true" @dragstart="drag($event)">
<span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
@@ -12,43 +12,20 @@
<public-table v-if="value === 'gufei'"
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
+ :value="value"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ </public-chart>
</div>
</div>
<div class="public-bounced-content-right">
<public-video></public-video>
</div>
</div>
- <!-- <el-dialog-->
- <!-- :visible.sync="flag"-->
- <!-- width="70%"-->
- <!-- v-drag-->
- <!-- :modal="false">-->
- <!-- <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"-->
- <!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div class="public-bounced-content-right">-->
- <!-- <public-video></public-video>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- </el-dialog>-->
</div>
</template>
<script>
-
import '@/components/BaseNav/SolidWaste/directive/dir'
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
@@ -58,6 +35,7 @@
export default {
name: 'PublicBounced',
components: {
+ // Echarts
PublicTabs,
PublicTable,
PublicChart,
@@ -74,10 +52,14 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getWasteWaterMonitoring: []
+ getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
+ drag (event) {
+ console.log(event)
+ },
closePopup () {
this.flag = false
},
@@ -92,19 +74,20 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, value) {
+ setGasData (data, dataDetails, GasHourData, value) {
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
- // console.log(dataDetails)
+ this.getQueryOnlineMonData = GasHourData
+ console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, drawData, value) {
+ setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getWasteWaterMonitoring = drawData
- console.log(drawData)
+ this.getQueryOnlineMonData = hourData
+ // console.log(drawData)
this.getWasteWaterMonitoringDetails = dataDetail
this.displayContentTitle = dataWater.Name
this.flag = true
@@ -116,18 +99,16 @@
<style lang="less" scoped>
.public-bounced {
- width: 10rem;
- //height: 2.6rem;
- //width: 70vw;
- //height: 30vh;
z-index: 999;
position: absolute;
- top: 5%;
- left: 5%;
+ top: 15%;
+ left: 20%;
background-color: #002432;
border: 1px #9fc5c8 solid;
.public-bounced-title {
+ //cursor: pointer;
+ cursor: move;
height: 0.1rem;
border: 1px #a4c0d8 solid;
padding: 10px 0;
@@ -150,17 +131,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: 6.8rem;
+ //width: 4.8rem;
}
.public-bounced-content-right {
- width: 3rem;
+ //width: 3rem;
+ margin-left: 0.1rem;
}
}
}
--
Gitblit v1.8.0