From 0110b78419d98e114c59fa9fb6f69663fbdc3c98 Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期日, 30 五月 2021 19:37:35 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 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 5a36cb3..b0d39c3 100644 --- a/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue +++ b/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue @@ -1,5 +1,6 @@ <template> - <div> + <el-dialog :visible.sync="isShow" class="effect-vol-calc" title="鍒嗘瀽" :modal="false" v-dialog-drag + :before-close="handleClose"> <!--<!– 鍩烘湰淇℃伅–>--> <!-- <event-base-info>--> @@ -14,13 +15,13 @@ <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> +<!-- <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> - </div> + </el-dialog> </template> @@ -30,15 +31,23 @@ 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: { 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 () { @@ -56,12 +65,20 @@ report () { console.log('鐢熸垚鎶ュ憡') }, - close () { console.log('杩斿洖') } + close () { console.log('杩斿洖') }, + + handleClose () { + this.isShow = false + } } } </script> -<style scoped> +<style lang="less" scoped> +.footer{ + text-align: right; + margin: 15px; +} </style> -- Gitblit v1.8.0