From f84e5a87d3aeb665f4a84113e7e67533d2979faf Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 09 四月 2021 15:46:40 +0800
Subject: [PATCH] echarts
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 126 ++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 40 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 0085f00..b6307ea 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,52 +1,96 @@
<template>
- <div class="public-bounced" v-draw v-show="flag">
- <div class="public-bounced-title">
- <span>{{ displayContent.Name }}</span>
- <i class="el-icon-circle-close" @click="closePopup"></i>
- </div>
- <div class="public-bounced-content">
- <div class="public-bounced-content-left">
- <GasTab :displayContent="displayContent"></GasTab>
- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
- <GasECharts v-else></GasECharts>
- </div>
- <div class="public-bounced-content-right">
- <GasVideo></GasVideo>
- </div>
- </div>
+ <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>-->
+ <!-- <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>
</template>
<script>
+import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
+
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 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'
export default {
name: 'PublicBounced',
components: {
- GasTab,
- PublicTable,
- GasECharts,
- GasVideo
+ Echarts
+ // PublicTabs,
+ // PublicTable,
+ // PublicChart,
+ // PublicVideo
},
data () {
return {
- displayContent: [],
- flag: false
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
+ flag: false,
+ value: '',
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getQueryOnlineMonData: []
}
},
methods: {
- setData (data, value) {
- this.displayContent = data
+ closePopup () {
+ this.flag = false
+ },
+ setData (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
},
- closePopup () {
- this.flag = false
+ setGasData (data, dataDetails, value) {
+ this.setWasteGasdata = data
+ this.getWasteGasDetails = dataDetails
+ // console.log(dataDetails)
+ this.displayContentTitle = data.Name
+ this.flag = true
+ this.value = value
+ },
+ setWaterData (dataWater, dataDetail, hourData, value) {
+ this.setWasteWaterdata = dataWater
+ // console.log(data)
+ this.getQueryOnlineMonData = hourData
+ // console.log(drawData)
+ this.getWasteWaterMonitoringDetails = dataDetail
+ this.displayContentTitle = dataWater.Name
+ this.flag = true
+ this.value = value
}
}
}
@@ -54,20 +98,22 @@
<style lang="less" scoped>
.public-bounced {
- width: 75%;
z-index: 999;
position: absolute;
- bottom: 5%;
- left: 15%;
+ top: 15%;
+ left: 20%;
background-color: #002432;
border: 1px #9fc5c8 solid;
+ width: 6rem;
+ height: 3rem;
.public-bounced-title {
+ height: 0.1rem;
border: 1px #a4c0d8 solid;
+ padding: 10px 0;
display: flex;
align-items: center;
justify-content: space-between;
- padding: 5px 0;
span {
color: #f4f7ff;
@@ -79,23 +125,23 @@
color: white;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
}
}
.public-bounced-content {
- margin: 15px auto;
+ padding: 0.1rem;
display: flex;
- align-items: center;
- justify-content: space-around;
+ //align-items: center;
+ //justify-content: space-around;
.public-bounced-content-left {
- width: 48%;
- height: 100%;
+ //width: 4.8rem;
}
.public-bounced-content-right {
- width: 48%;
- height: 100%;
+ //width: 3rem;
+ margin-left: 0.1rem;
}
}
}
--
Gitblit v1.8.0