修改generate功能
This commit is contained in:
@@ -192,9 +192,10 @@
|
||||
<div v-show="isUseGenerate" @click="setUseGenerate">Generate</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="modal_img">
|
||||
<div class="modal_img" :style="[loadingShow?'overflow:hidden':'']">
|
||||
<div v-for="item,index in generateList" class="modal_imgItem Guide_1_13_2" :class="[driver__.driver?'showEvents':'',item?.checked?'active':'']">
|
||||
<img :src="item.imgUrl" @click="generageAdd(item)">
|
||||
<img v-show="item.status != 'Success'" src="@/assets/images/homePage/loading.gif" alt="">
|
||||
<img v-show="item.status == 'Success'" :src="item.imgUrl" @click.stop="generageAdd(item)">
|
||||
<div class="operate_file_block" :class="[driver__.driver?'hideEvents':'']">
|
||||
<div class="select_img_type">
|
||||
<div
|
||||
@@ -259,9 +260,7 @@
|
||||
</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="mark_loading_btn" :class="[driver__.driver?'hideEvents':'']" @click="removeGenerate">{{$t('Generate.Close')}}</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -314,9 +313,7 @@ export default defineComponent({
|
||||
let driver__:any = inject('driver__')
|
||||
let isTest = ref()
|
||||
let userInfo:any = {}
|
||||
let generateId:any = ref()
|
||||
let generateTime:any = ref()
|
||||
let generateLineUp:any = ref(-1)
|
||||
let remGenerate:any = ref(false)
|
||||
let remGenerateTime:any = ref()
|
||||
let isUseGenerate = ref(false)
|
||||
@@ -343,9 +340,7 @@ export default defineComponent({
|
||||
driver__,
|
||||
isTest,
|
||||
userInfo,
|
||||
generateId,
|
||||
generateTime,
|
||||
generateLineUp,
|
||||
remGenerate,
|
||||
remGenerateTime,
|
||||
useGenerate,
|
||||
@@ -839,14 +834,19 @@ export default defineComponent({
|
||||
(rv) => {
|
||||
if(data.isTestUser){
|
||||
if(rv.leftUsageCount >= 1){
|
||||
message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount,str:this.t('collectionModal.Sketchboard')}));
|
||||
message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount,str:this.t('collectionModal.Printboard')}));
|
||||
}else if(rv.leftUsageCount == 0){
|
||||
message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Sketchboard')}));
|
||||
message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Printboard')}));
|
||||
this.loadingShow = false
|
||||
return
|
||||
}
|
||||
}
|
||||
this.generateId = rv.uniqueId
|
||||
rv.uniqueId.forEach((item:any) => {
|
||||
let arr:any = {}
|
||||
arr.taskId = item
|
||||
arr.status = 'execution'
|
||||
this.generateList.unshift(arr)
|
||||
});
|
||||
this.setGenerate()
|
||||
this.remGenerateTime = setTimeout(()=>{
|
||||
this.remGenerate = true
|
||||
@@ -866,36 +866,35 @@ export default defineComponent({
|
||||
}
|
||||
});
|
||||
this.generateTime = setInterval(()=>{
|
||||
let data = {uniqueId:this.generateId}
|
||||
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
|
||||
let data = this.generateList.filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId);
|
||||
Https.axiosPost(Https.httpUrls.generateResult, data).then(
|
||||
(rv) => {
|
||||
if(rv.generateId){
|
||||
this.generateLineUp = -1
|
||||
clearInterval(this.generateTime)
|
||||
this.generateList = []
|
||||
let arr
|
||||
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
|
||||
|
||||
arr = {
|
||||
id:v.generateItemId,
|
||||
imgUrl:v.generateItemUrl,
|
||||
category:generage.level2Type?generage.level2Type:sketchCatecoryList[0].name,
|
||||
categoryValue:categoryValue?categoryValue:sketchCatecoryList[0].value,
|
||||
id_:GO.id++,
|
||||
like:v.isLiked
|
||||
}
|
||||
this.generateList.push(arr)
|
||||
this.loadingShow = false
|
||||
})
|
||||
nextTick().then(()=>{
|
||||
if(this.driver__.driver){
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
})
|
||||
clearInterval(this.remGenerateTime)
|
||||
this.remGenerate = false
|
||||
}else{
|
||||
this.generateLineUp = rv.rankPosition
|
||||
if(this.loadingShow){//防止取消后有正在执行的获取状态
|
||||
let arr:any = []
|
||||
arr = rv.filter((item:any)=>item.status != 'Success')
|
||||
rv.forEach((element:any) => {
|
||||
element.imgUrl = element.url
|
||||
element.id_ = GO.id++
|
||||
element.category = generage.level2Type?generage.level2Type:sketchCatecoryList[0].name,
|
||||
element.categoryValue = categoryValue?categoryValue:sketchCatecoryList[0].value,
|
||||
this.generateList.forEach((item:any,index:any) => {
|
||||
if(item.taskId == element.taskId && element.status == 'Success'){
|
||||
this.generateList[index] = element
|
||||
}
|
||||
});
|
||||
});
|
||||
// this.generateList = rv;
|
||||
if(arr.length == 0){
|
||||
nextTick().then(()=>{
|
||||
if(this.driver__.driver){
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
})
|
||||
clearInterval(this.generateTime)
|
||||
clearInterval(this.remGenerateTime)
|
||||
this.loadingShow = false
|
||||
this.remGenerate = false
|
||||
}
|
||||
}
|
||||
}
|
||||
).catch(res=>{
|
||||
@@ -903,16 +902,18 @@ export default defineComponent({
|
||||
clearInterval(this.remGenerateTime)
|
||||
this.loadingShow = false
|
||||
});
|
||||
},5000)
|
||||
},1000)
|
||||
},
|
||||
removeGenerate(){
|
||||
if(this.generateId){
|
||||
let data = {uniqueId:this.generateId,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
|
||||
|
||||
let arr = this.generateList.filter((item:any)=>item.status != 'Success')
|
||||
if(arr){
|
||||
let str = arr.map((obj:any) => obj.taskId).join(',');
|
||||
let data = {uniqueId:str,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
|
||||
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
|
||||
(rv) => {
|
||||
this.generateId = ''
|
||||
this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
|
||||
this.loadingShow = false
|
||||
this.generateLineUp = -1
|
||||
clearInterval(this.generateTime)
|
||||
}
|
||||
).catch(res=>{
|
||||
@@ -1191,6 +1192,7 @@ export default defineComponent({
|
||||
}
|
||||
.modal_accomplish{
|
||||
// margin-top: 2rem*1.2);
|
||||
overflow-x: hidden;
|
||||
height: calc(30rem*1.2);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
Reference in New Issue
Block a user