From 5e4bed2d67b26eeb7eab4d176bfabe3f527836e4 Mon Sep 17 00:00:00 2001
From: yj <2077506045@qq.com>
Date: 星期五, 19 七月 2024 13:48:29 +0800
Subject: [PATCH] 修复答题刷新与CAQ分片2从第2题开始bug
---
src/views/exam/paper/guide.vue | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/src/views/exam/paper/guide.vue b/src/views/exam/paper/guide.vue
index 6ab4db6..8b60709 100644
--- a/src/views/exam/paper/guide.vue
+++ b/src/views/exam/paper/guide.vue
@@ -1,11 +1,12 @@
<template>
- <div>
- <el-container class="app-item-contain">
+ <div v-loading.fullscreen.lock="!formDo">
+ <el-container class="app-item-contain" v-if="formDo">
<el-header class="align-center" style="height: 50px;padding: 1%;margin-top: 4%">
<H2 v-html="$t('guide')" v-if="formDo.questionTemplateId !== 'job' || formDo.questionTemplateId !== 'values'"></H2>
</el-header>
<el-main style="padding-top:0%">
- <div v-html="formDo.guide"></div>
+ <div v-html="formDo.guide">
+ </div>
<el-row class="do-align-center">
<el-button v-if="formDo.questionTemplateId !== 'personality'" @click="doExam" type="primary" round>{{$t('startDo')}}</el-button>
<el-button v-if="formDo.questionTemplateId === 'job'" @click="openExplain" type="danger" round>{{$t('openJobDesc')}}</el-button>
@@ -17,27 +18,27 @@
</template>
<script>
-import { mapState } from 'vuex'
+import { mapState, mapMutations } from 'vuex'
import examPaperApi from '@/api/examPaper'
export default {
data () {
return {
- formDo: this.$route.query.formDo
+ // formDo: this.$route.query.formDo,
+ loading: false
}
},
created () {
+ this.getFormDo()
},
mounted () {
- // 鏇挎崲APIFan鎸囧璇腑鐨勫彉閲�
- if (this.formDo.productType === 'API_Fan') {
- let guide = this.formDo.guide
- guide = guide.replace('%%fullName%%', this.formDo.memberName)
- guide = guide.replace('%%company%%', this.formDo.reportCompany)
- this.formDo.guide = guide
- }
+ // this.swapGuide()
},
beforeDestroy () {
- window.clearInterval(this.timer)
+ },
+ watch: {
+ 'formDo': function (newVal, oldVal) {
+ this.loading = false
+ }
},
methods: {
doExam: function () {
@@ -45,9 +46,11 @@
examPaperApi.updateTestMemberStatus(_this.memberToken).then(re => {
// LAQ鐗规畩澶勭悊
if (_this.formDo.name.indexOf('LAQ') !== -1) {
- _this.$router.push({ path: '/exam/' + _this.formDo.questionTemplateId, query: { formDo: _this.$route.query.formDo } })
+ // _this.$router.push({ path: '/exam/' + _this.formDo.questionTemplateId, query: { formDo: _this.formDo } })
+ _this.$router.push({ path: '/exam/' + _this.formDo.questionTemplateId })
} else {
- _this.$router.push({ path: '/exam/' + _this.doUrl, query: { formDo: _this.$route.query.formDo } })
+ // _this.$router.push({ path: '/exam/' + _this.doUrl, query: { formDo: _this.formDo } })
+ _this.$router.push({ path: '/exam/' + _this.doUrl })
}
}).catch(re => {
_this.$message.error(re.message + ' 鏇存柊鐘舵�佸け璐�')
@@ -61,12 +64,29 @@
// 鎵撳紑缁冧範椤甸潰
openExercise: function () {
let _this = this
- _this.$router.push({ path: '/exam/exercise', query: { formDo: _this.$route.query.formDo } })
- }
+ // _this.$router.push({ path: '/exam/exercise', query: { formDo: _this.formDo } })
+ _this.$router.push({ path: '/exam/exercise' })
+ },
+
+ // 鏇挎崲guide鐨勫��
+ swapGuide: function () {
+ // 鏇挎崲APIFan鎸囧璇腑鐨勫彉閲�
+ if (this.formDo.productType === 'API_Fan') {
+ let guide = this.formDo.guide
+ guide = guide.replace('%%fullName%%', this.formDo.memberName)
+ guide = guide.replace('%%company%%', this.formDo.reportCompany)
+ this.formDo.guide = guide
+ }
+ },
+
+ ...mapMutations('user', ['getLangType']),
+ ...mapMutations('user', ['getFormDo'])
},
computed: {
...mapState('exam', { doUrl: state => state.doUrl }),
- ...mapState('user', { memberToken: state => state.memberToken })
+ ...mapState('user', { memberToken: state => state.memberToken }),
+ ...mapState('user', { langType: state => state.langType }),
+ ...mapState('user', { formDo: state => state.formDo })
}
}
</script>
--
Gitblit v1.9.1