From 63436d545b7e8be49dd23c0e0dcb2a42dcd4f4d4 Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期六, 29 五月 2021 10:21:09 +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 | 64 +++++++++++++++++-------------- 1 files changed, 35 insertions(+), 29 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..5a36cb3 100644 --- a/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue +++ b/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue @@ -1,56 +1,62 @@ <template> - <div> + <div> - <!--<!– 鍩烘湰淇℃伅–>--> - <!-- <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> + </div> </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' export default { name: 'EventHandling', - components: { - DisposalProposed, - // EventBaseInfo, - EffectiveVolumeCalc + components: { ResInfo, EventReportDoc, DisposalProposed, EffectiveVolumeCalc }, + data () { + return { + reportItemCon: { + popupType: 'aaa' + } + } }, - 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('杩斿洖') } } } -- Gitblit v1.8.0