From 0bd34c441a3e2592500be5d3577d5c52d29e5416 Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期五, 09 四月 2021 09:44:07 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/table/summarySheets.vue | 99 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 85 insertions(+), 14 deletions(-) diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue index 6592090..41239cf 100644 --- a/src/components/table/summarySheets.vue +++ b/src/components/table/summarySheets.vue @@ -1,45 +1,87 @@ <template> <div class="summary-sheets"> - <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="left"> - <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>--> + <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left"> + <div :class='["iconBtn",subtopic ? "active-button" : ""]' @click="subtopicBtn" > + <i class="el-icon-tickets icon"></i> </div> </el-tooltip> - <!-- <Dialog ref="summarySheets" title="浼佷笟鎸囨爣鍒嗙被缁熻">--> - <!-- <tab-handover></tab-handover>--> - <!-- </Dialog >--> - <div class="dialog" v-drag v-show="dialogShow"> + <transition name="animationChange"> + <div class="subtopic" v-if="subtopic"> + <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="bottom"> + <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> + </el-tooltip> + <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎸囨爣" placement="bottom"> + <div :class='["iconBtn",companyVisible ? "active-button" : ""]' @click="showStatisDialog()" > + <!-- <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon"> --> + <i class="el-icon-office-building icon"></i> + </div> + </el-tooltip> + <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="棰勬姤璀�" placement="bottom"> + <div :class='["iconBtn",warnVisible ? "active-button" : ""]' @click="showWarnDialog()" > + <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" class="icon"> + <!--<span class="icon-name">棰勬姤璀�</span>--> + </div> + </el-tooltip> + </div> + </transition> + <Dialog ref="summarySheets" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" > <tab-handover></tab-handover> - </div> + </Dialog> + <Dialog ref="warnDialog" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" > + <warn></warn> + </Dialog> + <Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻"> + <index-statistics></index-statistics> + </Dialog> </div> </template> <script> import tabHandover from '@components/table/components/tabHandover' // import Dialog from '@views/popup/Dialog' +import Dialog from '../../views/popup/Dialog' +import Warn from './components/Warn' +import IndexStatistics from './components/IndexStatistics' import '@/components/BaseNav/SolidWaste/directive/dir' export default { name: 'summary-sheet.vue', components: { - tabHandover + tabHandover, + Dialog, + Warn, + IndexStatistics // Dialog }, data () { return { summaryVisible: false, - dialogShow: false + dialogShow: false, + comp: Warn, + warnVisible: false, + companyVisible: false, + subtopic: false } }, methods: { closeBtn () { - this.dialogShow = !this.dialogShow - // const summary = document.getElementById('summary') - // summary.style.display = 'none' this.$refs.summarySheets.show() this.summaryVisible = true + }, + showWarnDialog () { + this.$refs.warnDialog.show() + this.warnVisible = true + }, + showStatisDialog () { + this.$refs.indexStatisticsDialog.show() + this.companyVisible = true + }, + subtopicBtn () { + this.subtopic = !this.subtopic } }, mounted () { @@ -48,19 +90,48 @@ this.$refs.summarySheets.$on('closeDialog', () => { that.summaryVisible = false }) + this.$refs.warnDialog.$on('closeDialog', () => { + that.warnVisible = false + }) + this.$refs.indexStatisticsDialog.$on('closeDialog', () => { + that.companyVisible = false + }) }) } } </script> <style scoped lang="less"> + .animationChange-enter-active, .animationChange-leave-active { + transition: all 0.5s; + } + + .animationChange-enter, .animationChange-leave-to { + opacity: 0; + transform: translateX(-100px); + } + .summary-sheets { position: absolute; + display: inline-flex; + overflow: hidden; top: 0.42979rem; left: 0.14583rem; /*width: 850px;*/ /*height: 265px;*/ z-index: 500; + .subtopic{ + display: inline-flex; + .iconBtn{ + margin-left: 0.03rem; + border-color:#DCDFE6; + color:#fff; + } + .iconBtn.active-button{ + border-color:#00fff6 !important; + color:#00fff6 !important; + } + } .dialog { //width: 800px; -- Gitblit v1.8.0