From 3d987417414022bcef8dbee7b165e2c4a36ad6aa Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 12:34:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index d3e18d3..883b7d2 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,7 +1,9 @@
<template>
- <div class="public-bounced" v-drag v-if="flag">
+ <div class="public-bounced map-background" v-drag v-if="flag">
<!-- <Echarts></Echarts>-->
- <div class="public-bounced-title">
+ <div class="public-bounced-title panel-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>
@@ -27,9 +29,6 @@
</template>
<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'
@@ -57,9 +56,13 @@
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
+ drag (event) {
+ console.log(event)
+ },
closePopup () {
this.flag = false
},
@@ -74,15 +77,16 @@
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, hourData, value) {
+ setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
this.getQueryOnlineMonData = hourData
@@ -98,16 +102,15 @@
<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: pointer;
+ cursor: move;
height: 0.1rem;
- border: 1px #a4c0d8 solid;
padding: 10px 0;
display: flex;
align-items: center;
@@ -120,11 +123,14 @@
}
i {
- color: white;
- margin: 0 15px;
- font-size: 22px;
- cursor: pointer;
+ color: #C0C4CC;
+ margin: 0 15px;
+ font-size: 22px;
+ cursor: pointer;
}
+ i:hover{
+ color: #00fff6;
+ }
}
.public-bounced-content {
--
Gitblit v1.8.0