push Develop
This commit is contained in:
@@ -33,7 +33,7 @@
|
||||
<div class="header_operate_item pointer" :class="{operate_select:uploadGenerate == 'Upload'}" @click="uploadGenerateOpen('Upload')">
|
||||
<div>{{ $t('LibraryPage.Organize') }}</div>
|
||||
</div>
|
||||
<div v-show="selectCode != 'Models'" class='header_operate_item pointer' :class="{operate_select:uploadGenerate == 'Generate'}" @click="uploadGenerateOpen('Generate')">{{ $t('LibraryPage.Generate') }}</div>
|
||||
<div v-show="selectCode != 'Models' && selectCode != 'DesignElements'" class='header_operate_item pointer' :class="{operate_select:uploadGenerate == 'Generate'}" @click="uploadGenerateOpen('Generate')">{{ $t('LibraryPage.Generate') }}</div>
|
||||
</div>
|
||||
|
||||
<div class="librart_headr_right">
|
||||
@@ -70,7 +70,7 @@
|
||||
<a-select
|
||||
ref="select"
|
||||
v-show="designTypeList[selectCode]?.[0]?.value && selectCode == 'Sketchboard' && uploadGenerate != 'Generate'"
|
||||
v-model:value="designType.value"
|
||||
v-model:value="designType"
|
||||
:options="designTypeList[selectCode]"
|
||||
@change="handleChange"
|
||||
:fieldNames="{ label: 'name', value: 'value' }"
|
||||
@@ -88,7 +88,11 @@
|
||||
|
||||
<div class="libray_right_content">
|
||||
<div class="right_content_body" v-show="uploadGenerate =='Upload'">
|
||||
<div class="content_body_header">
|
||||
<div class="content_body_header" v-show="selectCode == 'DesignElements'">
|
||||
<div style="font-size:1.5rem;">All default materials are generated by AiDA ourselves</div>
|
||||
</div>
|
||||
<!-- <div class="content_body_header"> -->
|
||||
<div class="content_body_header" v-show="selectCode != 'DesignElements'">
|
||||
<div class="content_body_header_left">
|
||||
<div class="content_body_header_right">
|
||||
<div :class="['header_operate_item' , 'fontSize','active']">
|
||||
@@ -151,7 +155,7 @@
|
||||
<div class="content_img_item" v-for="(img,index) in imgList" :key="img.id" @click="selectImgItem(img)" :draggable="true">
|
||||
<div :class="['content_img_item_block', selectImgList.indexOf(img.id) > -1 ? 'select_item_img' :'']">
|
||||
<img v-lazy="img.url" :key="img.url" :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']"/>
|
||||
<div class="img_item_hover">
|
||||
<div class="img_item_hover" v-show="selectCode != 'DesignElements'">
|
||||
<div class="img_operate_content">
|
||||
<div class="img_operate_block" :title="t('LibraryPage.Point')" @click.stop="editPlacementClick(img)" v-show="selectCode === 'Models'">
|
||||
<span class="icon iconfont icon-dianwei operate_icon"></span>
|
||||
@@ -187,7 +191,7 @@
|
||||
<div class="right_content_body" v-show="uploadGenerate !='Upload'">
|
||||
<div class="content_body_header content_body_header_generate">
|
||||
<div class="content_body_header_right"></div>
|
||||
<div v-show="selectCode == 'Printboard'" class="printModel">
|
||||
<div v-show="selectCode == 'Printboard' && scene?.value == 'Pattern'" class="printModel">
|
||||
<div @click.stop="PrintModel">{{ printModel.name }}</div>
|
||||
<ul v-show="printModel.optype">
|
||||
<li class="printModel_item" @click="setprintModel(1)">{{ $t('LibraryPage.Model1') }}</li>
|
||||
@@ -198,7 +202,7 @@
|
||||
<div class="input_border">
|
||||
<div class="input_box" :class="{active:inputShow}">
|
||||
<div class="input_box_btnBox">
|
||||
<div class="upload_item">
|
||||
<div class="upload_item" v-show="selectCode !== 'Moodboard' && (scene?.value == 'Pattern' || scene?.value == 'Slogan')">
|
||||
<div
|
||||
class="upload_file_item"
|
||||
v-for="(file, index) in selectGenerateList"
|
||||
@@ -221,6 +225,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<input class="search_seed" v-show="selectCode == 'Printboard' && scene?.value == 'Logo'" @input="ifSeedValue" v-model="searchPictureSeed" type="Number" placeholder='Seed' min="0">
|
||||
|
||||
<input
|
||||
class="search_input "
|
||||
@input="ifMaximumLength"
|
||||
@@ -248,7 +254,7 @@
|
||||
>
|
||||
</a-upload>
|
||||
</i>
|
||||
<i v-show="scene?.value == 'Slogan'" @click.stop="setSlogan" class="fi fi-rr-poll-h"></i>
|
||||
<i v-show="selectCode == 'Printboard' && scene?.value == 'Slogan'" @click.stop="setSlogan" class="fi fi-rr-poll-h"></i>
|
||||
<i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="setTextareaShow"></i>
|
||||
<i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="setTextareaShow"></i>
|
||||
</div>
|
||||
@@ -324,6 +330,8 @@
|
||||
<ModelPlacement ref="ModelPlacement" @submitModelPlacement="getLibraryList"></ModelPlacement>
|
||||
<ModelPlacementMobile ref="ModelPlacementMobile" @submitModelPlacement="getLibraryList"></ModelPlacementMobile>
|
||||
<setLabel ref="setLabel"></setLabel>
|
||||
<createSlogan ref="createSlogan" @setSloganData="setSloganData"></createSlogan>
|
||||
|
||||
<!-- 蒙层 start-->
|
||||
<div class="mark_loading" v-show="isShowMark">
|
||||
<a-spin size="large" />
|
||||
@@ -356,6 +364,7 @@ import sketchCategory from "@/component/HomePage/sketchCategory.vue";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import { ElCascader } from 'element-plus'
|
||||
import { remove } from "jszip";
|
||||
import createSlogan from "@/component/HomePage/createSlogan.vue";
|
||||
export default defineComponent({
|
||||
components: {
|
||||
// HeaderComponent,
|
||||
@@ -367,6 +376,7 @@ export default defineComponent({
|
||||
ElCascader,
|
||||
scaleImage,
|
||||
sketchCategory,
|
||||
createSlogan,
|
||||
},
|
||||
setup() {
|
||||
const store = useStore();
|
||||
@@ -377,7 +387,7 @@ export default defineComponent({
|
||||
// {title:'Sketches',code:'SketchboardFirst',icon:'fi icon iconfont icon-a-waitao_changkuanwaitao11x',showChildren:false,children:[{title:'Apparel',code:'Sketchboard'}]},
|
||||
{title:useI18n().t('LibraryPage.Sketches'),code:'Sketchboard',icon:'fi icon iconfont icon-a-waitao_changkuanwaitao11x',showChildren:false,children:[]},
|
||||
// {title:'Market Sketch',code:'Elements',icon:'icon-fuwushichang',showChildren:false,children:[]},
|
||||
{title:'Design Elements',code:'DesignElements',icon:'fi fi-rs-people',showChildren:false,children:[]},
|
||||
{title:'Design Elements',code:'DesignElements',icon:'fi fi-ss-puzzle-piece',showChildren:false,children:[]},
|
||||
{title:useI18n().t('LibraryPage.Mannequins'),code:'Models',icon:'fi fi-rs-people',showChildren:false,children:[]},
|
||||
|
||||
]
|
||||
@@ -385,6 +395,7 @@ export default defineComponent({
|
||||
let selectImgList:any = ref([])
|
||||
let selectCode:any = ref('Moodboard')
|
||||
let searchPictureName = ref('')
|
||||
let searchPictureSeed:any = ref(0);
|
||||
let designType:any = ref({
|
||||
name:'',
|
||||
value:''
|
||||
@@ -500,6 +511,7 @@ export default defineComponent({
|
||||
selectImgList,
|
||||
selectCode,
|
||||
searchPictureName,
|
||||
searchPictureSeed,
|
||||
sexList,
|
||||
sex,
|
||||
designTypeList,
|
||||
@@ -612,7 +624,7 @@ export default defineComponent({
|
||||
// params = 'MalePosition'
|
||||
// }
|
||||
this.store.commit('setPosition',this.sex.value)
|
||||
this.designType = this.designTypeList.Sketchboard[0]
|
||||
this.designType = this.designTypeList.Sketchboard[0].value
|
||||
|
||||
// await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
|
||||
// if (rv) {
|
||||
@@ -632,8 +644,10 @@ export default defineComponent({
|
||||
},
|
||||
likeFile(item:any,str:string){
|
||||
let designType = ''
|
||||
console.log(this.designType);
|
||||
|
||||
if(this.selectCode == 'Sketchboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){
|
||||
designType = this.designType.value
|
||||
designType = this.designType
|
||||
}
|
||||
if(str == 'like'){
|
||||
let data = {
|
||||
@@ -676,15 +690,12 @@ export default defineComponent({
|
||||
this.isTextarea = false
|
||||
this.value.labelValue = []
|
||||
if(this.designTypeList[this.selectCode].length >= 1){
|
||||
this.designType = this.designTypeList[this.selectCode][0]
|
||||
this.designType = this.designTypeList[this.selectCode][0].value
|
||||
}else{
|
||||
this.designType = {
|
||||
name:'',
|
||||
value:'',
|
||||
}
|
||||
this.designType = ''
|
||||
}
|
||||
if(this.selectCode == 'DesignElements')this.uploadGenerate = 'Upload'
|
||||
if(this.selectCode == 'Models')this.uploadGenerate = 'Upload'
|
||||
if(this.selectCode == 'Printboard')this.uploadGenerate = 'Upload'
|
||||
if(this.selectCode != 'DesignElements'){
|
||||
this.getClass()
|
||||
}
|
||||
@@ -699,10 +710,14 @@ export default defineComponent({
|
||||
|
||||
async sexChange(){
|
||||
await this.getPosition()
|
||||
if(this.uploadGenerate == 'Generate')return
|
||||
this.currentPage = 1
|
||||
this.getLibraryList('')
|
||||
},
|
||||
handleChange(){
|
||||
this.scene = this.designTypeList[this.selectCode].filter((item:any)=>item.value == this.designType)[0]
|
||||
this.selectGenerateList = []
|
||||
if(this.uploadGenerate == 'Generate')return
|
||||
this.currentPage = 1
|
||||
this.getLibraryList('')
|
||||
},
|
||||
@@ -746,6 +761,7 @@ export default defineComponent({
|
||||
|
||||
//选择图片
|
||||
selectImgItem(imgData:any){
|
||||
if(imgData.level2Type == "DesignElements")return
|
||||
if(this.selectImgList.indexOf(imgData.id) === -1){
|
||||
this.selectImgList.push(imgData.id)
|
||||
}else{
|
||||
@@ -772,6 +788,11 @@ export default defineComponent({
|
||||
|
||||
},
|
||||
uploadGenerateOpen(str:any){
|
||||
// if(str == 'Generate'){
|
||||
// if(this.selectCode == 'Printboard'){
|
||||
// this.scene = this.designTypeList[this.selectCode][0]
|
||||
// }
|
||||
// }
|
||||
if(this.uploadGenerate == 'Generate'){
|
||||
if(str != 'Generate'){
|
||||
this.getLibraryList('')
|
||||
@@ -902,7 +923,7 @@ export default defineComponent({
|
||||
if (!isJpgOrPng) {
|
||||
message.info(this.t('LibraryPage.jsContent3'));
|
||||
}
|
||||
const isLt2M = file.size / 1024 / 1024 < 2;
|
||||
const isLt2M = file.size / 1024 / 1024 < 5;
|
||||
if (!isLt2M) {
|
||||
message.info(this.t('LibraryPage.jsContent4'));
|
||||
}
|
||||
@@ -926,7 +947,7 @@ export default defineComponent({
|
||||
// }
|
||||
let designType = ''
|
||||
if(this.selectCode == 'Sketchboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){
|
||||
designType = this.designType.value
|
||||
designType = this.designType
|
||||
}
|
||||
let new_data = {
|
||||
file:event.file,
|
||||
@@ -997,7 +1018,7 @@ export default defineComponent({
|
||||
})
|
||||
let designType = ''
|
||||
if(this.selectCode == 'Sketchboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){
|
||||
designType = this.designType.value
|
||||
designType = this.designType
|
||||
}
|
||||
let data = {
|
||||
classificationIdList:labelArr,
|
||||
@@ -1057,6 +1078,11 @@ export default defineComponent({
|
||||
}
|
||||
this.captionGeneration += str + value
|
||||
},
|
||||
ifSeedValue(e:any){
|
||||
if(this.searchPictureSeed == ''){
|
||||
this.searchPictureSeed = 0
|
||||
}
|
||||
},
|
||||
ifMaximumLength(){
|
||||
clearTimeout(this.inputTime)
|
||||
this.inputTime = setTimeout(()=>{
|
||||
@@ -1068,6 +1094,13 @@ export default defineComponent({
|
||||
}
|
||||
},500)
|
||||
},
|
||||
setSlogan(){
|
||||
let createSlogan:any = this.$refs.createSlogan
|
||||
createSlogan.init()
|
||||
},
|
||||
setSloganData(data:any){
|
||||
this.selectGenerateList = data
|
||||
},
|
||||
inputFocus(){
|
||||
if(this.isInputFocus) return
|
||||
this.isInputFocus = true
|
||||
@@ -1147,11 +1180,12 @@ export default defineComponent({
|
||||
},
|
||||
getgenerate(){
|
||||
let selectCodeStr = JSON.parse(JSON.stringify(this.selectCode))
|
||||
clearInterval(this.remGenerateTime[selectCodeStr])
|
||||
this.remGenerate[selectCodeStr] = false
|
||||
if(this.isGenerate[selectCodeStr]){
|
||||
return
|
||||
}
|
||||
clearInterval(this.remGenerateTime[selectCodeStr])
|
||||
this.remGenerate[selectCodeStr] = false
|
||||
|
||||
let level2Type = ''
|
||||
let collectionElementId = ''
|
||||
let base64 = ''
|
||||
@@ -1162,6 +1196,8 @@ export default defineComponent({
|
||||
base64 = this.selectGenerateList[0].imgUrl
|
||||
}
|
||||
}
|
||||
console.log(this.scene);
|
||||
|
||||
if(this.selectCode == "Sketchboard"){
|
||||
console.log(this.selectGenerateList);
|
||||
}else if(this.selectCode == "Printboard"){
|
||||
@@ -1177,13 +1213,17 @@ export default defineComponent({
|
||||
userId:(this?.userInfo as any).userId,
|
||||
isTestUser:this.driver__.driver?false:this.isTest,
|
||||
text:selectCodeStr == 'Printboard'?`${arr[this.printModel.num-1]},${this.captionGeneration}`:this.captionGeneration,
|
||||
seed:this.searchPictureSeed,
|
||||
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
version:1,//为1就是Print
|
||||
gender:selectCodeStr == 'Sketchboard'?this.sex.value:'',
|
||||
base64:base64,
|
||||
sloganBase64:base64,
|
||||
}
|
||||
this.isGenerate[selectCodeStr] = true
|
||||
this.isTextarea = false
|
||||
this.remGenerateTime[selectCodeStr] = setTimeout(()=>{
|
||||
this.remGenerate[selectCodeStr] = true
|
||||
},10000)
|
||||
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
|
||||
(rv) => {
|
||||
if(data.isTestUser){
|
||||
@@ -1210,29 +1250,29 @@ export default defineComponent({
|
||||
).catch(res=>{
|
||||
// this.isShowMark = false
|
||||
this.isGenerate[selectCodeStr] = false
|
||||
clearInterval(this.remGenerateTime[selectCodeStr])
|
||||
this.remGenerate[selectCodeStr] = false
|
||||
});
|
||||
},
|
||||
setGenerate(str:any,dataList:any){
|
||||
this.remGenerateTime[str] = setTimeout(()=>{
|
||||
this.remGenerate[str] = true
|
||||
},10000)
|
||||
|
||||
let data = dataList
|
||||
let dataNum = dataList.length
|
||||
let state = true
|
||||
this.generateTime[str] = setInterval(()=>{
|
||||
// let data = this.generateList[str].filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId);
|
||||
if(!state)return
|
||||
state = false
|
||||
Https.axiosPost(Https.httpUrls.generateResult, data).then(
|
||||
(rv) => {
|
||||
state = true
|
||||
if(this.isGenerate[str]){//防止取消后有正在执行的获取状态
|
||||
this.generateProceedList = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid')
|
||||
rv.forEach((element:any) => {
|
||||
if(element.status === 'Success'){
|
||||
element.imgUrl = element.url
|
||||
this.designTypeList[this.selectCode].forEach((itemCategory:any) => {
|
||||
if(itemCategory.value == element.category){
|
||||
element.categoryValue = itemCategory?.label
|
||||
element.category = itemCategory?.value
|
||||
}
|
||||
});
|
||||
element.categoryValue = this.scene?.name
|
||||
element.category = this.scene?.value
|
||||
this.generateList[str].unshift(element)
|
||||
data = data.filter((item:any) => item !== element.taskId);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user