From a778d5e53e74b2170e37607b2536a957dbc1d664 Mon Sep 17 00:00:00 2001
From: yj <2077506045@qq.com>
Date: 星期一, 25 十一月 2024 13:59:58 +0800
Subject: [PATCH] 合并本地修改
---
src/views/exam/paper/finish.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/views/exam/paper/finish.vue b/src/views/exam/paper/finish.vue
index 685e173..b0ff0d9 100644
--- a/src/views/exam/paper/finish.vue
+++ b/src/views/exam/paper/finish.vue
@@ -4,17 +4,18 @@
<el-header class="align-center" style="height: 0px; margin: 8%;">
</el-header>
<el-main class="align-center">
- <H1 v-if="content!==null && content.trim()!==''">{{content}}</H1>
- <H1 v-else>{{$t('finishMsg')}}</H1>
+ <H2 v-if="content!==null && content.trim()!==''">{{content}}</H2>
+ <H2 v-else>{{$t('finishMsg')}}</H2>
+ <el-button type="danger" @click="closePage" round>{{$t('close')}}</el-button>
<!-- 鏂板涓嬭浇鎶ュ憡鎻愮ず璇� -->
- <H1 v-if ="downDisable">{{$t('finishPersonalityDownInfo')}}</H1>
- <el-button type="danger" v-if ="downDisable" @click="downReport" round>{{$t('down')}}</el-button>
+ <H2 v-if ="downDisable">{{$t('finishPersonalityDownInfo')}}</H2>
+ <el-button type="success" v-if ="downDisable" @click="downReport" round>{{$t('down')}}</el-button>
<!-- 鏂板棰勮鎻愮ず璇� -->
<!-- <H1 v-if ="viewDisable">{{$t('finishViewReportInfo')}}</H1>-->
<!-- <el-button type="danger" v-if ="viewDisable" @click="viewReport" round>{{$t('view')}}</el-button>-->
<!-- -->
- <H1 v-if ="type == 'CIAQ' && isMobile()">{{$t('finishViewReportInfo')}}</H1>
- <el-button type="danger" v-if ="type == 'CIAQ' && isMobile()" @click="viewReportH5" round>{{$t('view')}}</el-button>
+ <H2 v-if ="type == 'CIAQ'">{{$t('finishViewReportInfo')}}</H2>
+ <el-button type="danger" v-if ="type == 'CIAQ'" @click="viewReportH5" round>{{$t('view')}}</el-button>
</el-main>
</el-container>
</div>
@@ -43,9 +44,7 @@
_this.downDisable = true
// 璁剧疆涓嬭浇璺緞
_this.downUrl = '/api/exam/paper/download?fileName=' + re.msg + '&delete=false'
- console.log(re)
} else {
- console.log(re)
}
})
@@ -67,11 +66,16 @@
beforeDestroy () {
},
methods: {
+
// 涓嬭浇鎶ュ憡
downReport: function () {
let _this = this
window.open(_this.downUrl)
},
+ // 鍏抽棴椤甸潰
+ closePage: function () {
+ window.close()
+ },
// 棰勮鎶ュ憡
viewReport: function () {
let _this = this
--
Gitblit v1.9.1