修改generate传参

src/component/HomePage/PrintboardUpload.vue

@@ -125,15 +125,15 @@
 							<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
 						</div>
 					</div>
-					<div class="mark_loading" v-show="loadingShow">
+					
+				</div>
+				<div class="mark_loading" v-show="loadingShow">
 						<a-spin size="large" />
 						<div class="mark_loading_text" v-show="generateLineUp >= 0">
 							<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
 						</div>
-						<div class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
+						<div v-show="remGenerate" :class="[driver__.driver?'hideEvents':'']" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
 					</div>
-				</div>
-				
 			</div>
 		</div>
 		<!-- 取消请求 -->
@@ -188,7 +188,9 @@ export default defineComponent({
 		let userInfo:any = {}
 		let generateId:any = ref()
 		let generateTime:any = ref()
-		let generateLineUp:any = ref(0)
+		let generateLineUp:any = ref(-1)
+		let remGenerate:any = ref(false)
+		let remGenerateTime:any = ref()
         return {
             fileList,
             printImgList,
@@ -207,6 +209,8 @@ export default defineComponent({
 			generateId,
 			generateTime,
 			generateLineUp,
+			remGenerate,
+			remGenerateTime,
         }
     },
     computed:{
@@ -578,6 +582,8 @@ export default defineComponent({
 			},500)
 		},
 		getgenerate(){
+			clearInterval(this.remGenerateTime)
+			this.remGenerate = false
 			if(this.isTest){//试用用户禁止使用
 				message.warning(
 					this.t('isTest.available')
@@ -668,6 +674,9 @@ export default defineComponent({
 					if(rv){
 						this.generateId = rv
 						this.setGenerate()
+						this.remGenerateTime = setTimeout(()=>{
+							this.remGenerate = true
+						},10000)
 					}else{
 						// this.loadingShow = false
 					}
@@ -682,7 +691,7 @@ export default defineComponent({
 				Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
 					(rv) => {
 						if(rv.generateId){
-							this.generateLineUp = 0
+							this.generateLineUp = -1
 							this.generateList = []
 							let arr
 							rv.generatedCollectionItems.forEach((v:any,index:number)=>{
@@ -701,12 +710,8 @@ export default defineComponent({
 								}
 							})
 							clearInterval(this.generateTime)
-						}else if(rv.rankPosition == null){
-							this.generateLineUp = 0
-							// this.loadingShow = false
-						}else if(rv.rankPosition == 0){
-							this.generateLineUp = 0
-							// this.loadingShow = false
+							clearInterval(this.remGenerateTime)
+							this.remGenerate = false
 						}else{
 							this.generateLineUp = rv.rankPosition
 						}
@@ -717,12 +722,12 @@ export default defineComponent({
 		},
 		removeGenerate(){
 			if(this.generateId){
-				let data = {uniqueId:this.generateId}
+				let data = {uniqueId:this.generateId,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
 				Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
 					(rv) => {
 						this.generateId = ''
 						this.loadingShow = false
-						this.generateLineUp = 0
+						this.generateLineUp = -1
 						clearInterval(this.generateTime)
 					}
 				).catch(res=>{