From 024e5c411d7d90538f9ee09252b35223bd9a1e31 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 4 Nov 2021 13:37:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=84=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=90=8E=EF=BC=8C=E4=BC=9A=E4=B8=80=E7=9B=B4=E8=B7=B3?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/appraisal/list/index.vue | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/pages/appraisal/list/index.vue b/src/pages/appraisal/list/index.vue
index 4ddc579..1fba10c 100644
--- a/src/pages/appraisal/list/index.vue
+++ b/src/pages/appraisal/list/index.vue
@@ -26,10 +26,13 @@
                 <el-button class="second" type="primary" @click="nextQues">下一题</el-button>
             </template>
         </div>
+        <div class="footer-con" v-else>
+            <el-button type="primary" @click="toEvaluation">再 试 一 次</el-button>
+        </div>
     </div>
 
     <!-- 提交成绩弹框 -->
-    <el-dialog :visible.sync="resultVisible" width="30%" custom-class="result_dialog" center :close-on-click-modal="false" @close="toEvaluation">
+    <el-dialog :visible.sync="resultVisible" width="30%" custom-class="result_dialog" center :close-on-click-modal="false" @close="handleClose('result')">
         <div class="result"><span>{{ result.isPassed }}</span></div>
         <div class="ques-wrap">
             <div class="point">
@@ -46,7 +49,7 @@
     </el-dialog>
 
     <!-- 成绩详情弹框 -->
-    <el-dialog :visible.sync="detailVisible" width="30%" custom-class="detail_dialog" center :close-on-click-modal="false" @close="toEvaluation">
+    <el-dialog :visible.sync="detailVisible" width="30%" custom-class="detail_dialog" center :close-on-click-modal="false" @close="handleClose('detail')">
         <div class="title">成绩详情</div>
         <div style="min-height: 370px">
             <el-table :data="detailData" height="340" border style="width: 100%">
@@ -137,6 +140,16 @@ export default {
                 this.resultVisible = true;
             }
         },
+        handleClose(type) { // 处理关闭
+            if (type === "result") {
+                this.resultVisible = false;
+            } else if (type === "detail") {
+                this.detailVisible = false;
+            }
+            clearInterval(this.timer);
+            this.countdown = "";
+            this.isDone = true;
+        },
         async toEvaluation() { // 再试一次
             clearInterval(this.timer);
             this.lastOne = false;
@@ -262,7 +275,7 @@ export default {
 <style lang="scss" scoped>
 
 /deep/ .evaluation_con {
-    min-height: 700px;
+    height: 780px;
     width: 550px;
     background: url(../../../assets/img/evaluation_bg1.png) 0 0/100% 100% no-repeat;
     border-radius: 20px;
@@ -338,7 +351,7 @@ export default {
             }
         }
         .options.isDone {
-            min-height: 395px;
+            //min-height: 395px;
         }
     }