From c6dd775e9437ba929a2633c1a9f4d71379e5d19b Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期三, 10 五月 2023 15:14:58 +0800
Subject: [PATCH] Merge branch 'v13-20230413'

---
 src/views/exam/paper/finish.vue |   61 +++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/src/views/exam/paper/finish.vue b/src/views/exam/paper/finish.vue
index 57b7f01..1c7ac73 100644
--- a/src/views/exam/paper/finish.vue
+++ b/src/views/exam/paper/finish.vue
@@ -4,9 +4,17 @@
       <el-header class="align-center" style="height: 0px; margin: 8%;">
       </el-header>
       <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>
+        <H2 v-if="content!==null && content.trim()!==''">{{content}}</H2>
+        <H2 v-else>{{$t('finishMsg')}}</H2>
+        <!-- 鏂板涓嬭浇鎶ュ憡鎻愮ず璇� -->
+        <H2 v-if ="downDisable">{{$t('finishPersonalityDownInfo')}}</H2>
+        <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>-->
+        <!--  -->
+        <H2 v-if ="type == 'CIAQ'">{{$t('finishViewReportInfo')}}</H2>
+        <el-button type="danger" v-if ="type == 'CIAQ'" @click="viewReportH5" round>{{$t('view')}}</el-button>
       </el-main>
     </el-container>
   </div>
@@ -14,27 +22,44 @@
 
 <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,
-      downUrl: ''
+      tokenId: this.$route.query.tokenId,
+      type: this.$route.query.type,
+      downDisable: false,
+      viewDisable: false,
+      downUrl: '',
+      viewUrl: ''
     }
   },
   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)
       }
     })
+
+    // 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 () {
 
@@ -42,13 +67,27 @@
   beforeDestroy () {
   },
   methods: {
+    // 涓嬭浇鎶ュ憡
     downReport: function () {
       let _this = this
-      examPaperApi.down(_this.downUrl)
+      window.open(_this.downUrl)
+    },
+    // 棰勮鎶ュ憡
+    viewReport: function () {
+      let _this = this
+      _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: {
-    ...mapState('user', { memberToken: state => state.memberToken })
   }
 }
 </script>

--
Gitblit v1.9.1