Commit 813fd772d191d140cde63802f74286d45c1ed39e
Committed by
GitHub
GitHub
Merge pull request #833 from yeqingli-KO/wvp-28181-2.0-wjy
创建回调函数时，不可带上括号，否则会在调用此语句时，立即执行一次回调函数
Showing
1 changed file
with
5 additions
and
2 deletions
web_src/src/components/dialog/recordDownload.vue
| @@ -161,7 +161,7 @@ export default { | @@ -161,7 +161,7 @@ export default { | ||
| 161 | } | 161 | } |
| 162 | setTimeout( ()=>{ | 162 | setTimeout( ()=>{ |
| 163 | if (!this.showDialog) return; | 163 | if (!this.showDialog) return; |
| 164 | - this.getProgressForFile(this.getProgressForFileTimer()) | 164 | + this.getProgressForFile(this.getProgressForFileTimer) |
| 165 | }, 1000) | 165 | }, 1000) |
| 166 | }, | 166 | }, |
| 167 | getProgressForFile: function (callback){ | 167 | getProgressForFile: function (callback){ |
| @@ -179,9 +179,12 @@ export default { | @@ -179,9 +179,12 @@ export default { | ||
| 179 | if (res.data.code === 0) { | 179 | if (res.data.code === 0) { |
| 180 | if (res.data.data.length === 0){ | 180 | if (res.data.data.length === 0){ |
| 181 | this.percentage = 0 | 181 | this.percentage = 0 |
| 182 | + // 往往在多次请求后（实验五分钟的视频是三次请求），才会返回数据，第一次请求通常是返回空数组 | ||
| 183 | + if (callback)callback() | ||
| 182 | return | 184 | return |
| 183 | } | 185 | } |
| 184 | - this.percentage = parseFloat(res.data.data.percentage)*100 | 186 | + // res.data.data应是数组类型 |
| 187 | + this.percentage = parseFloat(res.data.data[0].percentage)*100 | ||
| 185 | if (res.data.data[0].percentage === '1') { | 188 | if (res.data.data[0].percentage === '1') { |
| 186 | this.getProgressForFileRun = false; | 189 | this.getProgressForFileRun = false; |
| 187 | window.open(res.data.data[0].downloadFile) | 190 | window.open(res.data.data[0].downloadFile) |