This commit is contained in:
X1627315083
2024-01-24 10:34:05 +08:00
parent 2672803163
commit 32e23b7492
17 changed files with 316 additions and 88 deletions

View File

@@ -234,6 +234,7 @@ export default defineComponent({
let isMurmur = getCookie('isMurmur')//获取是否是试用用户
this.isMurmur =JSON.parse(isMurmur)
this.userInfo = JSON.parse(getCookie("userInfo"));
console.log(this.userInfo);
if (!this.userInfo) {
this.$router.replace("/login");
} else {

View File

@@ -301,7 +301,7 @@ export default defineComponent({
if(this.driver__.driver){
Generate.searchPictureName = 'Exit sign, door, sunset, ocean, surreal'
}else{
Generate.searchPictureName = ''
// Generate.searchPictureName = ''
}
}
},

View File

@@ -104,7 +104,8 @@
<div v-show="openClick == 3" class="modal_accomplish">
<div class="input_box Guide_1_2_8" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('PrintboardUpload.inputContent1')" v-model="captionGeneration">
<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
<div v-if="!loadingShow" class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
<div v-else class="generage_btn started_btn" :class="[driver__.driver?'hideEvents':'']" @click.stop="removeGenerate">{{ $t('PrintboardUpload.Close') }}</div>
<span>{{ $t('PrintboardUpload.maximumLength') }}</span>
</div>
<div class="modal_img">
@@ -124,11 +125,14 @@
<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
</div>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading_text" v-show="generateLineUp > 0">
<div>{{ $t('PrintboardUpload.currently',{generateLineUp:generateLineUp}) }}</div>
</div>
</div>
</div>
</div>
</div>
<!-- 取消请求 -->
@@ -180,6 +184,10 @@ export default defineComponent({
let driver__:any = inject('driver__')
let {t} = useI18n()
let isTest = ref()
let userInfo:any = {}
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
return {
fileList,
printImgList,
@@ -194,6 +202,10 @@ export default defineComponent({
driver__,
t,
isTest,
userInfo,
generateId,
generateTime,
generateLineUp,
}
},
computed:{
@@ -246,6 +258,8 @@ export default defineComponent({
}
},
mounted(){
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.token = getCookie('token') || ''
let isTest:any = getCookie('isTest')
this.isTest =JSON.parse(isTest)
@@ -589,6 +603,7 @@ export default defineComponent({
level2Type:'',
text:`${generage.printModel.value},${this.captionGeneration}`,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
userId:this?.userInfo?.userId,
version:1,//为1就是Print
gender:'',
}
@@ -647,32 +662,72 @@ export default defineComponent({
this.loadingShow = true
//取消请求
// Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data,{cancelToken: this.source?.token}).then(
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
(rv) => {
if(rv){
this.generateList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
id_:GO.id++,
like:rv.generatedCollectionItems[index].isLiked
}
this.generateList.push(arr)
this.loadingShow = false
})
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
this.generateId = rv
this.setGenerate()
}else{
// this.loadingShow = false
}
}
).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.generateList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
id_:GO.id++,
like:rv.generatedCollectionItems[index].isLiked
}
this.generateList.push(arr)
this.loadingShow = false
})
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=>{
});
}
},
randomRange(min:any, max:any, num:any) { // min最小值max最大值 num排除的值
let index = Math.floor(Math.random() * (max - min)) + min;
while(index === num){

View File

@@ -180,7 +180,8 @@
<div v-show="openClick == 3" class="modal_accomplish">
<div class="input_box Guide_1_9_2" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate()" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('SketchboardUpload.inputContent1')" v-model="captionGeneration">
<div class="generage_btn started_btn" @click.stop="getgenerate">Generate</div>
<div v-if="!loadingShow" class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('SketchboardUpload.Generate') }}</div>
<div v-else class="generage_btn started_btn" :class="[driver__.driver?'hideEvents':'']" @click.stop="removeGenerate">{{ $t('SketchboardUpload.Close') }}</div>
<span>{{ $t('SketchboardUpload.maximumLength') }}</span>
</div>
<div class="modal_img">
@@ -246,9 +247,12 @@
<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
</div>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<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>
</div>
</div>
@@ -298,6 +302,10 @@ export default defineComponent({
let {t} = useI18n()
let driver__:any = inject('driver__')
let isTest = ref()
let userInfo:any = {}
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
return {
fileList,
openClick,
@@ -313,6 +321,10 @@ export default defineComponent({
t,
driver__,
isTest,
userInfo,
generateId,
generateTime,
generateLineUp,
};
},
data() {
@@ -405,6 +417,8 @@ export default defineComponent({
}
},
mounted() {
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.token = getCookie("token") || "";
let isTest:any = getCookie('isTest')
this.isTest =JSON.parse(isTest)
@@ -693,6 +707,7 @@ export default defineComponent({
level2Type:generage.level2Type,
text:this.captionGeneration,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
userId:this?.userInfo?.userId,
version:1,//为1就是Print
gender:this.workspace.sex,
}
@@ -749,34 +764,75 @@ export default defineComponent({
}
this.loadingShow = true
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
(rv) => {
if(rv){
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:generage.level2Type?generage.level2Type:sketchCatecoryList[0].value,
id_:GO.id++,
like:v.isLiked
}
this.generateList.push(arr)
this.loadingShow = false
})
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
this.generateId = rv
this.setGenerate()
}
}
).catch(res=>{
this.loadingShow = false
});
},
setGenerate(){
let generage:any = this.$refs.Generate
let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
let sketchCatecoryList = this.sketchCatecoryList
this.generateTime = setInterval(()=>{
let data = {uniqueId:this.generateId}
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
(rv) => {
if(rv.generateId){
this.generateLineUp = 0
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:generage.level2Type?generage.level2Type:sketchCatecoryList[0].value,
id_:GO.id++,
like:v.isLiked
}
this.generateList.push(arr)
this.loadingShow = false
})
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
}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=>{
});
}
},
generageAdd(item:any){
item.type_ = {
type1: "generate",