From a194ae3bf651d90215d5daa706f42111fff0a823 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 22 Apr 2024 09:46:40 +0800
Subject: [PATCH] fix

---
 src/component/HomePage/ExportModel.vue       |  3 +++
 src/component/HomePage/Generate.vue          |  9 +++++----
 src/component/HomePage/PrintboardUpload.vue  |  8 +++++---
 src/component/HomePage/SketchboardUpload.vue |  9 +++++----
 src/lang/cn.ts                               |  4 ++--
 src/lang/en.ts                               |  4 ++--
 src/views/HomeView/library.vue               | 12 ++++++------
 7 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 95c1523b..f2c48686 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -1443,6 +1443,9 @@ export default defineComponent({
 			// 	message.info('Your print is empty')
 			// 	return
 			// }
+			if(this.allBoardData.printboardFiles.length<=0){
+				return
+			}
 			if(credits.value < 30){
 				message.info( useI18.t('exportModel.jsContent3'))
 				// return
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 6d4cc4b2..35b5b78e 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -644,15 +644,16 @@ export default defineComponent({
 		},
 		removeGenerate(){
 			let arr = this.fileList.filter((item:any)=>item.status != 'Success')
-
+			//取消操作
+			this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
+			this.loadingShow = false
+			clearInterval(this.generateTime)
 			if(arr){
 				let str = arr.map((obj:any) => obj.taskId).join(',');
 				let data = {uniqueId:str,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
 				Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
 					(rv) => {
-						this.fileList = this.fileList.filter((item:any)=>item.status == 'Success')
-						this.loadingShow = false
-						clearInterval(this.generateTime)
+						
 					}
 				).catch(res=>{
 				});
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index 8819b773..69a2e800 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -793,14 +793,16 @@ export default defineComponent({
 		},
 		removeGenerate(){
 			let arr = this.generateList.filter((item:any)=>item.status != 'Success')
+			//取消操作
+			this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
+			this.loadingShow = false
+			clearInterval(this.generateTime)
 			if(arr){
 				let str = arr.map((obj:any) => obj.taskId).join(',');
 				let data = {uniqueId:str,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
 				Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
 					(rv) => {
-						this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
-						this.loadingShow = false
-						clearInterval(this.generateTime)
+						
 					}
 				).catch(res=>{
 				});
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 11d959fa..e089d0ec 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -905,16 +905,17 @@ export default defineComponent({
 			},1000)
 		},
 		removeGenerate(){
-			
 			let arr = this.generateList.filter((item:any)=>item.status != 'Success')
+			//取消操作
+			this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
+			this.loadingShow = false
+			clearInterval(this.generateTime)
 			if(arr){
 				let str = arr.map((obj:any) => obj.taskId).join(',');
 				let data = {uniqueId:str,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
 				Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
 					(rv) => {
-						this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
-						this.loadingShow = false
-						clearInterval(this.generateTime)
+						
 					}
 				).catch(res=>{
 				});
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 4ce5b595..5fe1abba 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -52,7 +52,7 @@ export default {
 		insufficient:'您的积分余额不足，如需使用此功能，请点击左上角充值',
 		HDExport:'高清导出',
 		Export:'导出',
-		SR:'请选择需要SR的图片',
+		SR:'请选择需要超分的图片',
 		requiresCredits:'每张图片需要消耗{data}积分',
 		Scale:'倍率',
 		Cancel:'取消',
@@ -61,7 +61,7 @@ export default {
 		jsContent3:'您的积分小于一次超分',
 		jsContent4:'您的积分余额不足',
 		jsContent5:'你选择的第 {str}张图片宽度或者高度超过2048,',
-		jsContent6:'请选择需要SR的图片',
+		jsContent6:'请选择需要超分的图片',
 	},
 	upgradePlan:{
 		BuyCredlts:'购买积分',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 8c29ebd9..770be893 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -53,7 +53,7 @@ export default {
 		insufficient:'Your points balance is insufficient, if you need to use this feature, please click the top left corner to recharge',
 		HDExport:'UpScale',
 		Export:'Export',
-		SR:'Please select the picture that requires SR',
+		SR:'Please select the picture that requires upscale',
 		requiresCredits:'Each picture requires {data} credits',
 		Scale:'Scale',
 		Cancel:'Cancel',
@@ -62,7 +62,7 @@ export default {
 		jsContent3:'Your points are less than one SR',
 		jsContent4:'Your points balance is insufficient',
 		jsContent5:'You selected the {str} image and zoom ratio more than 2048,',
-		jsContent6:'Please select the picture that requires SR',
+		jsContent6:'Please select the picture that requires upscale',
 	},
 	upgradePlan:{
 		BuyCredlts:'Buy credits',
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index 4268afc9..40e8af88 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -1198,17 +1198,17 @@ export default defineComponent({
 		},
 		removeGenerate(){
 			let arr = this.generateList.filter((item:any)=>item.status != 'Success')
-
+			this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
+			this.isShowMark = false
+			this.isGenerate = false
+			this.remGenerate = false
+			clearInterval(this.generateTime)
 			if(arr){
 				let str = arr.map((obj:any) => obj.taskId).join(',');
 				let data = {uniqueId:str,userId:(this?.userInfo as any)?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
 				Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
 					(rv) => {
-						this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
-						this.isShowMark = false
-						this.isGenerate = false
-						this.remGenerate = false
-						clearInterval(this.generateTime)
+						
 					}
 				).catch(res=>{
 				});