From 3b0fe9c39556c67ce0b13e3f3debf4046d2a38ab Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 16 四月 2021 17:27:31 +0800
Subject: [PATCH] 去掉最大化
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 92 insertions(+), 51 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index fa40860..0db423e 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,60 +1,102 @@
<template>
- <div class="public-bounced" v-draw v-if="flag">
- <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">
- <GasTab :displayContent="displayContentTab" ></GasTab>
- <div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'"></PublicTable>
- <GasECharts v-else></GasECharts>
- </div>
- </div>
- <div class="public-bounced-content-right">
- <GasVideo></GasVideo>
- </div>
- </div>
+<!-- <div class="public-bounced-content">-->
+<!-- <div class="public-bounced-content-left">-->
+<!-- <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"-->
+<!-- :getQueryOnlineMonData="getQueryOnlineMonData"-->
+<!-- :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'-->
+<!-- :ManualData="ManualData"-->
+<!-- ref="PublicChart"-->
+<!-- >-->
+<!-- </public-chart>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="public-bounced-content-right">-->
+<!-- <public-video></public-video>-->
+<!-- </div>-->
+<!-- </div>-->
+ <PublicSector></PublicSector>
</div>
</template>
<script>
-import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
-import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
-// import GasTabs from './GasComponents/GasTabs'
+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'
+
+import PublicSector from '@components/BaseNav/PublicSector'
export default {
name: 'PublicBounced',
components: {
- GasTab,
- PublicTable,
- GasECharts,
- GasVideo
+ PublicSector
+ // PublicTabs,
+ // PublicTable,
+ // PublicChart,
+ // PublicVideo
},
data () {
return {
displayContentTitle: '',
displayContentTab: '',
- flag: false
+ displayContentTable: '',
+ flag: false,
+ value: '',
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getQueryOnlineMonData: [],
+ ManualData: []
}
},
+ destoryed () {
+ this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
+ this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
+ },
methods: {
- setData (data, value) {
- // data.forEach((item, index) => {
- // // console.log(item.StoragePlaceName)
- // // this.displayContentTitle = item.StoragePlaceName
- // })
- this.displayContentTab = data
+ closePopup () {
+ this.flag = false
+ },
+ // 鍥哄簾鐩稿叧淇℃伅璁剧疆
+ setData (title, dataBasic, dataDetailed, value) {
+ this.flag = true
+ this.value = value
+ this.displayContentTitle = title
+ this.displayContentTab = dataBasic[0]
+ this.displayContentTable = dataDetailed[0]
+ },
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
+ // console.log(data, dataDetails, GasHourData, ManualData, value)
+ this.setWasteGasdata = data
+ this.displayContentTitle = data.Name
+ this.getWasteGasDetails = dataDetails
+ this.getQueryOnlineMonData = GasHourData
+ this.ManualData = ManualData
+ // console.log(this.getQueryOnlineMonData)
this.flag = true
this.value = value
},
- closePopup () {
- this.flag = false
+ setWaterData (dataWater, detailData, hourData, dateData, value) {
+ this.setWasteWaterdata = dataWater
+ this.getQueryOnlineMonData = hourData
+ this.getWasteWaterMonitoringDetails = detailData
+ this.displayContentTitle = dataWater.Name
+ this.flag = true
+ this.value = value
}
}
}
@@ -62,20 +104,18 @@
<style lang="less" scoped>
.public-bounced {
- width: 75%;
- z-index: 999;
+ z-index: 2000;
position: absolute;
- bottom: 5%;
- left: 15%;
- background-color: #002432;
- border: 1px #9fc5c8 solid;
+ top: 35%;
+ left: 20%;
.public-bounced-title {
- border: 1px #a4c0d8 solid;
+ cursor: move;
+ height: 0.1rem;
+ padding: 10px 0;
display: flex;
align-items: center;
justify-content: space-between;
- padding: 5px 0;
span {
color: #f4f7ff;
@@ -84,29 +124,30 @@
}
i {
- color: white;
+ color: #C0C4CC;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
+ }
+
+ i:hover {
+ color: #00fff6;
}
}
.public-bounced-content {
- margin: 15px auto;
+ padding: 0.1rem;
display: flex;
//align-items: center;
- justify-content: space-around;
- padding: 10px;
+ //justify-content: space-around;
.public-bounced-content-left {
- flex: 3;
- height: 100%;
- margin-right: 10px;
+ //width: 4.8rem;
}
.public-bounced-content-right {
- flex: 2;
- //width: 48%;
- height: 100%;
+ //width: 3rem;
+ margin-left: 0.1rem;
}
}
}
--
Gitblit v1.8.0