From 41467de512438090d2b94d7071a3ae007fe173a2 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 28 Jan 2021 09:48:16 +0800
Subject: [PATCH] .

---
 src/layouts/navbar/index.vue                  |  2 +-
 src/libs/util.js                              | 14 +++++++++
 src/main.js                                   |  3 ++
 src/mixins/file/index.js                      | 30 ++++++++++++-------
 src/pages/achievement/assessment/index.vue    |  9 +++---
 .../achievement/list/practiceResults.vue      |  6 ++--
 src/pages/achievement/practice/index.vue      |  7 ++---
 src/pages/exam/do/index.vue                   |  6 ++--
 src/pages/index/list/index.vue                | 12 ++++++--
 src/pages/practice/list/myPractice.vue        |  6 ++--
 src/plugins/filters/index.js                  | 12 ++++++++
 src/styles/pages/testPaperDetail.scss         |  3 ++
 12 files changed, 80 insertions(+), 30 deletions(-)
 create mode 100644 src/plugins/filters/index.js

diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index a73b53b..c0869dc 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -35,7 +35,7 @@ export default {
                 {
                     icon: 'el-icon-lx-copy',
                     index: '/wrongBook/list',
-                    title: '我的错题本'
+                    title: '错题练习'
                 },
                 {
                     icon: 'el-icon-chat-dot-round',
diff --git a/src/libs/util.js b/src/libs/util.js
index 2943822..32458d7 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -89,6 +89,20 @@ const util = {
   getFileExt(fileName) {
     return fileName.substring(fileName.lastIndexOf('.') + 1)
   },
+  // 传入文件名和路径，下载图片视频，支持跨域，a标签加download不支持跨域
+  downloadFile(fileName,url) {
+    var x = new XMLHttpRequest()
+    x.open("GET", url, true)
+    x.responseType = 'blob'
+    x.onload=function(e) {
+        var url = window.URL.createObjectURL(x.response)
+        var a = document.createElement('a')
+        a.href = url
+        a.download = fileName
+        a.click()
+    }
+    x.send()
+  },
 }
 
 export default util
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 8a5e331..5a63a36 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,9 +16,12 @@ import permission from '@/router/permission';
 
 // 插件
 import plugins from '@/plugins';
+import filters from '@/plugins/filters'
 
 Vue.use(plugins);
 
+Object.keys(filters).forEach(item => Vue.filter(item,filters[item]))
+
 Vue.prototype.api = api;
 Vue.prototype.$get = get;
 Vue.prototype.$post = post;
diff --git a/src/mixins/file/index.js b/src/mixins/file/index.js
index 29ff8f0..6132920 100644
--- a/src/mixins/file/index.js
+++ b/src/mixins/file/index.js
@@ -1,4 +1,5 @@
 import util from '@/libs/util'
+import { Loading } from 'element-ui'
 export default {
     data() {
         return {
@@ -7,15 +8,16 @@ export default {
             iframeSrc: '',
             pdfVisible: false,
             pdfSrc: '',
-            imgName: '',
-            imgSrc: ''
+            isDownload: 0,
+            loadIns: null,
         }
     },
     mounted() {
         this.insertScript()
     },
     methods: {
-        preview(url,isVideo){
+        preview(url,isVideo,isDownload){
+            this.isDownload = isDownload
             let ext = util.getFileExt(url)
             if(isVideo){
                 this.$get(`${this.api.getPlayAuth}/${url}`).then(res => {
@@ -63,14 +65,22 @@ export default {
             this.playAuth = ''
             this.player.pause()
         },
-        download(fileName,url){
-            let ext = util.getFileExt(url)
-            if(util.isImg(ext)){
-                this.imgName = fileName
-                this.imgSrc = url
-                this.$refs.picLink.click()
+        download(fileName,url,isVideo){
+            if(isVideo){
+                this.loadIns = Loading.service()
+                this.preview(url,isVideo,1)
+                setTimeout(() => {
+                    util.downloadFile(fileName,document.querySelector('#player video').src)
+                    this.loadIns.close()
+                    this.playAuth = ''
+                },1000)
             }else{
-                window.open(url)
+                let ext = util.getFileExt(url)
+                if(util.isImg(ext)){
+                    util.downloadFile(fileName,url)
+                }else{
+                    window.open(url)
+                }
             }
         }
     }
diff --git a/src/pages/achievement/assessment/index.vue b/src/pages/achievement/assessment/index.vue
index 017518f..fe4deac 100644
--- a/src/pages/achievement/assessment/index.vue
+++ b/src/pages/achievement/assessment/index.vue
@@ -64,13 +64,13 @@
                         <template v-if="item.fileUrl">
                             <div v-for="(url,fileName) in item.fileUrl" :key="fileName">
                                 <el-button type="text" @click="preview(url,0)">{{fileName}}</el-button>
-                                <el-button type="primary" size="mini" @click="download(fileName,url)">下载</el-button>
+                                <el-button type="primary" size="mini" @click="download(fileName,url,0)">下载</el-button>
                             </div>
                         </template>
                         <template v-if="item.videoAudio">
                             <div v-for="(url,fileName) in item.videoAudio" :key="fileName">
                                 <el-button type="text" @click="preview(url,1)">{{fileName}}</el-button>
-                                <!-- <el-button type="primary" size="mini" @click="download(url)">下载</el-button> -->
+                                <el-button type="primary" size="mini" @click="download(fileName,url,1)">下载</el-button>
                             </div>
                         </template>
                     </div>
@@ -82,13 +82,14 @@
             </div>
         </div>
 
-        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{active: playAuth}" style="z-index: 2000">
+        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{over: isDownload}" style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
             <span class="el-image-viewer__btn el-image-viewer__close" @click="closePlayer"><i class="el-icon-circle-close" style="color: #fff"></i></span>
             <div class="player" id="player"></div>
         </div>
         <pdf :visible.sync="pdfVisible" :src.sync="pdfSrc"></pdf>
-        <a ref="picLink" style="display: none;" crossOrigin="anonymous" download="用户上传图片.png" :href="imgSrc">下载图片</a>
+        <a ref="videoLink" style="display: none;" crossOrigin="anonymous" download="用户上传视频.mp4" :href="videoSrc">下载</a>
+        <a ref="picLink" style="display: none;" crossOrigin="anonymous" download="用户上传图片.jpg" :href="imgSrc">下载</a>
     </div>
 </template>
 <script>
diff --git a/src/pages/achievement/list/practiceResults.vue b/src/pages/achievement/list/practiceResults.vue
index 12c8184..08f6dd2 100644
--- a/src/pages/achievement/list/practiceResults.vue
+++ b/src/pages/achievement/list/practiceResults.vue
@@ -24,17 +24,17 @@
                 <el-table-column prop="practiseNum" label="练习次数" align="center"></el-table-column>
                 <el-table-column prop="timeCost" label="用时（分钟）" align="center">
                     <template slot-scope="scope">
-                        {{scope.row.timeCost !== '' ? scope.row.timeCost : '--'}}
+                        <p>{{scope.row.timeCost | defaultShow}}</p>
                     </template>
                 </el-table-column>
                 <el-table-column prop="examTime" label="练习时间" align="center">
                     <template slot-scope="scope">
-                        {{scope.row.examTime !== '' ? scope.row.examTime : '--'}}
+                        <p>{{scope.row.examTime | defaultShow}}</p>
                     </template>
                 </el-table-column>
                 <el-table-column prop="score" label="最新得分" align="center">
                     <template slot-scope="scope">
-                        {{scope.row.score !== '' ? scope.row.score : '--'}}
+                        <p>{{scope.row.score | defaultShow}}</p>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="180">
diff --git a/src/pages/achievement/practice/index.vue b/src/pages/achievement/practice/index.vue
index 00b1c2e..599ddd5 100644
--- a/src/pages/achievement/practice/index.vue
+++ b/src/pages/achievement/practice/index.vue
@@ -60,13 +60,13 @@
                         <template v-if="item.fileUrl">
                             <div v-for="(url,fileName) in item.fileUrl" :key="fileName">
                                 <el-button type="text" @click="preview(url,0)">{{fileName}}</el-button>
-                                <el-button type="primary" size="mini" @click="download(fileName,url)">下载</el-button>
+                                <el-button type="primary" size="mini" @click="download(fileName,url,0)">下载</el-button>
                             </div>
                         </template>
                         <template v-if="item.videoAudio">
                             <div v-for="(url,fileName) in item.videoAudio" :key="fileName">
                                 <el-button type="text" @click="preview(url,1)">{{fileName}}</el-button>
-                                <!-- <el-button type="primary" size="mini" @click="download(url)">下载</el-button> -->
+                                <el-button type="primary" size="mini" @click="download(fileName,url,1)">下载</el-button>
                             </div>
                         </template>
                     </div>
@@ -78,13 +78,12 @@
             </div>
         </div>
 
-        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{active: playAuth}" style="z-index: 2000">
+        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{over: isDownload}" style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
             <span class="el-image-viewer__btn el-image-viewer__close" @click="closePlayer"><i class="el-icon-circle-close" style="color: #fff"></i></span>
             <div class="player" id="player"></div>
         </div>
         <pdf :visible.sync="pdfVisible" :src.sync="pdfSrc"></pdf>
-        <a ref="picLink" style="display: none;" crossOrigin="anonymous" download="用户上传图片.png" :href="imgSrc">下载图片</a>
     </div>
 </template>
 <script>
diff --git a/src/pages/exam/do/index.vue b/src/pages/exam/do/index.vue
index 005be14..7fbe4cf 100644
--- a/src/pages/exam/do/index.vue
+++ b/src/pages/exam/do/index.vue
@@ -177,7 +177,7 @@ export default {
     mounted() {
         this.getData()
         this.addLeaveEvent()
-        // this.queryState()
+        this.queryState()
     },
     beforeDestroy(){
         clearInterval(this.timer)
@@ -329,7 +329,7 @@ export default {
                     }
                     n.fileUrl = JSON.stringify(n.fileUrl)
                     n.video = JSON.stringify(n.video)
-                    if(userAnswer || n.fileUrl != '{}' || n.video != '{}'){
+                    // if(userAnswer || n.fileUrl != '{}' || n.video != '{}'){
                         if(n.fileUrl == '{}') n.fileUrl = ''
                         if(n.video == '{}') n.video = ''
                         data1.push({
@@ -342,7 +342,7 @@ export default {
                             fileUrl: n.fileUrl,
                             videoAudio: n.video
                         })
-                    }
+                    // }
                 })
             })
 
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 2e1fc03..477af74 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -67,8 +67,16 @@
                     </el-table-column>
                     <el-table-column prop="practiseName" label="练习试卷名称" align="center"></el-table-column>
                     <el-table-column prop="startTime" label="开始时间" align="center"></el-table-column>
-                    <el-table-column prop="duration" label="练习时长（分钟）" align="center"></el-table-column>
-                    <el-table-column prop="lastScore" label="得分" align="center"></el-table-column>
+                    <el-table-column prop="duration" label="练习时长（分钟）" align="center">
+                        <template slot-scope="scope">
+                            <p>{{scope.row.duration | defaultShow}}</p>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="lastScore" label="得分" align="center">
+                        <template slot-scope="scope">
+                            <p>{{scope.row.lastScore | defaultShow}}</p>
+                        </template>
+                    </el-table-column>
                 </el-table>
                 <div class="pagination">
                     <el-pagination
diff --git a/src/pages/practice/list/myPractice.vue b/src/pages/practice/list/myPractice.vue
index 256bff9..af7cc23 100644
--- a/src/pages/practice/list/myPractice.vue
+++ b/src/pages/practice/list/myPractice.vue
@@ -29,13 +29,13 @@
                 </el-table-column>
                 <el-table-column prop="duration" label="时长（分钟）" align="center">
                     <template slot-scope="scope">
-                        {{scope.row.duration !== '' ? scope.row.duration : '--'}}
+                        <p>{{scope.row.duration | defaultShow}}</p>
                     </template>
                 </el-table-column>
                 <el-table-column prop="practiceNum" label="练习次数" align="center"></el-table-column>
                 <el-table-column prop="lastScore" label="最后一次得分" align="center">
                     <template slot-scope="scope">
-                        {{scope.row.lastScore !== '' ? scope.row.lastScore : '--'}}
+                        <p>{{scope.row.lastScore | defaultShow}}</p>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="180">
@@ -117,7 +117,7 @@ export default {
         },
         practice(row){
             if(row.isHava){
-                this.$confirm('是否要继续上次的考试？',{
+                this.$confirm('是否要继续上次的练习？',{
                     title: '提示',
                     confirmButtonText: '是',
                     cancelButtonText: '否',
diff --git a/src/plugins/filters/index.js b/src/plugins/filters/index.js
new file mode 100644
index 0000000..4eb253f
--- /dev/null
+++ b/src/plugins/filters/index.js
@@ -0,0 +1,12 @@
+/**
+ * @description 返回缺省值
+ * 传入的如果是null，就返回'--'
+ * 用例：<Tag :default="val">text</Tag> 或者：<Tag>{{val | default}}</Tag>
+ * */
+const defaultShow = (val) => {
+    return val == null ? '--' : val
+}
+
+module.exports = {
+    defaultShow
+}
\ No newline at end of file
diff --git a/src/styles/pages/testPaperDetail.scss b/src/styles/pages/testPaperDetail.scss
index c08d93e..a1e96ec 100644
--- a/src/styles/pages/testPaperDetail.scss
+++ b/src/styles/pages/testPaperDetail.scss
@@ -93,6 +93,9 @@
         }
     }
 }
+.over{
+    top: 5000px;
+}
 .player{
     position: absolute;
     top: 50%;