diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 3752b940..e56481cf 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -584,6 +584,7 @@ export default defineComponent({ this.remGenerate = true },10000) let data = dataList + let dataNum = dataList.length this.generateTime = setInterval(()=>{ Https.axiosPost(Https.httpUrls.generateResult, data).then( (rv) => { @@ -597,8 +598,8 @@ export default defineComponent({ data = data.filter((item:any) => item !== element.taskId); } }); - 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){ + if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length ==data.length)){ + if(rv.filter((item:any)=>item.status == 'Invalid').length ==dataNum){ message.info(this.t('Generate.effectPoor')); } nextTick().then(()=>{ diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 476fae7a..cf5e4498 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -791,6 +791,7 @@ export default defineComponent({ this.remGenerate = true },10000) let data = dataList + let dataNum = dataList.length this.generateTime = setInterval(()=>{ Https.axiosPost(Https.httpUrls.generateResult, data).then( (rv) => { @@ -805,7 +806,7 @@ export default defineComponent({ } }); 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){ + if(rv.filter((item:any)=>item.status == 'Invalid').length == dataNum){ message.info(this.t('Generate.effectPoor')); } nextTick().then(()=>{ diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index 38b3fdfb..9cd5aca1 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -753,6 +753,7 @@ export default defineComponent({ let sketchCatecoryList = this.sketchCatecoryList let categoryValue:any let data = dataList + let dataNum = dataList.length this.remGenerateTime = setTimeout(()=>{ this.remGenerate = true },10000) @@ -782,7 +783,7 @@ export default defineComponent({ } }); 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){ + if(rv.filter((item:any)=>item.status == 'Invalid').length == dataNum){ message.info(this.t('Generate.effectPoor')); } nextTick().then(()=>{ diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 38267081..1f06b2ad 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -1231,6 +1231,7 @@ export default defineComponent({ this.remGenerate[str] = true },10000) let data = dataList + let dataNum = dataList.length this.generateTime[str] = setInterval(()=>{ // let data = this.generateList[str].filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId); Https.axiosPost(Https.httpUrls.generateResult, data).then( @@ -1251,7 +1252,7 @@ export default defineComponent({ } }); 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){ + if(rv.filter((item:any)=>item.status == 'Invalid').length == dataNum){ message.info(this.t('Generate.effectPoor')); } clearInterval(this.generateTime[str])