From 93f30ecb74eea1c7ed460d45bc01df2ef14d69a3 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期三, 10 五月 2023 14:53:57 +0800
Subject: [PATCH] Merge branch 'v13-20230413'
---
src/views/exam/paper/finish.vue | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/views/exam/paper/finish.vue b/src/views/exam/paper/finish.vue
index 053124f..eb8b933 100644
--- a/src/views/exam/paper/finish.vue
+++ b/src/views/exam/paper/finish.vue
@@ -10,8 +10,11 @@
<H1 v-if ="downDisable">{{$t('finishPersonalityDownInfo')}}</H1>
<el-button type="danger" v-if ="downDisable" @click="downReport" round>{{$t('down')}}</el-button>
<!-- 鏂板棰勮鎻愮ず璇� -->
- <H1 v-if ="viewDisable">{{$t('finishViewReportInfo')}}</H1>
- <el-button type="danger" v-if ="viewDisable" @click="viewReport" round>{{$t('view')}}</el-button>
+<!-- <H1 v-if ="viewDisable">{{$t('finishViewReportInfo')}}</H1>-->
+<!-- <el-button type="danger" v-if ="viewDisable" @click="viewReport" round>{{$t('view')}}</el-button>-->
+ <!-- -->
+ <H1 v-if ="type == 'CIAQ'">{{$t('finishViewReportInfo')}}</H1>
+ <el-button type="danger" v-if ="type == 'CIAQ' && isMobile()" @click="viewReportH5" round>{{$t('view')}}</el-button>
</el-main>
</el-container>
</div>
@@ -46,17 +49,17 @@
}
})
- // 鏌ヨ鎶ュ憡鏂囦欢鍚�
- examPaperApi.selectTesterReportUrl(_this.tokenId).then(re => {
- if (re.code === 0) {
- _this.viewDisable = true
- // 璁剧疆棰勮璺緞
- _this.viewUrl = re.msg
- console.log(re)
- } else {
- console.log(re)
- }
- })
+ // CIAQ PDF棰勮Url
+ // examPaperApi.selectTesterReportUrl(_this.tokenId).then(re => {
+ // if (re.code === 0) {
+ // _this.viewDisable = true
+ // // 璁剧疆棰勮璺緞
+ // _this.viewUrl = re.msg
+ // console.log(re)
+ // } else {
+ // console.log(re)
+ // }
+ // })
},
mounted () {
@@ -72,7 +75,16 @@
// 棰勮鎶ュ憡
viewReport: function () {
let _this = this
- _this.$router.push({ path: '/pdf/view', query: { fileUrl: _this.viewUrl } })
+ _this.$router.push({ path: '/report/view', query: { fileUrl: _this.viewUrl } })
+ },
+ // 棰勮鎶ュ憡(H5)
+ viewReportH5: function () {
+ let _this = this
+ _this.$router.push({ path: '/report/h5', query: { tokenId: _this.tokenId } })
+ },
+ isMobile () {
+ let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+ return flag
}
},
computed: {
--
Gitblit v1.9.1