From faadb3a39e89b2cb7a00e81e3778f480f1f09998 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 14 四月 2021 17:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 78 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index c32bc19..db3efff 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,26 +1,27 @@
<template>
- <div class="public-bounced" v-drag v-if="flag">
- <!-- <Echarts></Echarts>-->
- <div class="public-bounced-title">
+ <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"
+ <public-tabs :setSolidWaste="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"
- :getQueryOnlineMonHourData="getQueryOnlineMonHourData"
- :getQueryOnlineMonDateData="getQueryOnlineMonDateData"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
+ ref="PublicChart"
+ >
</public-chart>
</div>
</div>
- <div class="public-bounced-content-right">
+ <div class="public-bounced-content-right" >
<public-video></public-video>
</div>
</div>
@@ -29,18 +30,15 @@
<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'
-import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-import PublicChart from './GasComponents/PublicChart'
+import '@/utils/dragBoxes'
+import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+import PublicChart from './common/PublicChart'
export default {
name: 'PublicBounced',
components: {
- // Echarts
PublicTabs,
PublicTable,
PublicChart,
@@ -48,38 +46,39 @@
},
data () {
return {
- setWasteGasdata: '',
- setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
flag: false,
value: '',
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonHourData: [],
- getQueryOnlineMonDateData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
closePopup () {
this.flag = false
},
- setData (dataBasic, dataDetailed, value) {
+ // 鍥哄簾鐩稿叧淇℃伅璁剧疆
+ setData (title, dataBasic, dataDetailed, value) {
this.flag = true
this.value = value
- dataBasic.forEach(item => {
- this.displayContentTitle = item.StoragePlaceName
- })
- this.displayContentTab = dataBasic
- this.displayContentTable = dataDetailed
- this.flag = true
- this.value = value
+ this.displayContentTitle = title
+ this.displayContentTab = dataBasic[0]
+ this.displayContentTable = dataDetailed[0]
},
- setGasData (data, dataDetails, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
+ // console.log(this.$refs)
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
- // console.log(dataDetails)
+ this.getQueryOnlineMonData = GasHourData
+ this.ManualData = ManualData
+ // console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
this.value = value
@@ -87,12 +86,9 @@
setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getWasteWaterMonitoringDetails = dataDetail // 鏄庣粏琛ㄦ暟鎹�
- // console.log(dataDetail)
- this.getQueryOnlineMonHourData = hourData // 灏忔椂鏁版嵁
+ this.getQueryOnlineMonData = hourData
// console.log(drawData)
- this.getQueryOnlineMonDateData = dateData // 鏃ユ暟鎹�
- // console.log(dateData)
+ this.getWasteWaterMonitoringDetails = dataDetail
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
@@ -103,16 +99,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;
@@ -125,11 +119,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