From b1f4b07417ce38dcff3f0b2a9fa0fef9ab183b28 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期四, 22 二月 2024 15:48:08 +0800
Subject: [PATCH] 1. 人格问卷答题目选项增加边框 2. API-Fan事中提示语解析变量 3. 答题完毕的提示语修改 4. 答题完毕页面增加关闭页面按钮
---
src/lang/th.js | 1 +
src/lang/zh.js | 4 +++-
src/views/exam/paper/finish.vue | 6 ++++++
src/lang/en.js | 1 +
src/views/exam/components/QuestionEdit.vue | 2 +-
src/layout/index.vue | 2 +-
src/views/exam/paper/personality.vue | 28 +++++++++++++++++++++++++---
7 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/lang/en.js b/src/lang/en.js
index 7161da6..f95e280 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -12,6 +12,7 @@
guideLanguage: 'Guide language',
theFirst: 'Question ',
section: '',
+ close: 'close',
demography: 'Demographic Information',
required: 'required',
range32: 'Exceed 200 characters',
diff --git a/src/lang/th.js b/src/lang/th.js
index 9e3973f..9f2a3bc 100644
--- a/src/lang/th.js
+++ b/src/lang/th.js
@@ -12,6 +12,7 @@
guideLanguage: 'Guide language',
theFirst: 'Question ',
section: '',
+ close: 'close',
demography: 'Demographic Information',
required: 'required',
range32: 'Exceed 200 characters',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index fde8a25..d27a8dc 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -39,6 +39,7 @@
langOptionChinese: '璇峰厛鍦ㄤ笅鎷夋澶勯�夋嫨璇█锛岀劧鍚庣偣鍑烩�滄彁浜も�濆紑濮嬫祴璇曘��',
uploadInfo: '姝ｅ湪涓婁紶锛屼繚瀛樻暟鎹紝璇风◢绛夛紝涓嶈鍏抽棴娴忚鍣�...',
examinee: '娴嬭瘯鑰咃細',
+ close: '鍏抽棴',
pleaseAnswerCarefully: '*璇疯鐪熶綔绛�',
pleaseAnswerCarefullyCiaq: '*璇疯鐪熶綔绛斻�傜壒鍒彁绀猴紝鏈祴楠屽叧娉ㄧ殑鏄綘瀵瑰悇绫绘椿鍔ㄧ殑鍏磋叮鎴栧枩濂斤紝鑰岄潪鑳藉姏绛夊叾浠栧洜绱狅紒',
submitTimeout: ':鎻愪氦鍚庡彴瓒呮椂',
@@ -52,7 +53,8 @@
nextPartInfo: '璇风◢绛夛紝璇蜂笉瑕佸叧闂祻瑙堝櫒...',
partRemailTime: '鍓╀綑鏃堕棿:',
finishIntelligenceInfo: '鎮ㄥ凡缁忓畬鎴愪簡璁ょ煡鑳藉姏娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐�傝阿璋€��',
- finishPersonalityInfo: '鎮ㄥ凡缁忓畬鎴愪簡浜烘牸娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐��',
+ finishPersonalityInfo: '鎮ㄥ凡缁忓畬鎴愪簡浜烘牸娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐�傜幇鍦ㄦ偍鍙互鐐瑰嚮涓嬮潰鐨勨�滃叧闂�濇寜閽叧闂〉闈�',
+ finishPersonalityInfo_apifan: '鎰熻阿鎮ㄧ敵璇锋湰鍏徃鐨勮亴浣嶏紒鎮ㄥ凡缁忓畬鎴愪簡浜烘牸娴嬭瘯闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽凡缁忎繚瀛樺ソ銆傜幇鍦ㄦ偍鍙互鐐瑰嚮涓嬮潰鐨勨�滃叧闂�濇寜閽叧闂〉闈€��',
finishCareerInterestsInfo: '鎮ㄥ凡缁忓畬鎴愪簡鑱屼笟鍏磋叮闂嵎锛屾暟鎹凡缁忔垚鍔熷湴涓婁紶鑷虫湇鍔″櫒锛屽苟宸茬粡淇濆瓨濂姐��',
finishPersonalityDownInfo: '鎮ㄥ彲浠ョ偣鍑讳笅闈㈢孩鑹叉寜閽笅杞芥偍鐨勭粨鏋滄姤鍛娿��',
finishViewReportInfo: '鎮ㄥ彲浠ョ偣鍑讳笅闈㈢孩鑹叉寜閽煡鐪嬫偍鐨勭粨鏋滄姤鍛娿��',
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 9029c42..18b5080 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,6 +1,6 @@
<template>
<el-container>
- <el-header height="60" class="student-header header" style="background-color: #3c8dbc">
+ <el-header height="60" class="student-header header" style="background-color: #409eff">
<div class="head-language" v-if="langFlag">
<!--<lang-select class="right-menu-item" />-->
<!--鍥介檯鍖栫殑璇█閫夋嫨-->
diff --git a/src/views/exam/components/QuestionEdit.vue b/src/views/exam/components/QuestionEdit.vue
index 9094d9b..c9ac768 100644
--- a/src/views/exam/components/QuestionEdit.vue
+++ b/src/views/exam/components/QuestionEdit.vue
@@ -4,7 +4,7 @@
<div class="q-title" v-html="qLabel+' '+question.title" style="font-size: 23px"/>
<div class="q-content">
<el-radio-group v-model="answer.content" @change="answer.completed = true">
- <el-radio v-for="item in question.items" :key="item.prefix" :label="item.prefix" @change="jumpNext" :disabled="answer.readOnly" style="display:block;">
+ <el-radio v-for="item in question.items" :key="item.prefix" :label="item.prefix" @change="jumpNext" :disabled="answer.readOnly" style="display:block;border:1px solid #b3b5ba;margin:5px 0px 5px 0px;padding:0px 25px 0px 15px;border-radius:5px;">
<span class="question-prefix" style="font-size: 18px">{{abcValue[item.prefix]}}.</span>
<span v-html="item.content" class="q-item-span-content" style="font-size: 18px"></span>
</el-radio>
diff --git a/src/views/exam/paper/finish.vue b/src/views/exam/paper/finish.vue
index 1c7ac73..7081d15 100644
--- a/src/views/exam/paper/finish.vue
+++ b/src/views/exam/paper/finish.vue
@@ -6,6 +6,7 @@
<el-main class="align-center">
<H2 v-if="content!==null && content.trim()!==''">{{content}}</H2>
<H2 v-else>{{$t('finishMsg')}}</H2>
+ <el-button type="danger" @click="closePage" round>{{$t('close')}}</el-button>
<!-- 鏂板涓嬭浇鎶ュ憡鎻愮ず璇� -->
<H2 v-if ="downDisable">{{$t('finishPersonalityDownInfo')}}</H2>
<el-button type="danger" v-if ="downDisable" @click="downReport" round>{{$t('down')}}</el-button>
@@ -67,11 +68,16 @@
beforeDestroy () {
},
methods: {
+
// 涓嬭浇鎶ュ憡
downReport: function () {
let _this = this
window.open(_this.downUrl)
},
+ // 鍏抽棴椤甸潰
+ closePage: function () {
+ window.close()
+ },
// 棰勮鎶ュ憡
viewReport: function () {
let _this = this
diff --git a/src/views/exam/paper/personality.vue b/src/views/exam/paper/personality.vue
index 8d7434e..70b4c8b 100644
--- a/src/views/exam/paper/personality.vue
+++ b/src/views/exam/paper/personality.vue
@@ -142,12 +142,10 @@
_this.initAnswer()
_this.formLoading = false
_this.memberName = _this.form.memberName
-
examPaperApi.selectTokenId(_this.memberToken).then(re => {
_this.answered = re.response.examItemOrderAndContentList
_this.doTime = re.response.doTime
_this.timeReduce()
-
if (_this.answered !== null) {
_this.answered.forEach(it => {
_this.answer.answerItems[parseInt(it.itemOrder) - 1].content = it.content
@@ -187,11 +185,26 @@
).catch(e => {
})
}
+
},
mounted () {
},
beforeDestroy () {
window.clearInterval(this.timer)
+ },
+ watch: {
+ guideDescirption: function (newVal, oldVal) {
+ // 澶勭悊鎸囧璇紝鏇存崲鍙橀噺
+ if (newVal) {
+ if (this.form) {
+ let productType = this.form.productType
+ if (productType === 'APIFan') {
+ newVal = newVal.replace('%%company%%', this.form.reportCompany)
+ this.guideDescirption = newVal
+ }
+ }
+ }
+ }
},
methods: {
formatSeconds (theTime) {
@@ -449,7 +462,16 @@
} else {
_this.answer.verifyStatus = 1
_this.answer.finish = 1
- _this.submitAnswer(_this.$t('finishPersonalityInfo'))
+ if (this.form) {
+ let productType = this.form.productType
+ if (productType === 'APIFan') {
+ _this.submitAnswer(_this.$t('finishPersonalityInfo_apifan'))
+ } else {
+ _this.submitAnswer(_this.$t('finishPersonalityInfo'))
+ }
+ } else {
+ _this.submitAnswer(_this.$t('finishPersonalityInfo'))
+ }
}
},
startDo: function () {
--
Gitblit v1.9.1