Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

pull/620/head
648540858 2022-09-16 18:04:13 +08:00
commit 1ee56d50d8
1 changed files with 5 additions and 1 deletions

View File

@ -89,7 +89,7 @@ export default {
if (parseFloat(res.data.progress) == 1) {
this.percentage = 100;
}else {
this.percentage = (res.data.progress*100).toFixed(1);
this.percentage = (res.data.data.progress*100).toFixed(1);
}
if (callback)callback();
}
@ -175,6 +175,10 @@ export default {
}).then((res) => {
console.log(res)
if (res.data.code === 0) {
if (res.data.data.length === 0){
this.percentage = 0
return
}
this.percentage = parseFloat(res.data.data.percentage)*100
if (res.data.data[0].percentage === '1') {
this.getProgressForFileRun = false;