Browse Source

完善断点续考逻辑

Michael Wang 6 năm trước cách đây
mục cha
commit
885ac67fcc

+ 4 - 3
src/features/OnlineExam/OnlineExamList.vue

@@ -95,9 +95,8 @@ export default {
                 : "")
           );
           setTimeout(() => this.$Spin.hide(), 1000);
-          return;
+          return true;
         }
-        this.$router.push("/online-exam");
       } catch (error) {
         this.$Message.error("获取断点续考信息异常,退出登录");
         this.logout();
@@ -105,7 +104,9 @@ export default {
       }
     },
     async enterExam(course) {
-      await this.checkExamInProgress();
+      const alreadyInExam = await this.checkExamInProgress();
+      if (alreadyInExam) return;
+
       this.spinShow = true;
       this.processingMessage = "正在检测IP合法性...";
       try {

+ 4 - 3
src/features/OnlinePractice/OnlinePracticeList.vue

@@ -86,9 +86,8 @@ export default {
                 : "")
           );
           setTimeout(() => this.$Spin.hide(), 1000);
-          return;
+          return true;
         }
-        this.$router.push("/online-exam");
       } catch (error) {
         this.$Message.error("获取断点续考信息异常,退出登录");
         this.logout();
@@ -96,7 +95,9 @@ export default {
       }
     },
     async enterPractice(course) {
-      await this.checkExamInProgress();
+      const alreadyInExam = await this.checkExamInProgress();
+      if (alreadyInExam) return;
+
       this.$router.push(
         `/online-exam/exam/${course.examId}/overview?examStudentId=${
           course.examStudentId