From 2a3a43ce025901d5ddcc6d622909297dae1a94c7 Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期六, 15 四月 2023 17:09:56 +0800
Subject: [PATCH] CIAQ页面完善
---
src/lang/th.js | 1 +
src/lang/zh.js | 3 ++-
src/lang/en.js | 1 +
src/views/exam/paper/career_interests.vue | 14 ++++++++++++--
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/lang/en.js b/src/lang/en.js
index 4d5488f..fc59515 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -51,6 +51,7 @@
partRemailTime: 'Remaining Time:',
finishIntelligenceInfo: 'You have completed the cognitive ability test questionnaire, the data has been successfully uploaded to the server, and has been saved. Thank you.',
finishPersonalityInfo: 'You have completed the personality quetionnaire, and the data has been successfully uploaded to the server and saved. ',
+ finishCareerInterestsInfo: 'You have completed the Career Interests quetionnaire, and the data has been successfully uploaded to the server and saved. ',
finishPersonalityDownInfo: 'You may click the red button below to download your test report.',
langWelcomeThai: '喔⑧复喔權笖喔掂笗喔笝喔`副喔氞釜喔灌箞喙�喔о箛喔氞箘喔嬥涪喙屶釜喔赤斧喔`副喔氞笚喔赤箒喔氞笟喔椸笖喔腑喔氞競喔竾',
langOptionThai: '喔佮福喔膏笓喔侧箑喔ム阜喔竵喔犩覆喔┼覆 喙佮弗喔班竸喔ム复喔� 鈥溹笖喔赤箑喔權复喔權竵喔侧福喔曕箞喔�.',
diff --git a/src/lang/th.js b/src/lang/th.js
index 1b3817e..4da663c 100644
--- a/src/lang/th.js
+++ b/src/lang/th.js
@@ -51,6 +51,7 @@
partRemailTime: 'Remaining Time:',
finishIntelligenceInfo: 'You have completed the cognitive ability test questionnaire, the data has been successfully uploaded to the server, and has been saved. Thank you.',
finishPersonalityInfo: 'You have completed the personality quetionnaire, and the data has been successfully uploaded to the server and saved. ',
+ finishCareerInterestsInfo: 'You have completed the Career Interests quetionnaire, and the data has been successfully uploaded to the server and saved. ',
finishPersonalityDownInfo: 'You may click the red button below to download your test report.',
langWelcomeThai: '喔⑧复喔權笖喔掂笗喔笝喔`副喔氞釜喔灌箞喙�喔о箛喔氞箘喔嬥涪喙屶釜喔赤斧喔`副喔氞笚喔赤箒喔氞笟喔椸笖喔腑喔氞競喔竾',
langOptionThai: '喔佮福喔膏笓喔侧箑喔ム阜喔竵喔犩覆喔┼覆 喙佮弗喔班竸喔ム复喔� 鈥溹笖喔赤箑喔權复喔權竵喔侧福喔曕箞喔�.'
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 5d4d5cc..db7be38 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -51,6 +51,7 @@
partRemailTime: '鍓╀綑鏃堕棿:',
finishIntelligenceInfo: '鎮ㄥ凡缁忓畬鎴愪簡璁ょ煡鑳藉姏娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熺殑涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐�傝阿璋€��',
finishPersonalityInfo: '鎮ㄥ凡缁忓畬鎴愪簡浜烘牸娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熺殑涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐��',
+ finishCareerInterestsInfo: '鎮ㄥ凡缁忓畬鎴愪簡鑱屼笟鍏磋叮闂嵎锛屾暟鎹凡缁忔垚鍔熺殑涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐��',
finishPersonalityDownInfo: '鎮ㄥ彲浠ョ偣鍑讳笅闈㈢孩鑹叉寜閽笅杞芥偍鐨勭粨鏋滄姤鍛娿��',
langWelcomeThai: '喔⑧复喔權笖喔掂笗喔笝喔`副喔氞釜喔灌箞喙�喔о箛喔氞箘喔嬥涪喙屶釜喔赤斧喔`副喔氞笚喔赤箒喔氞笟喔椸笖喔腑喔氞競喔竾',
langOptionThai: '喔佮福喔膏笓喔侧箑喔ム阜喔竵喔犩覆喔┼覆 喙佮弗喔班竸喔ム复喔� 鈥溹笖喔赤箑喔權复喔權竵喔侧福喔曕箞喔�.',
@@ -87,5 +88,5 @@
values_pic_tmpArea:'鏆傚瓨鍖�',
values_pic_tmpArea_desc:'杩欐槸鎮ㄦ煡鐪嬫牴鎹浘鐗囬�夋嫨鍒涘缓鐨勭被鍒殑鏈轰細銆備綔涓烘彁閱掞紝鎮ㄥ湪姣忎釜绫诲埆涓斁缃殑鍥惧儚浠庡乏鍒板彸鐨勯『搴忔棤鍏崇揣瑕併�傚鏋滀綘瑙夊緱浣犳兂鍥涘绉诲姩鍥剧墖锛屼綘蹇呴』鍏堟妸瀹冧滑鎷栧埌鏆傚瓨鍖猴紝鐒跺悗鍐嶆妸瀹冧滑鏀捐繘涓�涓柊鐨勭被鍒�備负浜嗙敤鍙︿竴涓浘鐗囨浛鎹㈢被鍒腑鐨勪竴寮犲浘鐗囷紝蹇呴』灏嗕袱寮犲浘鐗囨嫋鍒版殏瀛樺尯銆備竴鏃︽偍瀵硅嚜宸辩殑閫夋嫨鎰熷埌婊℃剰锛屽崟鍑烩�滄彁浜も�濓紝鎮ㄧ殑閫夋嫨灏嗘渶缁堢‘瀹氥��',
values_nextStepTips_tips:'璇烽�氳繃灏嗗浘鍍忓垎涓轰節绫绘潵缁嗗寲鍥惧儚鐨勬帓搴忓拰鎺掑悕銆傝娉ㄦ剰锛屾偍鍙互鍦ㄦ瘡涓被鍒腑鏀剧疆鐨勫浘鍍忔暟閲忔槸鍥哄畾鐨勩��'
-
+
}
diff --git a/src/views/exam/paper/career_interests.vue b/src/views/exam/paper/career_interests.vue
index 56970ce..662ae2a 100644
--- a/src/views/exam/paper/career_interests.vue
+++ b/src/views/exam/paper/career_interests.vue
@@ -60,7 +60,6 @@
import examPaperApi from '@/api/examPaper'
import examPaperAnswerApi from '@/api/examPaperAnswer'
import demographyApi from '@/api/demography'
-
export default {
name: 'personality',
components: { QuestionEdit },
@@ -94,6 +93,7 @@
guideTitle: '',
guideDescirption: '',
isCallTain: '',
+ isSignalObject: '',
memberName: '',
itemSize: '', // 棰樼洰闀垮害
startDoDisable: true,
@@ -295,6 +295,9 @@
catThaiSubmit: function (answerSubmit) {
answerSubmit.isCallTain = 'CallThai'
},
+ setSignalObject: function (answerSubmit) {
+ answerSubmit.isSignalObject = 'CIAQ'
+ },
getEmptySubjct: function (order) {
let _this = this
_this.itemOrder = _this.form.titleItems[0].questionItems[order].itemOrder
@@ -344,10 +347,15 @@
}
this.answer.answerItems[_this.order].readOnly = true
let answerSubmit = _this.getSubmitAnswerValue(nowPartOrder)
+ console.log(answerSubmit)
// 宸茬粡绛斿埌浜嗘渶鍚庝竴棰樹簡,涓嶇敤鑷姩璺冲埌涓嬩竴棰�
if (this.order + 1 > this.problemLength) {
this.submitDisable = false
return
+ }
+ // 濡傛灉鏄渶鍚庝竴棰樺氨涓婇潰鎻愪氦浜嗭紝涓嶄細璧板埌杩欓噷
+ if (this.isNextShowGuide(nowPartOrder)) {
+ this.setSignalObject(answerSubmit)
}
examPaperAnswerApi.answerSubmit(answerSubmit, _this.memberToken).then(re => {
if (re.code !== 1) {
@@ -378,6 +386,7 @@
})
answerSubmit.langType = _this.langType
answerSubmit.isCallTain = _this.isCallTain
+ answerSubmit.isSignalObject = _this.isSignalObject
answerSubmit.partOrder = nowPartOrder
answerSubmit.itemOrder = _this.itemOrder
return answerSubmit
@@ -426,13 +435,14 @@
} else {
_this.answer.verifyStatus = 1
_this.answer.finish = 1
- _this.submitAnswer(_this.$t('finishPersonalityInfo'))
+ _this.submitAnswer(_this.$t('finishCareerInterestsInfo'))
}
},
startDo: function () {
let _this = this
_this.guide = false
_this.isCallTain = ''
+ _this.isSignalObject = ''
},
submitAnswer: function (mess) {
let _this = this
--
Gitblit v1.9.1