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 |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/exam/paper/finish.vue b/src/views/exam/paper/finish.vue
index 1c7ac73..b0ff0d9 100644
--- a/src/views/exam/paper/finish.vue
+++ b/src/views/exam/paper/finish.vue
@@ -6,9 +6,10 @@
       <el-main class="align-center">
         <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>
         <!-- 鏂板涓嬭浇鎶ュ憡鎻愮ず璇� -->
         <H2 v-if ="downDisable">{{$t('finishPersonalityDownInfo')}}</H2>
-        <el-button type="danger" v-if ="downDisable" @click="downReport" round>{{$t('down')}}</el-button>
+        <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>-->
@@ -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