From 344f036938910b806b952cd81f6fb909aa7d77df Mon Sep 17 00:00:00 2001
From: 84702473 <84702473@qq.com>
Date: 星期六, 15 四月 2023 11:10:36 +0800
Subject: [PATCH] 修改对齐方式，修改大小写，修复刷新切换语言的BUG
---
src/lang/zh.js | 5
src/store/modules/user.js | 5 +
src/lang/en.js | 5
src/views/exam/paper/values.vue | 249 +++++--------------------------------------------
src/views/exam/paper/guide.vue | 2
5 files changed, 42 insertions(+), 224 deletions(-)
diff --git a/src/lang/en.js b/src/lang/en.js
index 4d5488f..cdfdc1b 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -61,10 +61,13 @@
values_title:'Pre-Sort Your Response',
values_title_description:'This is the pre-sorting section of the test. <br/>During this section, you will choose the pictures in which the character is most like you. <br/>All of these pictures will be shown again in later sections for the final sorting process.',
values_title_description_1:'If you think the main character is like you, click ',
+ values_title_description_1_2:' .',
values_title_description_2:'If you think the main character is not like you, click ',
+ values_title_description_2_2:' .',
values_title_description_3:'If you are not sure, click ',
+ values_title_description_3_2:' .',
values_title_description_4:'Click ',
- values_title_description_4_2:' to zoom in the picture',
+ values_title_description_4_2:' to zoom in the picture.',
next:'Next',
pre:'Back',
commit:'Submit',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 5d4d5cc..e24f018 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -61,10 +61,13 @@
values_title:'棰勫厛鎺掑簭鎮ㄧ殑鍥炵瓟',
values_title_description:'杩欐槸娴嬭瘯鐨勯鎺掑簭閮ㄥ垎<br/>鍦ㄦ閮ㄥ垎涓紝鎮ㄥ皢閫夋嫨瑙掕壊鏈�鍍忔偍鐨勫浘鐗�<br/>鎵�鏈夎繖浜涘浘鐗囧皢鍦ㄥ悗闈㈢殑閮ㄥ垎涓啀娆℃樉绀猴紝浠ヤ究杩涜鏈�缁堟帓搴忋��',
values_title_description_1:'濡傛灉浣犺涓轰富瑙掑拰浣犱竴鏍�, 鐐瑰嚮 ',
+ values_title_description_1_2:' 銆�',
values_title_description_2:'濡傛灉浣犺涓轰富瑙掑拰浣犱笉涓�鏍�, 鐐瑰嚮 ',
+ values_title_description_2_2:' 銆�',
values_title_description_3:'濡傛灉浣犱笉纭畾, 鐐瑰嚮 ',
+ values_title_description_3_2:' 銆�',
values_title_description_4:'鐐瑰嚮 ',
- values_title_description_4_2:' 鏀惧ぇ鍥剧墖',
+ values_title_description_4_2:' 鏀惧ぇ鍥剧墖銆�',
next:'涓嬩竴姝�',
pre:'涓婁竴姝�',
commit:'鎻愪氦',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 86b0af2..bb42548 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -41,6 +41,11 @@
},
setLangType (state, paraLangType) {
state.langType = paraLangType
+ if(paraLangType == 'Chinese'){
+ Cookies.set('language', 'zh', { expires: 30 })
+ } else {
+ Cookies.set('language', 'en', { expires: 30 })
+ }
},
getLangType () {
let language = (navigator.language || navigator.browserLanguage).toLowerCase()
diff --git a/src/views/exam/paper/guide.vue b/src/views/exam/paper/guide.vue
index 3a76279..53364aa 100644
--- a/src/views/exam/paper/guide.vue
+++ b/src/views/exam/paper/guide.vue
@@ -2,7 +2,7 @@
<div>
<el-container class="app-item-contain">
<el-header class="align-center" style="height: 50px;padding: 1%;">
- <H2 v-html="$t('guide')" v-if="formDo.questionTemplateId !== 'job'"></H2>
+ <H2 v-html="$t('guide')" v-if="formDo.questionTemplateId !== 'job' || formDo.questionTemplateId !== 'values'"></H2>
</el-header>
<el-main style="padding-top:0%">
<div v-html="formDo.guide"></div>
diff --git a/src/views/exam/paper/values.vue b/src/views/exam/paper/values.vue
index 59dc52e..88b961c 100644
--- a/src/views/exam/paper/values.vue
+++ b/src/views/exam/paper/values.vue
@@ -18,10 +18,10 @@
<el-main class="">
<div>
<div v-html="$t('values_title_description')"></div>
- <div>{{$t('values_title_description_1')}}<img class="tools-button" src="@/assets/exam-paper/good.png" style="width: 15px;"/></div>
- <div>{{$t('values_title_description_2')}}<img class="tools-button" src="@/assets/exam-paper/nogood.png" style="width: 15px;"/></div>
- <div>{{$t('values_title_description_3')}}<img class="tools-button" src="@/assets/exam-paper/question.png" style="width: 15px;"/></div>
- <div>{{$t('values_title_description_4')}}<img class="tools-button" src="@/assets/exam-paper/scale.png" style="width: 15px;"/>{{$t('values_title_description_4_2')}}</div>
+ <div>{{$t('values_title_description_1')}}<img class="tools-button" src="@/assets/exam-paper/good.png" style="width: 15px;position: absolute;margin-top: 2px"/><span style="margin-left: 20px;">{{$t('values_title_description_1_2')}}</span></div>
+ <div>{{$t('values_title_description_2')}}<img class="tools-button" src="@/assets/exam-paper/nogood.png" style="width: 15px;position: absolute;margin-top: 2px"/><span style="margin-left: 20px;">{{$t('values_title_description_2_2')}}</span></div>
+ <div>{{$t('values_title_description_3')}}<img class="tools-button" src="@/assets/exam-paper/question.png" style="width: 15px;position: absolute;margin-top: 2px"/><span style="margin-left: 20px;">{{$t('values_title_description_3_2')}}</span></div>
+ <div>{{$t('values_title_description_4')}}<img class="tools-button" src="@/assets/exam-paper/scale.png" style="width: 15px;height: 15px;position: absolute;margin-top: 2px"/><span style="margin-left: 20px;">{{$t('values_title_description_4_2')}}</span></div>
</div>
<div style="display: flex;justify-content: flex-start;padding: 10px 0;">
@@ -89,10 +89,10 @@
<div style="line-height: 50px;text-indent: 2em;">
<div
v-if="(step2SubStep == step2ScoreRanges.length) && (step2ScoreRanges.length % 2 == 1)">
- {{$t('values_step_tips_for_3').replace('%N',getStep2StepItem(step2SubStep).quantity).replace('%C',getStep2StepItem(step2SubStep).stepName)}}
+ {{$t('values_step_tips_for_3').replace('%N',getStep2StepItem(step2SubStep).quantity).replace('%C',getStep2StepItem(step2SubStep).stepName.toUpperCase())}}
</div>
<div v-else>
- {{$t('values_step_tips_for_1').replace('%N',getStep2StepItem(step2SubStep).quantity).replace('%C',getStep2StepItem(step2SubStep).stepName)}}
+ {{$t('values_step_tips_for_1').replace('%N',getStep2StepItem(step2SubStep).quantity).replace('%C',getStep2StepItem(step2SubStep).stepName.toUpperCase())}}
</div>
<div style="color: red;">
{{$t('values_step_tips')}}
@@ -275,210 +275,7 @@
"subjectId": null,
},
step3EWEIArea: [1],
- form: {
- "id": 92,
- "level": 1,
- "subjectId": null,
- "paperType": 1,
- "name": "VAQ",
- "suggestTime": null,
- "limitDateTime": null,
- "titleItems": [{
- "guide": "",
- "name": "",
- "description": "",
- "permanentId": null,
- "questionOrder": 0,
- "questionReport": null,
- "questionItems": [{
- "id": 786,
- "questionType": 1,
- "subjectId": null,
- "title": "楹诲皢妗�",
- "gradeLevel": null,
- "items": [{
- "prefix": "1",
- "content": "0",
- "score": "0"
- }],
- "analyze": null,
- "correctArray": null,
- "correct": null,
- "score": "0",
- "difficult": null,
- "itemOrder": 1,
- "questionOrder": 0,
- "permanentId": "VAQ00001",
- "questionReport": null,
- "startTime": null,
- "endTime": null,
- "partOrder": 1,
- "parentQuestionId": null,
- "template": null,
- "questionNumber": null,
- "content": null,
- "imgUrl": "http://127.0.0.1:8090/profile/images/2022/12/26/b698d623e7c9a55d9017ffa08477b121.jpg"
- },
- {
- "id": 787,
- "questionType": 1,
- "subjectId": null,
- "title": "楹诲皢妗�2",
- "gradeLevel": null,
- "items": [{
- "prefix": "1",
- "content": "0",
- "score": "0"
- }],
- "analyze": null,
- "correctArray": null,
- "correct": null,
- "score": "0",
- "difficult": null,
- "itemOrder": 2,
- "questionOrder": 1,
- "permanentId": "VAQ00002",
- "questionReport": null,
- "startTime": null,
- "endTime": null,
- "partOrder": 2,
- "parentQuestionId": null,
- "template": null,
- "questionNumber": null,
- "content": null,
- "imgUrl": "http://127.0.0.1:8090/profile/images/2022/12/26/123f79ad0cc38507368c22b8a7ec9b09.jpg"
- },
- {
- "id": 788,
- "questionType": 1,
- "subjectId": null,
- "title": "娴嬭瘯1",
- "gradeLevel": null,
- "items": [{
- "prefix": "1",
- "content": "0",
- "score": "0"
- }],
- "analyze": null,
- "correctArray": null,
- "correct": null,
- "score": "0",
- "difficult": null,
- "itemOrder": 3,
- "questionOrder": 2,
- "permanentId": "VAQ00003",
- "questionReport": null,
- "startTime": null,
- "endTime": null,
- "partOrder": 3,
- "parentQuestionId": null,
- "template": null,
- "questionNumber": null,
- "content": null,
- "imgUrl": "http://127.0.0.1:8090/profile/images/2023/01/09/6b80baab47a9eba6ceeec5a723397109.jpg"
- },
- {
- "id": 789,
- "questionType": 1,
- "subjectId": null,
- "title": "娴嬭瘯2",
- "gradeLevel": null,
- "items": [{
- "prefix": "1",
- "content": "0",
- "score": "0"
- }],
- "analyze": null,
- "correctArray": null,
- "correct": null,
- "score": "0",
- "difficult": null,
- "itemOrder": 4,
- "questionOrder": 3,
- "permanentId": "VAQ00004",
- "questionReport": null,
- "startTime": null,
- "endTime": null,
- "partOrder": 4,
- "parentQuestionId": null,
- "template": null,
- "questionNumber": null,
- "content": null,
- "imgUrl": "http://127.0.0.1:8090/profile/images/2023/01/09/3f8e18280f1d47362c69b18e80ddf1a3.jpg"
- },
- {
- "id": 790,
- "questionType": 1,
- "subjectId": null,
- "title": "娴嬭瘯3",
- "gradeLevel": null,
- "items": [{
- "prefix": "1",
- "content": "0",
- "score": "0"
- }],
- "analyze": null,
- "correctArray": null,
- "correct": null,
- "score": "0",
- "difficult": null,
- "itemOrder": 5,
- "questionOrder": 4,
- "permanentId": "VAQ00005",
- "questionReport": null,
- "startTime": null,
- "endTime": null,
- "partOrder": 5,
- "parentQuestionId": null,
- "template": null,
- "questionNumber": null,
- "content": null,
- "imgUrl": "http://127.0.0.1:8090/profile/images/2023/01/09/447616cb14745241f0ac700b56d0770b.jpg"
- }
- ],
- "startTime": null,
- "endTime": null,
- "parts": [],
- "scoreRanges": [{
- "itemOrder": 1,
- "quantity": 2,
- "score": 5,
- "completed": false,
- "questionReports": null
- },
- {
- "itemOrder": 2,
- "quantity": 1,
- "score": 10,
- "completed": false,
- "questionReports": null
- },
- {
- "itemOrder": 3,
- "quantity": 2,
- "score": 5,
- "completed": false,
- "questionReports": null
- }
- ]
- }],
- "score": null,
- "guide": "VAQ",
- "questionOrder": [
- 0,
- 1,
- 2,
- 3,
- 4
- ],
- "parts": [],
- "questionTemplateId": "values",
- "reportTemplateId": "61",
- "memberName": "test4",
- "optionOrder": null,
- "timeOut": null,
- "jobDescriptionFile": null
- },
+ form:{},
formLoading: false,
answer: {
questionId: null,
@@ -514,7 +311,9 @@
}
},
- created: function() {
+ //created: function() {
+ mounted: function() {
+ console.log(".....................mounted start......................")
//console.log(".....................Test. config start......................")
//if(this.memberToken == '' || this.memberToken == undefined) this.setMemberTocken("4bdcf437-185c-4f4e-9528-382c99509ea6")
//console.log(".....................Test. config ednd.......................")
@@ -540,12 +339,14 @@
_this.initStep2ScoreRanges(_this.form.titleItems[0].scoreRanges)
} else {
+ console.log(".....................mounted 鍒锋柊......................")
_this.formLoading = true
// 闃叉鍒锋柊鎴愪簡涓嶅悓鐨勮瑷�
demographyApi.queryDemographyParamInfo(_this.memberToken).then(
re => {
if (re.response[0].langType !== null || re.response[0].langType.trim() !== '') {
_this.setLangType(re.response[0].langType)
+ console.log("lang type",re.response[0].langType,_this.langType)
}
// 鍔犺浇棰樼洰
examPaperApi.select(_this.memberToken, _this.langType).then(re => {
@@ -620,14 +421,19 @@
}
).catch(e => {})
}
- },
- mounted() {
- //console.log("mounted......")
+
document.body.ondrop = function(event) {
event.preventDefault();
event.stopPropagation();
}
},
+ // mounted() {
+ // //console.log("mounted......")
+ // document.body.ondrop = function(event) {
+ // event.preventDefault();
+ // event.stopPropagation();
+ // }
+ // },
beforeDestroy() {
window.clearInterval(this.timer)
},
@@ -898,9 +704,9 @@
sortQuestions() {
let type = this.getLikeType(this.step2SubStep)
switch (type) {
- case 0: //0:鏈�鍍忔垜
- this.questionItems.sort(function(i2, i1) {
- return (i2.content == 0) ? -1 : 1
+ case 0: //0:鏈�鍍忔垜 鏁板瓧鎺掑簭锛堟暟瀛楀拰鍗囧簭锛�
+ this.questionItems.sort(function(a, b) {
+ return a.content - b.content
})
break
case 1: //1:鏈夌枒闂�
@@ -908,9 +714,9 @@
return (i2.content == 1) ? -1 : 1
})
break
- case 2: //2:鏈�涓嶅儚鎴�
- this.questionItems.sort(function(i2, i1) {
- return (i2.content == 2) ? -1 : 1
+ case 2: //2:鏈�涓嶅儚鎴� 鏁板瓧鎺掑簭锛堟暟瀛楀拰闄嶅簭锛�
+ this.questionItems.sort(function(a, b) {
+ return b.content - a.content
})
break
}
@@ -1082,7 +888,7 @@
//璁剧疆姣忛」宸查�夋嫨鐨勬暟閲�
_this.step2ScoreRanges[i]['selected'] = 0
}
- console.log('initStep2ScoreRanges...e', this.step2ScoreRanges)
+ //console.log('initStep2ScoreRanges...e', this.step2ScoreRanges)
_this.initStep2ScoreRangesStepName()
_this.initQuestionItems()
},
@@ -1093,6 +899,7 @@
if(_this.$t('values_step_names').indexOf("锛�")>=0){
splitChar = "锛�"
}
+ //console.log('lang type',_this.langType)
let names = _this.$t('values_step_names').split(splitChar)
console.log('initStep2ScoreRangesStepName',names)
for (let i = 0; i < _this.step2ScoreRanges.length; i++) {
--
Gitblit v1.9.1