From 2c08adbfbe2cef498a4c6761c54062d3c87ab65d Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 25 Apr 2024 17:16:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4library=E7=9A=84generate?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/PrintboardUpload.vue | 2 +- src/views/HomeView/library.vue | 74 ++++++++++++--------- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index ba8edda8..0b0e212d 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -674,7 +674,7 @@ export default defineComponent({ } if(generateType == 'image'){ if(generage?.collectionElementid){ - data.text = '' + data.text = generage.printModel.value }else{ message.info( diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 95c8d5c3..c2125680 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -213,7 +213,12 @@ @keydown.enter="getgenerate" :readonly="checkbox[0].type && selectCode != 'Moodboard'" :placeholder="$t('LibraryPage.inputContent2')" v-model="captionGeneration"> -
{{ $t('LibraryPage.Generate') }}
+
+ + + +
+ @@ -278,12 +283,12 @@
-
+
-
+
@@ -296,17 +301,13 @@
- +
-
+
-
- -
-
@@ -415,8 +416,12 @@ export default defineComponent({ let generateCheckbox:any = ref() let captionGeneration:any = ref() let inputTime = ref() - let generateList:any = ref([ - ]) + let generateList:any = ref({ + Sketchboard:[], + Moodboard:[], + Printboard:[] + + }) let selectGenerateList:any = ref([]) let printModel = ref({ num:1, @@ -628,7 +633,11 @@ export default defineComponent({ this.uploadGenerate = 'Upload' this.captionGeneration = '' this.selectGenerateList = [] - this.generateList = [] + // this.generateList = { + // 'Sketchboard':[], + // 'Moodboard':[], + // 'Printboard':[] + // } this.inputShow = false } this.upload.level1Type = menu.code @@ -1054,7 +1063,7 @@ export default defineComponent({ // ); // return // } - if(this.isShowMark){ + if(this.isGenerate){ return } let arr = ["Painting Style","Illustration Style","Real Style"] @@ -1078,7 +1087,7 @@ export default defineComponent({ } if(generateType == 'image'){ if(generageImg?.id){ - data.text = '' + data.text = arr[this.printModel.num-1] }else{ message.info( this.t('LibraryPage.jsContent9') @@ -1129,7 +1138,7 @@ export default defineComponent({ return } } - this.isShowMark = true + // this.isShowMark = true this.isGenerate = true Https.axiosPost(Https.httpUrls.generatePrepare, data).then( (rv) => { @@ -1147,7 +1156,7 @@ export default defineComponent({ }else if(rv.leftUsageCount == 0){ message.warning(this.t('Generate.jsContent9',{str:str})); this.isGenerate = false - this.isShowMark = false + // this.isShowMark = false return } } @@ -1155,7 +1164,7 @@ export default defineComponent({ let arr:any = {} arr.taskId = item arr.status = 'execution' - this.generateList.unshift(arr) + this.generateList[this.selectCode].unshift(arr) }); this.setGenerate() this.remGenerateTime = setTimeout(()=>{ @@ -1163,23 +1172,23 @@ export default defineComponent({ },10000) } ).catch(res=>{ - this.isShowMark = false + // this.isShowMark = false this.isGenerate = false }); }, setGenerate(){ this.generateTime = setInterval(()=>{ - let data = this.generateList.filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId); + let data = this.generateList[this.selectCode].filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId); Https.axiosPost(Https.httpUrls.generateResult, data).then( (rv) => { - if(this.isShowMark){//防止取消后有正在执行的获取状态 + if(this.isGenerate){//防止取消后有正在执行的获取状态 let arr:any = [] arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid') rv.forEach((element:any) => { - this.generateList.forEach((item:any,index:any) => { + this.generateList[this.selectCode].forEach((item:any,index:any) => { if(item.taskId == element.taskId && element.status == 'Success'){ element.imgUrl = element.url - this.generateList[index] = element + this.generateList[this.selectCode][index] = element if(element.category){ this.disignTypeList.forEach((itemCategory:any) => { if(itemCategory.value == element.category){ @@ -1196,28 +1205,28 @@ export default defineComponent({ message.info(this.t('Generate.effectPoor')); } if(arr.length == 0){ - this.generateList = this.generateList.filter((item:any)=>item.status == 'Success') + this.generateList[this.selectCode] = this.generateList[this.selectCode].filter((item:any)=>item.status == 'Success') clearInterval(this.generateTime) clearInterval(this.remGenerateTime) - this.isShowMark = false + // this.isShowMark = false this.remGenerate = false this.isGenerate = false } } } ).catch(res=>{ - this.generateList = this.generateList.filter((item:any)=>item.status == 'Success') + this.generateList[this.selectCode] = this.generateList[this.selectCode].filter((item:any)=>item.status == 'Success') clearInterval(this.generateTime) clearInterval(this.remGenerateTime) - this.isShowMark = false + // this.isShowMark = false this.isGenerate = false }); },1000) }, removeGenerate(){ - let arr = this.generateList.filter((item:any)=>item.status != 'Success') - this.generateList = this.generateList.filter((item:any)=>item.status == 'Success') - this.isShowMark = false + let arr = this.generateList[this.selectCode].filter((item:any)=>item.status != 'Success') + this.generateList[this.selectCode] = this.generateList[this.selectCode].filter((item:any)=>item.status == 'Success') + // this.isShowMark = false this.isGenerate = false this.remGenerate = false clearInterval(this.generateTime) @@ -1315,7 +1324,7 @@ export default defineComponent({ scaleImage(index:any){ let scaleImage:any = this.$refs.scaleImage scaleImage.scaleImageMask = true - scaleImage.init(this.generateList,index) + scaleImage.init(this.generateList[this.selectCode],index) }, } }) @@ -1635,7 +1644,10 @@ export default defineComponent({ cursor: no-drop; } } - + .fi-br-loading{ + animation: whirl 1s infinite linear; + + } .generage_btn{ margin: 0 3rem; }