From cbb07baa7fec84a79914651daa22ba214f4e0260 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期三, 31 一月 2024 17:36:27 +0800
Subject: [PATCH] Merge branch 'APIFan' of http://47.107.238.89:10801/r/TAI_OTS_BROWSER into APIFan
---
src/views/exam/paper/personality.vue | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/views/exam/paper/personality.vue b/src/views/exam/paper/personality.vue
index d07b95d..8d7434e 100644
--- a/src/views/exam/paper/personality.vue
+++ b/src/views/exam/paper/personality.vue
@@ -166,7 +166,7 @@
}
if (_this.isForFinish(i)) {
- _this.$router.push({ path: '/exam/finish', query: { name: '', content: _this.$t('finishMsg') } })
+ _this.$router.push({ path: '/exam/finish', query: { name: '', content: _this.$t('finishMsg'), tokenId: _this.memberToken } })
}
}
// 濡傛灉涓婁竴棰樹笉鏄湰娈碉紝鍒欎笉鑳借繑鍥炰笂涓�娈�
@@ -402,6 +402,13 @@
let _this = this
_this.isShowGuide(false)
if (_this.order > 0) {
+ // 娓呯┖鏈鐨勯�夋嫨
+ _this.answer.answerItems[_this.order].content = null
+ _this.answer.answerItems[_this.order].completed = false
+ _this.answer.answerItems[_this.order].questionReport = null
+ _this.answer.answerItems[_this.order].readOnly = false
+
+ // 璁剧疆鍥炲埌涓婁竴棰�
let num = --_this.order
_this.itemOrder = _this.form.titleItems[0].questionItems[num].itemOrder
_this.questionItem = _this.form.titleItems[0].questionItems[num]
@@ -420,7 +427,9 @@
for (let i = 0; i < _this.answer.answerItems.length; i++) {
if (_this.answer.answerItems[i].content === null) {
unFinish = true
- _this.answer.finish = 0
+ // 鏈夋湭瀹屾垚鐨勭瓟棰樺簲璇ユ槸 2绛旈涓�
+ // 涔嬪墠鏄�0鏈鐞�
+ _this.answer.finish = 2
}
}
if (unFinish) {
@@ -440,7 +449,7 @@
} else {
_this.answer.verifyStatus = 1
_this.answer.finish = 1
- _this.submitAnswer(_this.$t('finishSubmit'))
+ _this.submitAnswer(_this.$t('finishPersonalityInfo'))
}
},
startDo: function () {
@@ -462,7 +471,18 @@
examPaperAnswerApi.answerSubmit(answerSubmit, _this.memberToken).then(re => {
loading.close()
if (re.code === 1) {
- _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess } })
+ // 鐗规畩澶勭悊 LAQ娴嬭瘯鍖� MAQ+CAQ
+ if (_this.form.name.indexOf('LAQ') !== -1) {
+ console.log('绛斿畬棰�,鐪嬬湅瑕佷笉瑕佸幓CAQ1')
+ examPaperApi.select(_this.memberToken, _this.langType).then(re => {
+ _this.form = re.response
+ _this.$router.push({ path: '/guide/index', query: { formDo: _this.form } })
+ }).catch(e => {
+ _this.$message.error(_this.$t('noquestionMsg'))
+ })
+ } else {
+ _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