From 188abb2598a9253b19762d0cf4c4b36db64bfe8b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 18:54:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 883b7d2..18a3f0d 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,9 +1,6 @@
<template>
<div class="public-bounced map-background" v-drag v-if="flag">
- <!-- <Echarts></Echarts>-->
- <div class="public-bounced-title panel-title">
- <div class="public-bounced" v-if="flag">
- <div class="public-bounced-title" draggable="true" @dragstart="drag($event)">
+ <div class="public-bounced-title panel-title" ref="publicBounced">
<span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
@@ -17,7 +14,8 @@
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ >
</public-chart>
</div>
</div>
@@ -29,7 +27,8 @@
</template>
<script>
-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'
@@ -38,7 +37,7 @@
export default {
name: 'PublicBounced',
components: {
- // Echarts
+ // Echarts,
PublicTabs,
PublicTable,
PublicChart,
@@ -60,9 +59,6 @@
}
},
methods: {
- drag (event) {
- console.log(event)
- },
closePopup () {
this.flag = false
},
@@ -104,11 +100,10 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 15%;
+ top: 45%;
left: 20%;
.public-bounced-title {
- //cursor: pointer;
cursor: move;
height: 0.1rem;
padding: 10px 0;
@@ -123,14 +118,15 @@
}
i {
- color: #C0C4CC;
- margin: 0 15px;
- font-size: 22px;
- cursor: pointer;
+ color: #C0C4CC;
+ margin: 0 15px;
+ font-size: 22px;
+ cursor: pointer;
}
- i:hover{
- color: #00fff6;
- }
+
+ i:hover {
+ color: #00fff6;
+ }
}
.public-bounced-content {
--
Gitblit v1.8.0