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

Merge remote-tracking branch 'origin/StableVersion' into dev_vite

Browse Source
This commit is contained in:
X1627315083
2025-09-22 14:10:18 +08:00
parent da241402f2 4f5a02bcf3
commit f4854cdb10
22 changed files with 105 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -743,7 +743,7 @@ export default defineComponent({
data = data.filter((item:any) => item !== element.taskId);
console.log(data)
this.fileList = this.fileList.filter((item:any) => item.taskId !== element.taskId);
message.info(this.t('Generate.everyTimeEffectPoor'));
// message.info(this.t('Generate.everyTimeEffectPoor'));
}
});
if((data.length == 0)){

49
src/component/HomePage/scaleImage.vue
View File

@@ -608,30 +608,31 @@ export default defineComponent({
setImageIndex(index:any){
if(this.isNext)return
let this_ = this
if(this.imgType == 'Printboard' || this.imgType == 'Sketchboard'){
this.isNext = true
new Promise((resolve,reject)=>{
Modal.confirm({
title: this.t('scaleImage.submitCanvas'),
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
centered:true,
onOk() {
this_.scaleImageIndex = index
this_.isNext = false
resolve('')
},
onCancel(){
this_.isNext = false
resolve('')
}
});
})
}else{
this.scaleImageIndex = index
}
// if(this.imgType == 'Printboard' || this.imgType == 'Sketchboard'){
// this.isNext = true
// new Promise((resolve,reject)=>{
// Modal.confirm({
// title: this.t('scaleImage.submitCanvas'),
// icon: createVNode(ExclamationCircleOutlined),
// okText: 'Yes',
// cancelText: 'No',
// mask:false,
// centered:true,
// onOk() {
// this_.scaleImageIndex = index
// this_.isNext = false
// resolve('')
// },
// onCancel(){
// this_.isNext = false
// resolve('')
// }
// });
// })
// }else{
// this.scaleImageIndex = index
// }
this.scaleImageIndex = index
},
LikeFile(item:any,str:string){
let parent:any = this.$parent