diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 0fe8d987..3752b940 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -597,20 +597,19 @@ export default defineComponent({ data = data.filter((item:any) => item !== element.taskId); } }); - if(rv.length == 4 && rv.filter((item:any)=>item.status == 'Invalid').length == 4) { - 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){ + if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length == data.length)){ + if(rv.filter((item:any)=>item.status == 'Invalid').length == data.length){ + message.info(this.t('Generate.effectPoor')); + } nextTick().then(()=>{ if(this.driver__.driver){ driverObj__.moveNext() } }) - this.fileList = this.fileList.filter((item:any)=>item.status == 'Success') clearInterval(this.generateTime) clearInterval(this.remGenerateTime) - this.isGenerate = false this.remGenerate = false + this.isGenerate = false } } } @@ -618,6 +617,7 @@ export default defineComponent({ clearInterval(this.generateTime) clearInterval(this.remGenerateTime) this.isGenerate = false + this.remGenerate = false }); },1000) }, diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 2ba0efdb..476fae7a 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -804,10 +804,10 @@ export default defineComponent({ data = data.filter((item:any) => item !== element.taskId); } }); - if(rv.filter((item:any)=>item.status == 'Invalid').length == 4) { - 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){ + if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length == data.length)){ + if(rv.filter((item:any)=>item.status == 'Invalid').length == data.length){ + message.info(this.t('Generate.effectPoor')); + } nextTick().then(()=>{ if(this.driver__.driver){ driverObj__.moveNext() @@ -815,8 +815,8 @@ export default defineComponent({ }) clearInterval(this.generateTime) clearInterval(this.remGenerateTime) - this.isGenerate = false this.remGenerate = false + this.isGenerate = false } } @@ -824,6 +824,7 @@ export default defineComponent({ ).catch(res=>{ clearInterval(this.generateTime) clearInterval(this.remGenerateTime) + this.remGenerate = false this.isGenerate = false }); },1000) diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index 9da568d5..38b3fdfb 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -781,28 +781,26 @@ export default defineComponent({ data = data.filter((item:any) => item !== element.taskId); } }); - // this.generateList = rv; - if(rv.filter((item:any)=>item.status == 'Invalid').length == 4) { - 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){ + if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length == data.length)){ + if(rv.filter((item:any)=>item.status == 'Invalid').length == data.length){ + message.info(this.t('Generate.effectPoor')); + } nextTick().then(()=>{ if(this.driver__.driver){ driverObj__.moveNext() } }) - this.generateList = this.generateList.filter((item:any)=>item.status == 'Success') clearInterval(this.generateTime) clearInterval(this.remGenerateTime) - this.isGenerate = false this.remGenerate = false + this.isGenerate = false } } } ).catch(res=>{ clearInterval(this.generateTime) clearInterval(this.remGenerateTime) + this.remGenerate = false this.isGenerate = false }); },1000) diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 63e4d257..38267081 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -1250,17 +1250,14 @@ export default defineComponent({ data = data.filter((item:any) => item !== element.taskId); } }); - if(rv.length == 4 && rv.filter((item:any)=>item.status == 'Invalid').length == 4) { - message.info(this.t('Generate.effectPoor')); - } - if(data.length == 0){ - this.generateList[str] = this.generateList[str].filter((item:any)=>item.status == 'Success') + if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length == data.length)){ + if(rv.filter((item:any)=>item.status == 'Invalid').length == data.length){ + message.info(this.t('Generate.effectPoor')); + } clearInterval(this.generateTime[str]) clearInterval(this.remGenerateTime[str]) this.remGenerate[str] = false this.isGenerate[str] = false - }else{ - } } } @@ -1269,6 +1266,7 @@ export default defineComponent({ clearInterval(this.remGenerateTime[str]) // this.isShowMark = false this.isGenerate[str] = false + this.remGenerate[str] = false }); },1000) },