From 1a934db8abbb10786cb63b45821f33452cf46c40 Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期三, 07 四月 2021 14:04:29 +0800 Subject: [PATCH] 修改bug --- src/components/table/summarySheets.vue | 99 +++++++++++++------------------------------------ 1 files changed, 27 insertions(+), 72 deletions(-) diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue index 1bb0dc4..1d1d523 100644 --- a/src/components/table/summarySheets.vue +++ b/src/components/table/summarySheets.vue @@ -1,59 +1,27 @@ <template> <div class="summary-sheets"> -<!-- <div id="summary">--> -<!-- <el-row type="flex" class="head-area" align="middle">--> -<!-- <el-col>--> -<!-- <span>浼佷笟鎸囨爣鍒嗙被缁熻</span>--> -<!-- </el-col>--> -<!-- <el-col class="head-area-button">--> -<!-- <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info" @click="closeBtn"></el-button>--> -<!-- </el-col>--> -<!-- </el-row>--> -<!-- <el-tabs class="tabs-text">--> - <div> - <i class="el-icon-c-scale-to-original" @click="closeBtn"></i> - </div> - <Dialog ref="summarySheets" title="浼佷笟鎸囨爣鍒嗙被缁熻"> -<!-- <el-row :gutter="20" >--> -<!-- <el-col>--> - <el-tabs v-model="activeName" type="border-card"> - <el-tab-pane label="搴熸按" name="first"> - <waste-water></waste-water> - </el-tab-pane> - <el-tab-pane label="搴熸皵" name="second"> - <waste-gas></waste-gas> - </el-tab-pane> - <el-tab-pane label="鍥哄簾" name="third"> - <solid-waste></solid-waste> - </el-tab-pane> - <el-tab-pane label="绌烘皵璐ㄩ噺" name="fourth"> - <AirQuality></AirQuality> - </el-tab-pane> - </el-tabs> -<!-- </el-col>--> -<!-- </el-row>--> - </Dialog > + <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn"> + <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon"> + <!--<span class="icon-name">缁熻琛�</span>--> + </div> + <Dialog ref="summarySheets" title="浼佷笟鎸囨爣鍒嗙被缁熻"> + <tab-handover></tab-handover> + </Dialog > </div> </template> <script> -import WasteWater from '@/components/table/components/WasteWater.vue' -import WasteGas from './components/WasteGas' -import SolidWaste from './components/SolidWaste' -import AirQuality from './components/AirQuality' +import tabHandover from '@components/table/components/tabHandover' import Dialog from '@views/popup/Dialog' export default { name: 'summary-sheet.vue', components: { - Dialog, - WasteWater, - WasteGas, - SolidWaste, - AirQuality + tabHandover, + Dialog }, data () { return { - activeName: 'first' + summaryVisible: false } }, methods: { @@ -61,14 +29,16 @@ // const summary = document.getElementById('summary') // summary.style.display = 'none' this.$refs.summarySheets.show() - }, - tableHeaderColor ({ row, column, owIndex, columnIndex }) { - return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px' - }, - // 琛ㄥご鏍峰紡璁剧疆 - rowClass () { - return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px' + this.summaryVisible = true } + }, + mounted () { + const that = this + this.$nextTick(() => { + this.$refs.summarySheets.$on('closeDialog', () => { + that.summaryVisible = false + }) + }) } } </script> @@ -76,32 +46,17 @@ <style scoped lang="less"> .summary-sheets { position: absolute; - top: 450px; - left: 200px; - width: 40px; - height: 40px; + top: 0.42979rem; + left: 0.14583rem; /*width: 850px;*/ /*height: 265px;*/ - border: #90c8e0 1px solid; - z-index:2000; - background-color: rgba(26, 73, 81, 0.901960784313726); + z-index:500; + /*color: #fff;*/ .el-icon-c-scale-to-original { - width: 100%; - height: 100%; + width: 30px; + height: 30px; + font-size: 30px; } } - /*.head-area{*/ - /* color: #fff;*/ - /* width: 100%;*/ - /* height: 40px;*/ - /* background-color: #002433;*/ - /* font-size: 16px;*/ - /* border-bottom: #90c8e0 2px solid;*/ - /* padding-left: 16px;*/ - /* !*line-height: 40px;*!*/ - /*}*/ - /*.head-area-button{*/ - /* margin-right: 5px;*/ - /*}*/ </style> -- Gitblit v1.8.0