From a19ce43fb54c9d5e3aeb237ca3b2ca2f2abe0ba8 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 10:38:08 +0800
Subject: [PATCH] 废水图标完善
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 80 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 9d03215..d635356 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,36 +1,36 @@
<template>
- <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>
+ <div class="public-bounced map-background" v-drag v-show="flag">
+ <div class="public-bounced-title panel-title" ref="publicBounced">
+ <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"
+ :value="value"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
+ ref="PublicChart"
+ >
+ </public-chart>
</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"
- :value="value"
- :getQueryOnlineMonData="getQueryOnlineMonData"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
- </public-chart>
- </div>
- </div>
- <div class="public-bounced-content-right">
- <public-video></public-video>
- </div>
- </div>
+ </div>
+ <div class="public-bounced-content-right">
+ <public-video></public-video>
+ </div>
+ </div>
</div>
</template>
<script>
-// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
-
-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'
@@ -39,7 +39,6 @@
export default {
name: 'PublicBounced',
components: {
- // Echarts
PublicTabs,
PublicTable,
PublicChart,
@@ -56,9 +55,16 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
// getGasQueryOnlineMonData: []
}
+ },
+ mounted () {
+ // this.$nextTick(() => {
+ // console.log(this.$refs.publicBounced)
+ console.log(this.$refs.PublicChart)
+ // })
},
methods: {
closePopup () {
@@ -75,11 +81,13 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, GasHourData, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
+ // console.log(this.$refs)
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
- console.log(this.getQueryOnlineMonData)
+ this.ManualData = ManualData
+ // console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
this.value = value
@@ -100,16 +108,14 @@
<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: move;
height: 0.1rem;
- border: 1px #a4c0d8 solid;
padding: 10px 0;
display: flex;
align-items: center;
@@ -122,11 +128,15 @@
}
i {
- color: white;
+ color: #C0C4CC;
margin: 0 15px;
font-size: 22px;
cursor: pointer;
}
+
+ i:hover {
+ color: #00fff6;
+ }
}
.public-bounced-content {
--
Gitblit v1.8.0