From d9e74666ce84b0f32c5cd6f9799d61bd0b009f10 Mon Sep 17 00:00:00 2001
From: yj <2077506045@qq.com>
Date: 星期四, 04 七月 2024 09:28:27 +0800
Subject: [PATCH] 1.修复填写人口学变量页面刷新后变为英文的问题 2.更新JAQ文字，打开岗位说明 -> 问卷作答说明
---
src/lang/th.js | 1 +
/dev/null | 0
src/lang/zh.js | 3 ++-
dist-20240703.zip | 0
src/lang/en.js | 1 +
src/views/exam/paper/guide.vue | 2 +-
src/views/demography/index.vue | 17 +++++++++++++++--
src/views/demography/langOption.vue | 2 ++
src/views/demography/login.vue | 6 ++++--
9 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/dist-20240411.zip b/dist-20240411.zip
deleted file mode 100644
index 6e10915..0000000
--- a/dist-20240411.zip
+++ /dev/null
Binary files differ
diff --git a/dist-20240703.zip b/dist-20240703.zip
new file mode 100644
index 0000000..a0ee612
--- /dev/null
+++ b/dist-20240703.zip
Binary files differ
diff --git a/src/lang/en.js b/src/lang/en.js
index ce81d23..87d83af 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -29,6 +29,7 @@
finishSubmit: 'You have completed the work behavior questionnaire, and the data has been successfully uploaded to the server and saved. Thank you.',
selectData: 'Date',
startDo: 'Next',
+ openJobDesc: '闂嵎浣滅瓟璇存槑',
startDo_apifan: 'Start the Test',
second: ' second ',
min: ' minute ',
diff --git a/src/lang/th.js b/src/lang/th.js
index b9b55e6..5d5a038 100644
--- a/src/lang/th.js
+++ b/src/lang/th.js
@@ -29,6 +29,7 @@
finishSubmit: 'You have completed the work behavior questionnaire, and the data has been successfully uploaded to the server and saved. Thank you.',
selectData: 'Date',
startDo: 'Start the Test',
+ openJobDesc: '闂嵎浣滅瓟璇存槑',
startDo_apifan: 'Start the Test',
second: ' second ',
min: ' minute ',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 90cca7d..efdaddb 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -28,6 +28,7 @@
finishSubmit: '鎮ㄥ凡缁忓畬鎴愪簡宸ヤ綔琛屼负闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐�傝阿璋€��',
selectData: '閫夋嫨鏃ユ湡',
startDo: '寮�濮嬫祴璇�',
+ openJobDesc: '闂嵎浣滅瓟璇存槑',
startDo_apifan: '姝ｅ紡寮�濮嬫祴璇�',
second: '绉�',
min: '鍒�',
@@ -62,7 +63,7 @@
partRemailTime: '鍓╀綑鏃堕棿:',
finishIntelligenceInfo: '鎮ㄥ凡缁忓畬鎴愪簡璁ょ煡鑳藉姏娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐�傝阿璋€��',
finishPersonalityInfo: '鎮ㄥ凡缁忓畬鎴愪簡浜烘牸娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐�傜幇鍦ㄦ偍鍙互鐐瑰嚮涓嬮潰鐨勨�滃叧闂�濇寜閽叧闂〉闈�',
- finishPersonalityInfo_apifan: '鎰熻阿鎮ㄧ敵璇锋湰鍏徃鐨勮亴浣嶏紒鎮ㄥ凡缁忓畬鎴愪簡浜烘牸娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽凡缁忎繚瀛樺ソ銆傜幇鍦ㄦ偍鍙互鐐瑰嚮涓嬮潰鐨勨�滃叧闂�濇寜閽叧闂〉闈€��',
+ finishPersonalityInfo_apifan: '鎮ㄥ凡缁忓畬鎴愪簡浜烘牸娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽凡缁忎繚瀛樺ソ銆傜幇鍦ㄦ偍鍙互鐐瑰嚮涓嬮潰鐨勨�滃叧闂�濇寜閽叧闂〉闈€��',
finishCareerInterestsInfo: '鎮ㄥ凡缁忓畬鎴愪簡鑱屼笟鍏磋叮闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐��',
finishPersonalityDownInfo: '鎮ㄥ彲浠ョ偣鍑讳笅闈㈡寜閽笅杞芥偍鐨勭粨鏋滄姤鍛娿��',
finishViewReportInfo: '鎮ㄥ彲浠ョ偣鍑讳笅闈㈡寜閽煡鐪嬫偍鐨勭粨鏋滄姤鍛娿��',
diff --git a/src/views/demography/index.vue b/src/views/demography/index.vue
index ae83ec7..99fe45b 100644
--- a/src/views/demography/index.vue
+++ b/src/views/demography/index.vue
@@ -113,12 +113,24 @@
}
},
created () {
+ const langType = localStorage.getItem('langType')
+ if (langType) {
+ this.setLangType(langType)
+ } else {
+ localStorage.setItem('langType', this.langType)
+ }
+ },
+ beforeDestroy () {
+ localStorage.removeItem('langType')
+ },
+ beforeUpdate () {
+ },
+ updated () {
},
methods: {
submitDemography: function () {
let _this = this
_this.submitDisable = true
- console.log( this.$refs.demographyMenber)
this.$refs.demographyMenber.validate(vaild => {
if (vaild) {
_this.parasInfos = []
@@ -192,7 +204,8 @@
})
},
...mapMutations('user', ['setMemberTocken']),
- ...mapMutations('exam', ['setDoUrl'])
+ ...mapMutations('exam', ['setDoUrl']),
+ ...mapMutations('user', ['setLangType'])
},
computed: {
...mapState('user', { memberToken: state => state.memberToken }),
diff --git a/src/views/demography/langOption.vue b/src/views/demography/langOption.vue
index 0e3a6c0..25a9f98 100644
--- a/src/views/demography/langOption.vue
+++ b/src/views/demography/langOption.vue
@@ -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,
@@ -40,6 +41,7 @@
}
},
created: function () {
+
let _this = this
window.clearInterval(this.timer)
_this.getLangType()
diff --git a/src/views/demography/login.vue b/src/views/demography/login.vue
index a1d50ae..38b8c51 100644
--- a/src/views/demography/login.vue
+++ b/src/views/demography/login.vue
@@ -23,6 +23,8 @@
}
},
created () {
+ // 娓呴櫎鏈湴瀛樺偍鐨勮瑷�閫夐」
+ localStorage.removeItem('langType')
let _this = this
_this.getLangType()
// 璁板綍鐧婚檰鏃ュ織
@@ -62,7 +64,7 @@
reParam => {
if (reParam.code !== 1) {
// 鑱屼笟鍏磋叮鎶ュ憡鐗规畩鍖栧鐞� 鍙湁涓枃
- if (_this.doUrl === 'career_interests') {
+ if (_this.doUrl === 'career_interests' || _this.doUrl === 'job') {
_this.$i18n.locale = 'zh'
_this.setLangType('Chinese')
_this.$router.push({ path: '/demography/fill/index', query: { demographyMenber: _this.memberToken, isStart: false } })
@@ -78,7 +80,7 @@
}
// 鍏堥�夋嫨瀵嗙爜
- _this.$router.push({ path: '/demography/fill/langOption', query: { langSelectValue: _this.langType } })
+ _this.$router.push({ path: '/demography/fill/langOption', query: { langSelectValue: _this.langType, fromDo: _this.fromDo } })
_this.setMemberTocken(_this.paraMemberToken)
return
}
diff --git a/src/views/exam/paper/guide.vue b/src/views/exam/paper/guide.vue
index 10122c4..6ab4db6 100644
--- a/src/views/exam/paper/guide.vue
+++ b/src/views/exam/paper/guide.vue
@@ -8,7 +8,7 @@
<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>鎵撳紑宀椾綅璇存槑</el-button>
+ <el-button v-if="formDo.questionTemplateId === 'job'" @click="openExplain" type="danger" round>{{$t('openJobDesc')}}</el-button>
<el-button v-if="formDo.questionTemplateId === 'personality'" @click="openExercise" type="primary" round>{{$t('exercise_start')}}</el-button>
</el-row>
</el-main>
--
Gitblit v1.9.1