generate

src/views/LibraryPage.vue

@@ -405,6 +405,10 @@
         <!-- 蒙层 start-->
         <div class="mark_loading" v-show="isShowMark">
             <a-spin size="large" />
+			<div class="mark_loading_text" v-show="isGenerate">
+				<div v-show="generateLineUp > 0">{{ $t('Generate.currently',{generateLineUp:generateLineUp}) }}</div>
+				<div class="mark_loading_btn" @click="removeGenerate">{{$t('LibraryPage.Close')}}</div>
+			</div>
         </div>
         <!-- 蒙层 end-->
 		<RobotAssist></RobotAssist>
@@ -428,6 +432,7 @@ import { getCookie } from "@/tool/cookie";
 import scaleImage from "@/component/HomePage/scaleImage.vue";
 import { useI18n } from "vue-i18n";
 import { ElCascader } from 'element-plus'
+import { remove } from "jszip";
 export default defineComponent({
     components: {
         HeaderComponent,
@@ -534,7 +539,10 @@ export default defineComponent({
 		let driver__:any = computed(()=>{
 			return store.state.Guide.guide
 		})
-	
+		let generateId:any = ref()
+		let generateTime:any = ref()
+		let generateLineUp:any = ref(0)
+		let isGenerate:any = ref(false)
         return {
             menuList,
             selectImgList,
@@ -573,7 +581,11 @@ export default defineComponent({
 			props,
 			intersection,
 			isTest,
-			driver__
+			driver__,
+			generateId,
+			generateTime,
+			generateLineUp,
+			isGenerate,
         }
     },
 	data(this_) {
@@ -1242,6 +1254,7 @@ export default defineComponent({
 				collectionElementId:generageImg?.id,
 				level1Type:this.selectCode,
 				level2Type:this.selectCode == 'Sketchboard'?this.designType.value:'',
+				userId:(this?.userInfo as any).userId,
 				text:this.selectCode == 'Printboard'?`${arr[this.printModel.num-1]},${this.captionGeneration}`:this.captionGeneration,
 				timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
 				version:1,//为1就是Print
@@ -1301,28 +1314,70 @@ export default defineComponent({
 				}
 			}
 			this.isShowMark = true
-			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
+			this.isGenerate = true
+			Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
                 (rv) => {
 					if(rv){
-						let arr
-						rv.generatedCollectionItems.forEach((v:any,index:number)=>{
-							arr = {
-								id:v.generateItemId,
-								imgUrl:v.generateItemUrl,
-								like:v.isLiked
-
-							}
-						// this.generateList.push(arr)
-						this.generateList.unshift(arr)
-						
-						})
-						this.isShowMark = false
+						this.generateId = rv
+						this.setGenerate()
 					}
                 }
             ).catch(res=>{
 				this.isShowMark = false
+				this.isGenerate = false
             });
 		},
+		setGenerate(){
+			this.generateTime = setInterval(()=>{
+				let data = {uniqueId:this.generateId}
+				Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
+					(rv) => {
+						if(rv.generateId){
+							this.generateLineUp = 0
+							clearInterval(this.generateTime)
+							let arr
+							rv.generatedCollectionItems.forEach((v:any,index:number)=>{
+								arr = {
+									id:v.generateItemId,
+									imgUrl:v.generateItemUrl,
+									like:v.isLiked
+								}
+							// this.generateList.push(arr)
+							this.generateList.unshift(arr)
+							
+							})
+						// this.isShowMark = false
+						this.isGenerate = false
+						this.isShowMark = false
+						}else if(rv.rankPosition == null){
+							this.generateLineUp = 0
+							// this.isShowMark = false
+						}else if(rv.rankPosition == 0){
+							this.generateLineUp = 0
+							// this.isShowMark = false
+						}else{
+							this.generateLineUp = rv.rankPosition
+						}
+					}
+				).catch(res=>{
+				});
+			},5000)
+		},
+		removeGenerate(){
+			if(this.generateId){
+				let data = {uniqueId:this.generateId}
+				Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
+					(rv) => {
+						this.generateId = ''
+						this.isShowMark = false
+						this.isGenerate = false
+						this.generateLineUp = 0
+						clearInterval(this.generateTime)
+					}
+				).catch(res=>{
+				});
+			}
+		},
 		dropdownVisibleChange1(){
 			let element:any = this.$refs.cascader1
 			let el = element.contentRef?.getElementsByClassName('el-cascader-menu__empty-text')?.[0]