From 166f256cda92ce8755ce0bf982ee2d355d7b6e42 Mon Sep 17 00:00:00 2001 From: zhijie <1003392067@qq.com> Date: 星期日, 03 十二月 2023 22:53:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master_merge_V13' --- src/views/exam/paper/job.vue | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/exam/paper/job.vue b/src/views/exam/paper/job.vue index 6e677bd..13d0f9b 100644 --- a/src/views/exam/paper/job.vue +++ b/src/views/exam/paper/job.vue @@ -293,11 +293,15 @@ } }) } + // JAQ鎶ュ憡鏈�鍚庡ぇ棰樺畬鎴� 鍚敤鎻愪氦鎸夐挳 + let isCompleted1 = _this.answer.answerItems[_this.answer.answerItems.length - 2].completed; + let isCompleted2 = _this.answer.answerItems[_this.answer.answerItems.length - 1].completed; + if (isCompleted1 && isCompleted2) { + this.submitDisable = false + } + if (jumpNextFlag) { _this.nextSubject() - this.submitDisable = false - } else { - this.submitDisable = true } }, submitForm () { @@ -349,7 +353,7 @@ let answerSubmit = _this.getSubmitAnswerValue() examPaperAnswerApi.answerSubmit(answerSubmit, _this.memberToken).then(re => { if (re.code === 1) { - _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess } }) + _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess, tokenId: _this.memberToken } }) } else { _this.$message.error(re.message + '/exam/finish') } -- Gitblit v1.9.1