aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into localDevelop

Browse Source
This commit is contained in:
X1627315083
2024-04-23 16:27:19 +08:00
parent 7aa4d4b1bb f6f564b27a
commit dba6fccff4
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/component/HomePage/Generate.vue
View File

@@ -612,7 +612,7 @@ export default defineComponent({
(rv) => { (rv) => {
if(this.loadingShow){//防止取消后有正在执行的获取状态 if(this.loadingShow){//防止取消后有正在执行的获取状态
let arr:any = [] let arr:any = []
arr = rv.filter((item:any)=>item.status != 'Success') arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail')
rv.forEach((element:any) => { rv.forEach((element:any) => {
element.imgUrl = element.url element.imgUrl = element.url
element.id_ = GO.id++ element.id_ = GO.id++
@@ -628,6 +628,7 @@ export default defineComponent({
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.loadingShow = false this.loadingShow = false
@@ -644,7 +645,7 @@ export default defineComponent({
},1000) },1000)
}, },
removeGenerate(){ removeGenerate(){
let arr = this.fileList.filter((item:any)=>item.status == 'Success') let arr = this.fileList.filter((item:any)=>item.status != 'Success')
//取消操作 //取消操作
this.fileList = this.fileList.filter((item:any)=>item.status == 'Success') this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
this.loadingShow = false this.loadingShow = false

3
src/component/HomePage/PrintboardUpload.vue
View File

@@ -759,7 +759,7 @@ export default defineComponent({
(rv) => { (rv) => {
if(this.loadingShow){//防止取消后有正在执行的获取状态 if(this.loadingShow){//防止取消后有正在执行的获取状态
let arr:any = [] let arr:any = []
arr = rv.filter((item:any)=>item.status != 'Success') arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail')
rv.forEach((element:any) => { rv.forEach((element:any) => {
element.imgUrl = element.url element.imgUrl = element.url
element.id_ = GO.id++ element.id_ = GO.id++
@@ -776,6 +776,7 @@ export default defineComponent({
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.loadingShow = false this.loadingShow = false

5
src/component/HomePage/SketchboardUpload.vue
View File

@@ -871,7 +871,7 @@ export default defineComponent({
(rv) => { (rv) => {
if(this.loadingShow){//防止取消后有正在执行的获取状态 if(this.loadingShow){//防止取消后有正在执行的获取状态
let arr:any = [] let arr:any = []
arr = rv.filter((item:any)=>item.status != 'Success') arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail')
rv.forEach((element:any) => { rv.forEach((element:any) => {
element.imgUrl = element.url element.imgUrl = element.url
element.id_ = GO.id++ element.id_ = GO.id++
@@ -890,6 +890,7 @@ export default defineComponent({
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.loadingShow = false this.loadingShow = false
@@ -898,7 +899,7 @@ export default defineComponent({
} }
} }
).catch(res=>{ ).catch(res=>{
this.fileList = this.fileList.filter((item:any)=>item.status == 'Success') this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime) clearInterval(this.generateTime)
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.loadingShow = false this.loadingShow = false

5
src/views/HomeView/library.vue
View File

@@ -1167,19 +1167,18 @@ export default defineComponent({
(rv) => { (rv) => {
if(this.isShowMark){//防止取消后有正在执行的获取状态 if(this.isShowMark){//防止取消后有正在执行的获取状态
let arr:any = [] let arr:any = []
arr = rv.filter((item:any)=>item.status != 'Success') arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail')
rv.forEach((element:any) => { rv.forEach((element:any) => {
element.imgUrl = element.url element.imgUrl = element.url
this.generateList.forEach((item:any,index:any) => { this.generateList.forEach((item:any,index:any) => {
if(item.taskId == element.taskId && element.status == 'Success'){ if(item.taskId == element.taskId && element.status == 'Success'){
this.generateList[index] = element this.generateList[index] = element
} }
}); });
}); });
if(arr.length == 0){ if(arr.length == 0){
this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime) clearInterval(this.generateTime)
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.isShowMark = false this.isShowMark = false