From 93f30ecb74eea1c7ed460d45bc01df2ef14d69a3 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期三, 10 五月 2023 14:53:57 +0800
Subject: [PATCH] Merge branch 'v13-20230413'
---
src/views/exam/paper/career_interests.vue | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/views/exam/paper/career_interests.vue b/src/views/exam/paper/career_interests.vue
index 662ae2a..8acacb7 100644
--- a/src/views/exam/paper/career_interests.vue
+++ b/src/views/exam/paper/career_interests.vue
@@ -5,7 +5,7 @@
<h1></h1>
</el-header>
<el-main style="padding-top: 3%;">
- <div v-html="guideDescirption" v-if="guide" :style="ismobile?'padding-top: 2%;':'padding-top: 2%;margin: 0 auto;width:66%'"></div>
+ <div v-html="guideDescirption" v-if="guide" :style="ismobile?'padding-top: 2%;margin-top: 5%;':'padding-top: 2%;margin: 0 auto;width:66%'"></div>
<el-row class="do-align-center" v-if="guide">
<el-button @click="startDo" type="primary" :disable="startDoDisable">{{$t('start')}}</el-button>
</el-row >
@@ -61,7 +61,7 @@
import examPaperAnswerApi from '@/api/examPaperAnswer'
import demographyApi from '@/api/demography'
export default {
- name: 'personality',
+ name: 'career_interests',
components: { QuestionEdit },
data () {
return {
@@ -265,7 +265,13 @@
if (_this.partOrder !== nowPartOrder) {
_this.isShowGuide(true)
}
- _this.preDisable = true
+
+ // 濡傛灉涓婁竴棰樹笉鏄湰娈碉紝鍒欎笉鑳借繑鍥炰笂涓�娈�
+ if (this.isDiffPartOrder()) {
+ _this.preDisable = false
+ } else {
+ _this.preDisable = true
+ }
_this.nextDisable = false
_this.answer.answerItems[_this.order].startTime = _this.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
@@ -395,6 +401,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]
@@ -458,7 +471,7 @@
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, tokenId: _this.memberToken } })
+ _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess, tokenId: _this.memberToken, type: 'CIAQ' } })
} else {
_this.$message.error(re.message + '/exam/finish')
}
--
Gitblit v1.9.1