From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001 From: XingChuan <m17600301067@163.com> Date: 星期日, 30 五月 2021 12:24:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop --- src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue | 75 +++++++++++++++++++++++-------------- 1 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue b/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue index c002aab..a4ec6ef 100644 --- a/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue +++ b/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue @@ -1,55 +1,74 @@ <template> - <div> + <el-dialog :visible.sync="isShow" class="effect-vol-calc" title="鍒嗘瀽" :modal="false" v-dialog-drag + :before-close="handleClose"> - <!--<!– 鍩烘湰淇℃伅–>--> - <!-- <event-base-info>--> +<!--<!– 鍩烘湰淇℃伅–>--> +<!-- <event-base-info>--> - <!-- </event-base-info>--> - <!-- 寤鸿澶勭疆--> - <disposal-proposed> +<!-- </event-base-info>--> +<!-- 寤鸿澶勭疆--> + <disposal-proposed> - </disposal-proposed> - <!-- 鏈夋晥瀹圭Н璁$畻--> - <div class="footer"> - <el-button type="primary" size="mini" @click="toggleShowCalc">浜嬫晠姘磋绠�</el-button> - <el-button type="primary" size="mini" @click="rimRes">鍛ㄨ竟璧勬簮</el-button> - <el-button type="primary" size="mini" @click="report">鐢熸垚鎶ュ憡</el-button> - <el-button type="primary" size="mini" @click="close">杩斿洖</el-button> - </div> - <effective-volume-calc ref="effectVolCalc"></effective-volume-calc> + </disposal-proposed> + <!-- 鏈夋晥瀹圭Н璁$畻--> + <div class="footer"> + <el-button type="primary" size="mini" @click="toggleShowCalc">浜嬫晠姘磋绠�</el-button> + <el-button type="primary" size="mini" @click="toggleShowResInfo">鍛ㄨ竟璧勬簮</el-button> + <el-button type="primary" size="mini" @click="toggleShowReportDoc">鐢熸垚鎶ュ憡</el-button> + <el-button type="primary" size="mini" @click="close">杩斿洖</el-button> </div> + + <effective-volume-calc ref="effectVolCalc"></effective-volume-calc> + <event-report-doc ref="eventReportDoc" :reportItemCon="reportItemCon"> </event-report-doc> + <res-info ref="resInfo"></res-info> + </el-dialog> </template> <script> -// import EventBaseInfo from '@components/base-page/enterprise-emergency/event-handling/EventBaseInfo' import DisposalProposed from '@components/base-page/enterprise-emergency/event-handling/DisposalProposed' import EffectiveVolumeCalc from '@components/base-page/enterprise-emergency/EffectiveVolumeCalc' - +import EventReportDoc from '@components/base-page/enterprise-emergency/event-handling/EventReportDoc' +import ResInfo from '@components/base-page/enterprise-emergency/event-handling/ResInfo' +import eventBus from '../../../../eventBus' export default { name: 'EventHandling', - components: { - DisposalProposed, - // EventBaseInfo, - EffectiveVolumeCalc + components: { ResInfo, EventReportDoc, DisposalProposed, EffectiveVolumeCalc }, + data () { + return { + isShow: false, + reportItemCon: { + popupType: 'aaa' + } + } }, - + mounted () { + // this.wfsHelper = new WfsHelper() + eventBus.$on('event-handling', () => { + this.isShow = !this.isShow + }) + }, methods: { toggleShowCalc () { - // this.isShowCalculate = !this.isShowCalculate const s = this.$refs.effectVolCalc.getVisible() - console.log(s) this.$refs.effectVolCalc.setVisible(!s) }, - rimRes () { - console.log('鍛ㄨ竟璧勬簮') + toggleShowResInfo () { + const s = this.$refs.resInfo.getVisible() + this.$refs.resInfo.setVisible(!s) + }, + toggleShowReportDoc () { + const s = this.$refs.eventReportDoc.getVisible() + this.$refs.eventReportDoc.setVisible(!s) }, report () { console.log('鐢熸垚鎶ュ憡') }, - close () { - console.log('杩斿洖') + close () { console.log('杩斿洖') }, + + handleClose () { + this.isShow = false } } -- Gitblit v1.8.0