From 42fa5d84c3f5fb151a194fea3741a58bd5b4edb6 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期四, 29 二月 2024 14:53:33 +0800
Subject: [PATCH] API-Fan增加显示logo页面

---
 src/views/demography/langOption.vue |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/demography/langOption.vue b/src/views/demography/langOption.vue
index ff4257f..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>
@@ -32,8 +32,8 @@
     return {
       langTypes: [],
       langSelectValue: this.$route.query.langSelectValue,
-      langWelcome: this.$t('langWelcomeEnglish'),
-      langOption: this.$t('langOptionEnglish'),
+      langWelcome: this.$t('langWelcomeChinese'),
+      langOption: this.$t('langOptionChinese'),
       timer: null,
       submissionLang: this.$t('submission'),
       isLangKaiStyle: false
@@ -50,15 +50,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) {
@@ -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