From a778d5e53e74b2170e37607b2536a957dbc1d664 Mon Sep 17 00:00:00 2001
From: yj <2077506045@qq.com>
Date: 星期一, 25 十一月 2024 13:59:58 +0800
Subject: [PATCH] 合并本地修改
---
src/views/demography/langOption.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/demography/langOption.vue b/src/views/demography/langOption.vue
index c204e19..2f7930e 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,6 +32,7 @@
return {
langTypes: [],
langSelectValue: this.$route.query.langSelectValue,
+ // fromDo: this.$route.query.fromDo,
langWelcome: this.$t('langWelcomeChinese'),
langOption: this.$t('langOptionChinese'),
timer: null,
@@ -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.langType } })
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