From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001 From: chenyabin <Chenab123!> Date: 星期二, 27 四月 2021 09:27:22 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/BaseNav/PublicBounced/PublicBounced.vue | 121 +++++++++++++++++++++++++++++----------- 1 files changed, 88 insertions(+), 33 deletions(-) diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue index 152f458..2ab8d04 100644 --- a/src/components/BaseNav/PublicBounced/PublicBounced.vue +++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue @@ -1,16 +1,28 @@ <template> - <div class="public-bounced" v-draw v-show="flag"> - <div class="public-bounced-title"> - <span>{{ displayContent.Name }}</span> + <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"> - <GasTable :displayContent="displayContent"></GasTable> - <GasECharts></GasECharts> + <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"> - <GasVideo></GasVideo> + <public-video></public-video> </div> </div> </div> @@ -18,33 +30,69 @@ <script> -import '@/components/BaseNav/SolidWaste/directive' -import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable' -import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts' -import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo' -// import GasTabs from '@components/BaseNav/PublicBounced/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' export default { name: 'PublicBounced', components: { - // GasTabs, - GasTable, - GasECharts, - GasVideo + PublicTabs, + PublicTable, + PublicChart, + PublicVideo }, data () { return { - displayContent: [], - flag: false + displayContentTitle: '', + displayContentTab: '', + 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) { - this.displayContent = data - this.flag = true - }, 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 + }, + 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 } } } @@ -52,19 +100,18 @@ <style lang="less" scoped> .public-bounced { - z-index: 999; - position: fixed; - top: 50%; - left: 50%; - background-color: #002432; - border: 1px #9fc5c8 solid; + z-index: 2000; + position: absolute; + 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; @@ -73,23 +120,31 @@ } i { - color: white; + color: #C0C4CC; margin: 0 15px; font-size: 22px; + cursor: pointer; + } + + i:hover { + color: #00fff6; } } .public-bounced-content { + padding: 0.05rem; display: flex; - align-items: center; - justify-content: space-around; + //align-items: center; + //justify-content: space-around; .public-bounced-content-left { + //width: 4.8rem; } .public-bounced-content-right { + //width: 3rem; + margin-left: 0.1rem; } } - } </style> -- Gitblit v1.8.0