修改generate传参
This commit is contained in:
@@ -410,7 +410,7 @@
|
||||
<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="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
|
||||
|
||||
</div>
|
||||
<!-- 蒙层 end-->
|
||||
@@ -544,8 +544,10 @@ export default defineComponent({
|
||||
})
|
||||
let generateId:any = ref()
|
||||
let generateTime:any = ref()
|
||||
let generateLineUp:any = ref(0)
|
||||
let generateLineUp:any = ref(-1)
|
||||
let isGenerate:any = ref(false)
|
||||
let remGenerate:any = ref(false)
|
||||
let remGenerateTime:any = ref()
|
||||
return {
|
||||
menuList,
|
||||
selectImgList,
|
||||
@@ -589,6 +591,8 @@ export default defineComponent({
|
||||
generateTime,
|
||||
generateLineUp,
|
||||
isGenerate,
|
||||
remGenerate,
|
||||
remGenerateTime,
|
||||
}
|
||||
},
|
||||
data(this_) {
|
||||
@@ -1236,6 +1240,8 @@ export default defineComponent({
|
||||
}
|
||||
},
|
||||
getgenerate(){
|
||||
clearInterval(this.remGenerateTime)
|
||||
this.remGenerate = false
|
||||
if(this.isTest){//试用用户禁止使用
|
||||
message.info(
|
||||
this.t('isTest.available')
|
||||
@@ -1323,6 +1329,9 @@ export default defineComponent({
|
||||
if(rv){
|
||||
this.generateId = rv
|
||||
this.setGenerate()
|
||||
this.remGenerateTime = setTimeout(()=>{
|
||||
this.remGenerate = true
|
||||
},10000)
|
||||
}
|
||||
}
|
||||
).catch(res=>{
|
||||
@@ -1336,7 +1345,7 @@ export default defineComponent({
|
||||
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
|
||||
(rv) => {
|
||||
if(rv.generateId){
|
||||
this.generateLineUp = 0
|
||||
this.generateLineUp = -1
|
||||
clearInterval(this.generateTime)
|
||||
let arr
|
||||
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
|
||||
@@ -1352,12 +1361,8 @@ export default defineComponent({
|
||||
// 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
|
||||
clearInterval(this.remGenerateTime)
|
||||
this.remGenerate = false
|
||||
}else{
|
||||
this.generateLineUp = rv.rankPosition
|
||||
}
|
||||
@@ -1368,13 +1373,13 @@ 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.isShowMark = false
|
||||
this.isGenerate = false
|
||||
this.generateLineUp = 0
|
||||
this.generateLineUp = -1
|
||||
clearInterval(this.generateTime)
|
||||
}
|
||||
).catch(res=>{
|
||||
|
||||
Reference in New Issue
Block a user