fix Merge branch 'StableVersion' of https://e.coding.net/aidlabfashion/aida/aida_front into StableVersion

This commit is contained in:
X1627315083
2024-01-24 10:33:58 +08:00
4 changed files with 126 additions and 45 deletions

View File

@@ -52,7 +52,8 @@
v-model="searchPictureName"
@keydown.enter="getgenerate()"
/>
<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div>
<div v-if="!loadingShow" class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div>
<div v-else class="generage_btn started_btn" :class="[driver__.driver?'hideEvents':'']" @click.stop="removeGenerate">{{ $t('Generate.Close') }}</div>
<span>{{ $t('Generate.maximumLength') }}</span>
</div>
<div v-if="type_.type2 == 'Sketchboard' || type_.type2 == 'Printboard'" class="generage_img Guide_1_6">
@@ -173,15 +174,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.currently',{generateLineUp:generateLineUp}) }}</div>
</div>
</div>
</div>
<scaleImage ref="scaleImage"></scaleImage>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<!-- <div class="mark_loading_text">
<div class="mark_loading_title">您当前排队人数为<span>2</span>人</div>
<div class="mark_loading_text_btn">取消等待</div>
</div> -->
</div>
</div>
</template>
<script lang="ts">
@@ -256,6 +257,10 @@ export default defineComponent({
let isMmerge = ref(false)
let isTest = ref()
let userInfo:any = {}
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
return {
imgList,
selectImgList,
@@ -287,6 +292,10 @@ export default defineComponent({
t,
isMmerge,
isTest,
userInfo,
generateId,
generateTime,
generateLineUp,
};
},
data(prop) {
@@ -321,6 +330,8 @@ export default defineComponent({
// item.id_ = GO.id++
// })
// this.store.commit("addGenerateFils", this.fileList);
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.token = getCookie("token") || "";
let isTest:any = getCookie('isTest')
this.isTest =JSON.parse(isTest)
@@ -528,38 +539,102 @@ export default defineComponent({
level1Type:this.upload.level1Type,
level2Type:'',
text:this.searchPictureName,
userId:this?.userInfo?.userId,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
version:1,//为1就是Print
gender:'',
}
this.loadingShow = true
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
(rv) => {
if(rv){
this.fileList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:rv.generatedCollectionItems[index].generateItemId,
imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
like:rv.generatedCollectionItems[index].isLiked
}
this.fileList.push(arr)
this.loadingShow = false
})
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
// if(){
// // driverObj__.moveNext()
// }
this.generateId = rv
this.setGenerate()
}else{
// this.loadingShow = false
}
}
).catch(res=>{
this.loadingShow = false
});
// Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
// (rv) => {
// console.log(rv)
// if(rv){
// this.fileList = []
// let arr
// rv.generatedCollectionItems.forEach((v:any,index:number)=>{
// arr = {
// id:rv.generatedCollectionItems[index].generateItemId,
// imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
// like:rv.generatedCollectionItems[index].isLiked
// }
// this.fileList.push(arr)
// this.loadingShow = false
// })
// nextTick().then(()=>{
// if(this.driver__.driver){
// driverObj__.moveNext()
// }
// })
// }
// }
// ).catch(res=>{
// this.loadingShow = 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
this.fileList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:rv.generatedCollectionItems[index].generateItemId,
imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
like:rv.generatedCollectionItems[index].isLiked
}
this.fileList.push(arr)
this.loadingShow = false
})
this.generateId = ''
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
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
}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.loadingShow = false
this.generateLineUp = 0
clearInterval(this.generateTime)
}
).catch(res=>{
});
}
},
ifMaximumLength(){
clearTimeout(this.inputTime)