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/demography/langOption.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/views/demography/langOption.vue b/src/views/demography/langOption.vue
index ff4257f..63f8457 100644
--- a/src/views/demography/langOption.vue
+++ b/src/views/demography/langOption.vue
@@ -7,8 +7,8 @@
<el-select v-model="langSelectValue" :placeholder= "$t('pleaseSelect')" style="width: 55%">
<el-option
v-for="itemIter in langTypes"
- :key="itemIter.dictValue"
- :label="itemIter.dictValue"
+ :key="itemIter.dictLabel"
+ :label="itemIter.dictLabel=='Chinese'?'涓枃':itemIter.dictLabel"
:value="itemIter.dictValue">
</el-option>
</el-select>
@@ -32,8 +32,9 @@
return {
langTypes: [],
langSelectValue: this.$route.query.langSelectValue,
- langWelcome: this.$t('langWelcomeEnglish'),
- langOption: this.$t('langOptionEnglish'),
+ // fromDo: this.$route.query.fromDo,
+ langWelcome: this.$t('langWelcomeChinese'),
+ langOption: this.$t('langOptionChinese'),
timer: null,
submissionLang: this.$t('submission'),
isLangKaiStyle: false
@@ -50,15 +51,15 @@
num = 0
}
if (num === 0) {
- _this.langWelcome = _this.$t('langWelcomeEnglish')
- _this.langOption = _this.$t('langOptionEnglish')
- _this.isLangKaiStyle = false
- }
-
- if (num === 3) {
_this.langWelcome = _this.$t('langWelcomeChinese')
_this.langOption = _this.$t('langOptionChinese')
_this.isLangKaiStyle = true
+ }
+
+ if (num === 3) {
+ _this.langWelcome = _this.$t('langWelcomeEnglish')
+ _this.langOption = _this.$t('langOptionEnglish')
+ _this.isLangKaiStyle = false
}
if (num === 6) {
@@ -76,7 +77,7 @@
submitLangOption: function () {
let _this = this
_this.setLangType(_this.langSelectValue)
- _this.$router.push({ path: '/demography/fill/index', query: { demographyMenber: _this.memberToken, isStart: false } })
+ _this.$router.push({ path: '/demography/fill/index', query: { demographyMenber: _this.memberToken, isStart: false, langType: _this.langSelectValue } })
window.clearInterval(this.timer)
},
getLangAndRportTemplateId () {
@@ -84,7 +85,7 @@
if (_this.reportTemplateId.trim() === '' || _this.reportTemplateId.trim() === null) {
examPaperApi.selectTokenId(_this.memberToken).then(re => {
if (re.response.finish === 1) {
- _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 } })
} else {
_this.setReportTemplateId(re.response.reportTemplateId)
demographyApi.queryLangList(_this.memberToken, _this.reportTemplateId).then(function (result) {
@@ -108,6 +109,7 @@
_this.$message.error(_this.$t('noquestionMsg'))
})
}
+
},
...mapMutations('user', ['setMemberTocken']),
...mapMutations('user', ['setLangType']),
--
Gitblit v1.9.1