From 256c35331eceab873acffa43b59aaa179c9167ec Mon Sep 17 00:00:00 2001 From: linzhijie <1003392067@qq.com> Date: 星期二, 25 四月 2023 15:53:40 +0800 Subject: [PATCH] Merge branch 'master' into v13-20230413 --- src/views/exam/paper/finish.vue | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/views/exam/paper/finish.vue b/src/views/exam/paper/finish.vue index 9dc85d5..053124f 100644 --- a/src/views/exam/paper/finish.vue +++ b/src/views/exam/paper/finish.vue @@ -28,7 +28,8 @@ type: this.$route.query.type, downDisable: false, viewDisable: false, - downUrl: '' + downUrl: '', + viewUrl: '' } }, created () { @@ -39,6 +40,18 @@ _this.downDisable = true // 璁剧疆涓嬭浇璺緞 _this.downUrl = '/api/exam/paper/download?fileName=' + re.msg + '&delete=false' + console.log(re) + } else { + console.log(re) + } + }) + + // 鏌ヨ鎶ュ憡鏂囦欢鍚� + examPaperApi.selectTesterReportUrl(_this.tokenId).then(re => { + if (re.code === 0) { + _this.viewDisable = true + // 璁剧疆棰勮璺緞 + _this.viewUrl = re.msg console.log(re) } else { console.log(re) @@ -56,10 +69,10 @@ let _this = this window.open(_this.downUrl) }, - // 涓嬭浇鎶ュ憡 + // 棰勮鎶ュ憡 viewReport: function () { let _this = this - _this.$router.push({ path: '/pdf/view', query: { fileUrl: _this.downUrl } }) + _this.$router.push({ path: '/pdf/view', query: { fileUrl: _this.viewUrl } }) } }, computed: { -- Gitblit v1.9.1