Commit 21258d6ba3c0e87ee860f9c3819efbf0ce319d79
1 parent
a2da81f7
优化录像下载页面
Showing
1 changed file
with
10 additions
and
4 deletions
web_src/src/components/dialog/recordDownload.vue
| @@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
| 7 | </el-col> | 7 | </el-col> |
| 8 | <el-col :span="6" > | 8 | <el-col :span="6" > |
| 9 | <el-button icon="el-icon-download" v-if="percentage < 100" size="mini" title="点击下载可将以缓存部分下载到本地" @click="download()">停止缓存并下载</el-button> | 9 | <el-button icon="el-icon-download" v-if="percentage < 100" size="mini" title="点击下载可将以缓存部分下载到本地" @click="download()">停止缓存并下载</el-button> |
| 10 | + <el-button icon="el-icon-download" v-if="downloadFile" size="mini" title="点击下载" @click="downloadFileClientEvent()">点击下载</el-button> | ||
| 10 | </el-col> | 11 | </el-col> |
| 11 | </el-row> | 12 | </el-row> |
| 12 | </el-dialog> | 13 | </el-dialog> |
| @@ -39,7 +40,8 @@ export default { | @@ -39,7 +40,8 @@ export default { | ||
| 39 | taskId: null, | 40 | taskId: null, |
| 40 | getProgressRun: false, | 41 | getProgressRun: false, |
| 41 | getProgressForFileRun: false, | 42 | getProgressForFileRun: false, |
| 42 | - timer: null | 43 | + timer: null, |
| 44 | + downloadFile: null, | ||
| 43 | 45 | ||
| 44 | }; | 46 | }; |
| 45 | }, | 47 | }, |
| @@ -187,8 +189,9 @@ export default { | @@ -187,8 +189,9 @@ export default { | ||
| 187 | this.percentage = parseFloat(res.data.data[0].percentage)*100 | 189 | this.percentage = parseFloat(res.data.data[0].percentage)*100 |
| 188 | if (res.data.data[0].percentage === '1') { | 190 | if (res.data.data[0].percentage === '1') { |
| 189 | this.getProgressForFileRun = false; | 191 | this.getProgressForFileRun = false; |
| 190 | - window.open(res.data.data[0].downloadFile) | ||
| 191 | - this.close(); | 192 | + this.downloadFile = res.data.data[0].downloadFile |
| 193 | + this.title = "文件处理完成,点击按扭下载" | ||
| 194 | + // window.open(res.data.data[0].downloadFile) | ||
| 192 | }else { | 195 | }else { |
| 193 | if (callback)callback() | 196 | if (callback)callback() |
| 194 | } | 197 | } |
| @@ -196,7 +199,10 @@ export default { | @@ -196,7 +199,10 @@ export default { | ||
| 196 | }).catch(function (error) { | 199 | }).catch(function (error) { |
| 197 | console.log(error); | 200 | console.log(error); |
| 198 | }); | 201 | }); |
| 199 | - } | 202 | + }, |
| 203 | + downloadFileClientEvent: function (){ | ||
| 204 | + window.open(this.downloadFile ) | ||
| 205 | + } | ||
| 200 | }, | 206 | }, |
| 201 | destroyed() { | 207 | destroyed() { |
| 202 | window.removeEventListener('beforeunload', this.stopDownloadRecord) | 208 | window.removeEventListener('beforeunload', this.stopDownloadRecord) |