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/demography/langOption.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/demography/langOption.vue b/src/views/demography/langOption.vue
index c204e19..0e3a6c0 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>
@@ -84,12 +84,13 @@
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) {
if (result && result.code === 1) {
_this.langTypes = result.response
+ console.log("longTypes", _this.langTypes)
}
}
).catch(e => {
--
Gitblit v1.9.1