修改generate传参

This commit is contained in:
X1627315083
2024-01-26 13:16:47 +08:00
parent a75342fe08
commit a90333517d
11 changed files with 524 additions and 65 deletions

View File

@@ -173,14 +173,15 @@
</div>
</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>
</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 v-show="remGenerate" :class="[driver__.driver?'hideEvents':'']" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
</div>
<scaleImage ref="scaleImage"></scaleImage>
</div>
@@ -260,7 +261,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 {
imgList,
selectImgList,
@@ -296,6 +299,8 @@ export default defineComponent({
generateId,
generateTime,
generateLineUp,
remGenerate,
remGenerateTime,
};
},
data(prop) {
@@ -503,6 +508,8 @@ export default defineComponent({
})
},
getgenerate(){
clearInterval(this.remGenerateTime)
this.remGenerate = false
if(this.isTest){//试用用户禁止使用
message.info(
this.t('isTest.available')
@@ -550,6 +557,9 @@ export default defineComponent({
if(rv){
this.generateId = rv
this.setGenerate()
this.remGenerateTime = setTimeout(()=>{
this.remGenerate = true
},10000)
}else{
// this.loadingShow = false
}
@@ -589,7 +599,7 @@ export default defineComponent({
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
(rv) => {
if(rv.generateId){
this.generateLineUp = 0
this.generateLineUp = -1
this.fileList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
@@ -608,12 +618,9 @@ 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
}
@@ -624,12 +631,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=>{