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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 27b278a..883b7d2 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -2,6 +2,8 @@
<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)">
<span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
@@ -15,8 +17,7 @@
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
- :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
->
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
</public-chart>
</div>
</div>
@@ -28,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'
@@ -40,7 +38,7 @@
export default {
name: 'PublicBounced',
components: {
- // Echarts,
+ // Echarts
PublicTabs,
PublicTable,
PublicChart,
@@ -62,6 +60,9 @@
}
},
methods: {
+ drag (event) {
+ console.log(event)
+ },
closePopup () {
this.flag = false
},
@@ -107,6 +108,8 @@
left: 20%;
.public-bounced-title {
+ //cursor: pointer;
+ cursor: move;
height: 0.1rem;
padding: 10px 0;
display: flex;
--
Gitblit v1.8.0