From 51a71ffc28f134beeaa15dfb7ec70dfc7a1de7b2 Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期三, 14 四月 2021 12:49:46 +0800 Subject: [PATCH] table数据 --- src/components/BaseNav/PublicBounced/PublicBounced.vue | 120 +++++++++++++++++++++++++++++------------------------------- 1 files changed, 58 insertions(+), 62 deletions(-) diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue index 38a75de..95e251d 100644 --- a/src/components/BaseNav/PublicBounced/PublicBounced.vue +++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue @@ -1,84 +1,83 @@ <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>--> - <!-- <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 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 :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> </div> </template> <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, - // PublicVideo + PublicTabs, + PublicTable, + PublicChart, + PublicVideo }, data () { return { - setWasteGasdata: '', - setWasteWaterdata: '', displayContentTitle: '', displayContentTab: '', displayContentTable: '', flag: false, value: '', + setWasteGasdata: '', + setWasteWaterdata: '', getWasteGasDetails: [], getWasteWaterMonitoringDetails: [], - getQueryOnlineMonHourData: [], - getQueryOnlineMonDateData: [] + getQueryOnlineMonData: [], + ManualData: [] } }, 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 @@ -86,12 +85,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 @@ -102,18 +98,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; - width: 6rem; - height: 3rem; .public-bounced-title { + cursor: move; height: 0.1rem; - border: 1px #a4c0d8 solid; padding: 10px 0; display: flex; align-items: center; @@ -126,11 +118,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