From 7fdd018b85633b81f1d97aa1afdb8c67f6f9eaa4 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期四, 14 四月 2022 14:23:32 +0800
Subject: [PATCH] 除JAQ外答题结束显示下载链接
---
src/lang/th.js | 2 +-
src/lang/zh.js | 2 +-
src/views/exam/paper/finish.vue | 18 ++++++++++--------
src/views/exam/paper/job.vue | 2 +-
src/lang/en.js | 2 +-
src/views/exam/paper/do.vue | 2 +-
src/views/exam/paper/personality.vue | 4 ++--
src/views/demography/langOption.vue | 2 +-
src/views/demography/login.vue | 2 +-
src/views/exam/paper/doPuzzle.vue | 2 +-
10 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/lang/en.js b/src/lang/en.js
index 66820fe..b6b30fa 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -1,7 +1,7 @@
export default {
start: 'Continue testing',
submission: 'submit',
- down: 'download',
+ down: 'download report',
lastQuestion: 'Last',
nextQuestion: 'Next',
recommendedTime: 'Recommended Time:',
diff --git a/src/lang/th.js b/src/lang/th.js
index 66820fe..b6b30fa 100644
--- a/src/lang/th.js
+++ b/src/lang/th.js
@@ -1,7 +1,7 @@
export default {
start: 'Continue testing',
submission: 'submit',
- down: 'download',
+ down: 'download report',
lastQuestion: 'Last',
nextQuestion: 'Next',
recommendedTime: 'Recommended Time:',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index fb84277..0118305 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -1,7 +1,7 @@
export default {
start: '缁х画娴嬭瘯',
submission: ' 鎻愪氦',
- down: '涓嬭浇',
+ down: '涓嬭浇鎶ュ憡',
lastQuestion: '鍥炲埌涓婁竴棰�',
nextQuestion: '涓嬩竴棰�',
recommendedTime: '寤鸿鏃堕棿锛�',
diff --git a/src/views/demography/langOption.vue b/src/views/demography/langOption.vue
index c204e19..3fd7c4e 100644
--- a/src/views/demography/langOption.vue
+++ b/src/views/demography/langOption.vue
@@ -84,7 +84,7 @@
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) {
diff --git a/src/views/demography/login.vue b/src/views/demography/login.vue
index b3e95b1..9d624c6 100644
--- a/src/views/demography/login.vue
+++ b/src/views/demography/login.vue
@@ -31,7 +31,7 @@
// 宸茬粡绛斿畬浜嗕笉鑳界瓟棰�
examPaperApi.selectTokenId(_this.paraMemberToken).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.paraMemberToken } })
} else if (re.response.status !== '1') {
_this.$router.push({ path: '/exam/exception', query: { name: '', content: _this.statusInfo[re.response.status] } })
} else {
diff --git a/src/views/exam/paper/do.vue b/src/views/exam/paper/do.vue
index badd7eb..a2cf8f7 100644
--- a/src/views/exam/paper/do.vue
+++ b/src/views/exam/paper/do.vue
@@ -251,7 +251,7 @@
let _this = this
examPaperAnswerApi.answerSubmit(this.answer, _this.memberToken).then(re => {
if (re.code === 1) {
- _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess } })
+ _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess, tokenId: _this.memberToken } })
} else {
_this.$message.error(re.message + '/exam/finish')
}
diff --git a/src/views/exam/paper/doPuzzle.vue b/src/views/exam/paper/doPuzzle.vue
index bb835a7..42bed2e 100644
--- a/src/views/exam/paper/doPuzzle.vue
+++ b/src/views/exam/paper/doPuzzle.vue
@@ -241,7 +241,7 @@
let _this = this
examPaperAnswerApi.answerSubmit(this.answer, _this.memberToken).then(re => {
if (re.code === 1) {
- _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess } })
+ _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess, tokenId: _this.memberToken } })
} else {
_this.$message.error(re.message)
}
diff --git a/src/views/exam/paper/finish.vue b/src/views/exam/paper/finish.vue
index 57b7f01..3ec605e 100644
--- a/src/views/exam/paper/finish.vue
+++ b/src/views/exam/paper/finish.vue
@@ -6,7 +6,7 @@
<el-main class="align-center">
<H1 v-if="content!==null && content.trim()!==''">{{content}}</H1>
<H1 v-else>{{$t('finishMsg')}}</H1>
- <el-button type="danger" :disabled="downDisable" @click="downReport" round>{{$t('down')}}</el-button>
+ <el-button type="danger" v-if ="downDisable" @click="downReport" round>{{$t('down')}}</el-button>
</el-main>
</el-container>
</div>
@@ -14,22 +14,24 @@
<script>
import examPaperApi from '@/api/examPaper'
-import {mapState} from "vuex";
export default {
data () {
return {
name: this.$route.query.name,
content: this.$route.query.content,
- downDisable: true,
+ tokenId: this.$route.query.tokenId,
+ downDisable: false,
downUrl: ''
}
},
created () {
let _this = this
- examPaperApi.selectTesterReport(_this.memberToken).then(re => {
+ // 鏌ヨ鎶ュ憡鏂囦欢鍚�
+ examPaperApi.selectTesterReport(_this.tokenId).then(re => {
if (re.code === 0) {
- _this.downDisable = false
- _this.downUrl = re.msg
+ _this.downDisable = true
+ // 璁剧疆涓嬭浇璺緞
+ _this.downUrl = '/api/exam/paper/download?fileName=' + re.msg + '&delete=false'
console.log(re)
} else {
console.log(re)
@@ -42,13 +44,13 @@
beforeDestroy () {
},
methods: {
+ // 涓嬭浇鎶ュ憡
downReport: function () {
let _this = this
- examPaperApi.down(_this.downUrl)
+ window.open(_this.downUrl)
}
},
computed: {
- ...mapState('user', { memberToken: state => state.memberToken })
}
}
</script>
diff --git a/src/views/exam/paper/job.vue b/src/views/exam/paper/job.vue
index 56795b5..13d0f9b 100644
--- a/src/views/exam/paper/job.vue
+++ b/src/views/exam/paper/job.vue
@@ -353,7 +353,7 @@
let answerSubmit = _this.getSubmitAnswerValue()
examPaperAnswerApi.answerSubmit(answerSubmit, _this.memberToken).then(re => {
if (re.code === 1) {
- _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess } })
+ _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess, tokenId: _this.memberToken } })
} else {
_this.$message.error(re.message + '/exam/finish')
}
diff --git a/src/views/exam/paper/personality.vue b/src/views/exam/paper/personality.vue
index a3660fa..dc2ae2d 100644
--- a/src/views/exam/paper/personality.vue
+++ b/src/views/exam/paper/personality.vue
@@ -166,7 +166,7 @@
}
if (_this.isForFinish(i)) {
- _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 } })
}
}
// 濡傛灉涓婁竴棰樹笉鏄湰娈碉紝鍒欎笉鑳借繑鍥炰笂涓�娈�
@@ -464,7 +464,7 @@
examPaperAnswerApi.answerSubmit(answerSubmit, _this.memberToken).then(re => {
loading.close()
if (re.code === 1) {
- _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess } })
+ _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess, tokenId: _this.memberToken } })
} else {
_this.$message.error(re.message + '/exam/finish')
}
--
Gitblit v1.9.1