2023-11-10-dist
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
<ul v-show="printModel.optype">
|
||||
<li class="printModel_item" @click="setprintModel(1)">{{ $t('Generate.Model1') }}</li>
|
||||
<li class="printModel_item" @click="setprintModel(2)">{{ $t('Generate.Model2') }}</li>
|
||||
<li v-show="printBoards.length > 1" class="printModel_item" @click="setprintModel(3)">{{ $t('Generate.Generate') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -232,10 +233,11 @@ export default defineComponent({
|
||||
let collectionElementid = ref()
|
||||
let level2Type = ref('')
|
||||
let printModel = ref({
|
||||
num:1,
|
||||
num:'',
|
||||
optype:false,
|
||||
name:useI18n().t('Generate.Model')+'1'
|
||||
})
|
||||
let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
|
||||
// let sketchCatecoryList:any = ref([])
|
||||
let workspace:any = ref({})
|
||||
|
||||
@@ -265,6 +267,7 @@ export default defineComponent({
|
||||
checkboxImage,
|
||||
printModel,
|
||||
loadingShow,
|
||||
printBoards,
|
||||
// sketchCatecoryList,
|
||||
workspace,
|
||||
inputShow,
|
||||
@@ -371,11 +374,20 @@ export default defineComponent({
|
||||
document.removeEventListener('click',this.removePrintModel)
|
||||
},
|
||||
setprintModel(num:any){
|
||||
this.printModel = {
|
||||
num : num,
|
||||
optype:false,
|
||||
name:this.t('Generate.Model')+num
|
||||
if(num == 3){
|
||||
this.printModel = {
|
||||
num : this.t('Generate.Generate'),
|
||||
optype:false,
|
||||
name:this.t('Generate.Generate')
|
||||
}
|
||||
}else{
|
||||
this.printModel = {
|
||||
num : num,
|
||||
optype:false,
|
||||
name:this.t('Generate.Model')+num
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
getgenerate(){
|
||||
if(!this.searchPictureName){
|
||||
|
||||
@@ -375,26 +375,26 @@ export default defineComponent({
|
||||
//获取当前语言
|
||||
getLang(){
|
||||
let data = {}
|
||||
Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
|
||||
(rv) => {
|
||||
if (rv) {
|
||||
this.locale = rv
|
||||
}
|
||||
}
|
||||
);
|
||||
// Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
|
||||
// (rv) => {
|
||||
// if (rv) {
|
||||
// this.locale = rv
|
||||
// }
|
||||
// }
|
||||
// );
|
||||
},
|
||||
setLang(v){
|
||||
let data = {
|
||||
language:v
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.changeUserLanguage, data).then(
|
||||
(rv) => {
|
||||
if (rv) {
|
||||
console.log(rv);
|
||||
// this.getLang()
|
||||
}
|
||||
}
|
||||
);
|
||||
// Https.axiosPost(Https.httpUrls.changeUserLanguage, data).then(
|
||||
// (rv) => {
|
||||
// if (rv) {
|
||||
// console.log(rv);
|
||||
// this.getLang()
|
||||
// }
|
||||
// }
|
||||
// );
|
||||
},
|
||||
|
||||
setLocale(v){
|
||||
@@ -402,7 +402,7 @@ export default defineComponent({
|
||||
// let name = 'home'
|
||||
// let noRefresh = true;
|
||||
// this.$router.push({ name: name, params: { noRefresh: noRefresh } });
|
||||
this.locale = v
|
||||
// this.locale = v
|
||||
this.setLang(v)
|
||||
// this.locale == 'zh-cn'?this.locale = 'en':this.locale = 'zh-cn'
|
||||
}
|
||||
|
||||
@@ -155,7 +155,8 @@ export default defineComponent({
|
||||
let store:any =useStore()
|
||||
let fileList:any = ref([]),//选中的文件id数据
|
||||
printImgList:any = ref([]), //print的印花图片
|
||||
moodBoards:any = computed(()=>{return store.state.UploadFilesModule.moodboardFiles})
|
||||
moodBoards:any = computed(()=>{return store.state.UploadFilesModule.moodboard}),
|
||||
printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
|
||||
let openClick: any = ref(1);
|
||||
let generateCheckbox:any = ref()
|
||||
let generateList:any = ref([])
|
||||
@@ -167,6 +168,7 @@ export default defineComponent({
|
||||
fileList,
|
||||
printImgList,
|
||||
moodBoards,
|
||||
printBoards,
|
||||
openClick,
|
||||
generateCheckbox,
|
||||
generateList,
|
||||
@@ -179,7 +181,7 @@ export default defineComponent({
|
||||
computed:{
|
||||
getPinLength(){
|
||||
let selectLength:any = 0
|
||||
for(let item of this.fileList){
|
||||
for(let item of this.printBoards){
|
||||
if(item.pin){
|
||||
selectLength++
|
||||
}
|
||||
@@ -208,7 +210,6 @@ export default defineComponent({
|
||||
cropperFileData:{name:'',uid:''}, //裁剪的原始文件数据
|
||||
currentFileNum:0, //当前上传的文件数
|
||||
isUpload:false,
|
||||
generateloading:false,
|
||||
captionGeneration:'',
|
||||
printboardList:computed(()=>{
|
||||
return useStore().state.UploadFilesModule.printboard
|
||||
@@ -499,8 +500,13 @@ export default defineComponent({
|
||||
},500)
|
||||
},
|
||||
getgenerate(){
|
||||
//如果是通过moodboard随即图片生成
|
||||
let generage:any = this.$refs.Generate
|
||||
let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
|
||||
if(generage.printModel.num == 'Generate'){
|
||||
this.generatePrint()
|
||||
return
|
||||
}
|
||||
let data = {
|
||||
generateType:generateType,
|
||||
designType:'',
|
||||
@@ -541,29 +547,115 @@ export default defineComponent({
|
||||
return
|
||||
}
|
||||
}
|
||||
this.loadingShow = true
|
||||
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, 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.loadingShow = true
|
||||
// Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, 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
|
||||
})
|
||||
}
|
||||
}
|
||||
).catch(res=>{
|
||||
this.loadingShow = false
|
||||
});
|
||||
// }
|
||||
// this.generateList.push(arr)
|
||||
// this.loadingShow = false
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// ).catch(res=>{
|
||||
// this.loadingShow = false
|
||||
// });
|
||||
},
|
||||
randomRange(min:any, max:any, num:any) { // min最小值,max最大值 num排除的值
|
||||
let index = Math.floor(Math.random() * (max - min)) + min;
|
||||
while(index === num){
|
||||
index = Math.floor(Math.random() * (max - min)) + min;
|
||||
}
|
||||
return index
|
||||
|
||||
},
|
||||
generatePrint(){
|
||||
let data:any = {}
|
||||
//随机获取图片id
|
||||
if(!this.moodBoards.length){ //mood没有图片
|
||||
let index1 = -1
|
||||
let index2 = -2
|
||||
if(!this.getPinLength){ //没pin住
|
||||
index1 = this.randomRange(0, this.printBoards.length, -1)
|
||||
index2 = this.randomRange(0, this.printBoards.length, index1)
|
||||
}else if(this.getPinLength === 1){ //pin住1个
|
||||
this.printBoards.forEach((element:any,index:number) => {
|
||||
if(element.pin){
|
||||
index1 = index
|
||||
}
|
||||
});
|
||||
index2 = this.randomRange(0, this.printBoards.length, index1)
|
||||
}else{ //pin住多个
|
||||
let selectIndexList:any = []
|
||||
this.printBoards.forEach((element:any,index:number) => {
|
||||
if(element.pin){
|
||||
selectIndexList.push(index)
|
||||
}
|
||||
});
|
||||
index1 = this.randomRange(0, selectIndexList.length, -1) //pin住的中随机选一个
|
||||
index2 = this.randomRange(0, this.printBoards.length, selectIndexList[index1]) //除了选中的外再来一个
|
||||
|
||||
}
|
||||
data = {
|
||||
select1Id:this.printBoards[index1].id,
|
||||
select2Id:this.printBoards[index2].id
|
||||
}
|
||||
}else{
|
||||
let index1 = this.randomRange(0, this.moodBoards.length, -1)
|
||||
let index2 = -2
|
||||
if(!this.getPinLength){ //没pin住
|
||||
index2 = this.randomRange(0, this.printBoards.length, -1)
|
||||
}else if(this.getPinLength === 1){ //pin住1个
|
||||
this.printBoards.forEach((element:any,index:number) => {
|
||||
if(element.pin){
|
||||
index2 = index
|
||||
}
|
||||
});
|
||||
}else{ //pin住多个
|
||||
let selectIndexList:any = []
|
||||
this.printBoards.forEach((element:any,index:number) => {
|
||||
if(element.pin){
|
||||
selectIndexList.push(index)
|
||||
}
|
||||
});
|
||||
index2 = this.randomRange(0, selectIndexList.length, -1) //pin住的中随机选一个
|
||||
}
|
||||
data = {
|
||||
select1Id:this.moodBoards[index1].resData.id,
|
||||
select2Id:this.printBoards[index2].id
|
||||
}
|
||||
}
|
||||
data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
console.log(data,this.moodBoards,this.printBoards);
|
||||
|
||||
this.loadingShow = true
|
||||
Https.axiosPost(Https.httpUrls.elementGeneratePrint, data).then((rv) =>{
|
||||
if(rv){
|
||||
console.log(rv);
|
||||
|
||||
// let data = {
|
||||
// imgUrl:rv.url,
|
||||
// resData:rv
|
||||
// }
|
||||
// this.printImgList.push(data)
|
||||
// this.store.commit('setGeneratePrintFile',this.printImgList)
|
||||
// this.loadingShow = false
|
||||
}
|
||||
}).catch(res=>{
|
||||
this.loadingShow = false
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
generageAdd(item:any){
|
||||
item.type_ = {
|
||||
type1: "generate",
|
||||
|
||||
Reference in New Issue
Block a user