This commit is contained in:
X1627315083
2024-04-30 13:11:58 +08:00
parent 6cd20ca412
commit 6619316237
4 changed files with 23 additions and 26 deletions

View File

@@ -597,20 +597,19 @@ export default defineComponent({
data = data.filter((item:any) => item !== element.taskId); data = data.filter((item:any) => item !== element.taskId);
} }
}); });
if(rv.length == 4 && rv.filter((item:any)=>item.status == 'Invalid').length == 4) { if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length == data.length)){
message.info(this.t('Generate.effectPoor')); if(rv.filter((item:any)=>item.status == 'Invalid').length == data.length){
} message.info(this.t('Generate.effectPoor'));
if(rv.filter((item:any)=>item.status == 'Waiting').length == 0 && rv.filter((item:any)=>item.status == 'Executing').length == 0){ }
nextTick().then(()=>{ nextTick().then(()=>{
if(this.driver__.driver){ if(this.driver__.driver){
driverObj__.moveNext() driverObj__.moveNext()
} }
}) })
this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime) clearInterval(this.generateTime)
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.isGenerate = false
this.remGenerate = false this.remGenerate = false
this.isGenerate = false
} }
} }
} }
@@ -618,6 +617,7 @@ export default defineComponent({
clearInterval(this.generateTime) clearInterval(this.generateTime)
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.isGenerate = false this.isGenerate = false
this.remGenerate = false
}); });
},1000) },1000)
}, },

View File

@@ -804,10 +804,10 @@ export default defineComponent({
data = data.filter((item:any) => item !== element.taskId); data = data.filter((item:any) => item !== element.taskId);
} }
}); });
if(rv.filter((item:any)=>item.status == 'Invalid').length == 4) { if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length == data.length)){
message.info(this.t('Generate.effectPoor')); if(rv.filter((item:any)=>item.status == 'Invalid').length == data.length){
} message.info(this.t('Generate.effectPoor'));
if(rv.filter((item:any)=>item.status == 'Waiting').length == 0 && rv.filter((item:any)=>item.status == 'Executing').length == 0){ }
nextTick().then(()=>{ nextTick().then(()=>{
if(this.driver__.driver){ if(this.driver__.driver){
driverObj__.moveNext() driverObj__.moveNext()
@@ -815,8 +815,8 @@ export default defineComponent({
}) })
clearInterval(this.generateTime) clearInterval(this.generateTime)
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.isGenerate = false
this.remGenerate = false this.remGenerate = false
this.isGenerate = false
} }
} }
@@ -824,6 +824,7 @@ export default defineComponent({
).catch(res=>{ ).catch(res=>{
clearInterval(this.generateTime) clearInterval(this.generateTime)
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.remGenerate = false
this.isGenerate = false this.isGenerate = false
}); });
},1000) },1000)

View File

@@ -781,28 +781,26 @@ export default defineComponent({
data = data.filter((item:any) => item !== element.taskId); data = data.filter((item:any) => item !== element.taskId);
} }
}); });
// this.generateList = rv; if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length == data.length)){
if(rv.filter((item:any)=>item.status == 'Invalid').length == 4) { if(rv.filter((item:any)=>item.status == 'Invalid').length == data.length){
message.info(this.t('Generate.effectPoor')); message.info(this.t('Generate.effectPoor'));
// (this.$refs.inputShowText as any).innerHTML = this.t('Generate.effectPoor') }
}
if(rv.filter((item:any)=>item.status == 'Waiting').length == 0 && rv.filter((item:any)=>item.status == 'Executing').length == 0){
nextTick().then(()=>{ nextTick().then(()=>{
if(this.driver__.driver){ if(this.driver__.driver){
driverObj__.moveNext() driverObj__.moveNext()
} }
}) })
this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime) clearInterval(this.generateTime)
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.isGenerate = false
this.remGenerate = false this.remGenerate = false
this.isGenerate = false
} }
} }
} }
).catch(res=>{ ).catch(res=>{
clearInterval(this.generateTime) clearInterval(this.generateTime)
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.remGenerate = false
this.isGenerate = false this.isGenerate = false
}); });
},1000) },1000)

View File

@@ -1250,17 +1250,14 @@ export default defineComponent({
data = data.filter((item:any) => item !== element.taskId); data = data.filter((item:any) => item !== element.taskId);
} }
}); });
if(rv.length == 4 && rv.filter((item:any)=>item.status == 'Invalid').length == 4) { if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length == data.length)){
message.info(this.t('Generate.effectPoor')); if(rv.filter((item:any)=>item.status == 'Invalid').length == data.length){
} message.info(this.t('Generate.effectPoor'));
if(data.length == 0){ }
this.generateList[str] = this.generateList[str].filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime[str]) clearInterval(this.generateTime[str])
clearInterval(this.remGenerateTime[str]) clearInterval(this.remGenerateTime[str])
this.remGenerate[str] = false this.remGenerate[str] = false
this.isGenerate[str] = false this.isGenerate[str] = false
}else{
} }
} }
} }
@@ -1269,6 +1266,7 @@ export default defineComponent({
clearInterval(this.remGenerateTime[str]) clearInterval(this.remGenerateTime[str])
// this.isShowMark = false // this.isShowMark = false
this.isGenerate[str] = false this.isGenerate[str] = false
this.remGenerate[str] = false
}); });
},1000) },1000)
}, },