From 65e37e47da29f9d56b657faf0a30c018bbf5e560 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 09 四月 2021 11:08:59 +0800
Subject: [PATCH] 弹框样式修改-
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 7726783..5a43649 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-draw v-if="flag">
+ <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>
@@ -7,11 +8,15 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<public-tabs :displayContentTab="displayContentTab" :value="value"
- :setWasteGasdata="setWasteGasdata"></public-tabs>
+ :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"></public-chart>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
+ :value="value"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ </public-chart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -23,6 +28,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'
@@ -32,6 +39,7 @@
export default {
name: 'PublicBounced',
components: {
+ // Echarts,
PublicTabs,
PublicTable,
PublicChart,
@@ -40,15 +48,21 @@
data () {
return {
setWasteGasdata: '',
+ setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
flag: false,
value: '',
- getWasteGasDetails: []
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getQueryOnlineMonData: []
}
},
methods: {
+ closePopup () {
+ this.flag = false
+ },
setData (dataBasic, dataDetailed, value) {
this.flag = true
this.value = value
@@ -68,8 +82,15 @@
this.flag = true
this.value = value
},
- closePopup () {
- this.flag = false
+ 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
}
}
}
@@ -77,20 +98,20 @@
<style lang="less" scoped>
.public-bounced {
- width: 75%;
z-index: 999;
position: absolute;
- bottom: 5%;
- left: 15%;
+ top: 15%;
+ left: 20%;
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;
@@ -102,26 +123,23 @@
color: white;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
}
}
.public-bounced-content {
- margin: 15px auto;
+ padding: 0.1rem;
display: flex;
//align-items: center;
- justify-content: space-around;
- padding: 10px;
+ //justify-content: space-around;
.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;
+ margin-left: 0.1rem;
}
}
}
--
Gitblit v1.8.0