fix
This commit is contained in:
@@ -638,8 +638,8 @@ export default defineComponent({
|
||||
file.resData = res.data;
|
||||
this.sketchCatecoryList.forEach((item) => {
|
||||
if(item.value == res.data.level2Type){
|
||||
file.categoryValue = item?.name;
|
||||
file.category = item?.value;
|
||||
file.categoryValue = item?.value;
|
||||
file.category = item?.name;
|
||||
}
|
||||
});
|
||||
file.designType = res.data.designType
|
||||
@@ -724,8 +724,8 @@ export default defineComponent({
|
||||
},
|
||||
selectImgItem(imgData){
|
||||
let DesignDetailEnd = this.$refs.DesignDetailEnd
|
||||
imgData.categoryValue = imgData.level2TypeEnum.value
|
||||
imgData.category = imgData.level2TypeEnum.name
|
||||
imgData.categoryValue = imgData.level2TypeEnum.name
|
||||
imgData.category = imgData.level2TypeEnum.value
|
||||
if(this.selectCode == 'Sketchboard'){
|
||||
// this.current.id_ = imgData.id
|
||||
// this.current.path = imgData.url
|
||||
@@ -786,8 +786,8 @@ export default defineComponent({
|
||||
rv.content.forEach((vItem)=>{
|
||||
this.sketchCatecoryList.forEach((item) => {
|
||||
if(item.value == vItem.level2Type){
|
||||
vItem.categoryValue = item.name
|
||||
vItem.category = item.value
|
||||
vItem.categoryValue = item.value
|
||||
vItem.category = item.name
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
@@ -252,8 +252,8 @@ export default defineComponent({
|
||||
if(!item.categoryValue){
|
||||
this.designTypeList.forEach((typeItem)=>{
|
||||
if(item.level2Type == typeItem.value){
|
||||
item.categoryValue = typeItem.name
|
||||
item.category = typeItem.value
|
||||
item.categoryValue = typeItem.value
|
||||
item.category = typeItem.name
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
<a-dropdown @click.stop="setOpenType('sex')">
|
||||
<a-button>
|
||||
<UserOutlined />
|
||||
{{ workspaceItem?.sexEnum?.value }}
|
||||
{{ workspaceItem?.sexEnum?.name }}
|
||||
<!-- {{ workspaceItem.sex.label }} -->
|
||||
<DownOutlined />
|
||||
</a-button>
|
||||
@@ -50,7 +50,7 @@
|
||||
<div class="habit_model_show habit_sex_show" v-fade="openType.sex">
|
||||
<ul class="habit_model_list">
|
||||
<li v-for="item,index in sex">
|
||||
<div @click.stop="setSex(item)">{{ item.value }}</div>
|
||||
<div @click.stop="setSex(item)">{{ item.name }}</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -82,14 +82,14 @@
|
||||
<a-dropdown @click.stop="setOpenType('singleton')">
|
||||
<a-button>
|
||||
<UserOutlined />
|
||||
{{ workspaceItem?.positionEnum?.value }}
|
||||
{{ workspaceItem?.positionEnum?.name }}
|
||||
<DownOutlined />
|
||||
</a-button>
|
||||
</a-dropdown>
|
||||
<div class="habit_model_show habit_singleton_show" v-fade="openType.singleton">
|
||||
<ul class="habit_model_list">
|
||||
<li v-for="item,index in singleTypeList">
|
||||
<div @click.stop="setSingle(item)">{{ item.value }}</div>
|
||||
<div @click.stop="setSingle(item)">{{ item.name }}</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -412,6 +412,11 @@ export default defineComponent({
|
||||
async getSex(){
|
||||
await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'Sex'}}).then((rv: any) => {
|
||||
if (rv) {
|
||||
rv.forEach((item:any) => {
|
||||
let name = item.name
|
||||
item.name = item.value
|
||||
item.value = name
|
||||
});
|
||||
this.store.commit("setWorkspaceSex", rv);
|
||||
this.sex = rv
|
||||
}
|
||||
@@ -419,7 +424,7 @@ export default defineComponent({
|
||||
},
|
||||
setPosition(str:any){
|
||||
let num
|
||||
if(this.workspaceItem.sexEnum.name == 'Female'){
|
||||
if(this.workspaceItem.sexEnum.value == 'Female'){
|
||||
num = 0
|
||||
}else{
|
||||
num = 1
|
||||
@@ -428,7 +433,7 @@ export default defineComponent({
|
||||
this.store.commit("setWorkspacePosition", this.position[num].value);
|
||||
|
||||
if(str == 'sex'){
|
||||
this.workspaceItem.position = this.singleTypeList[0].name
|
||||
this.workspaceItem.position = this.singleTypeList[0].value
|
||||
this.workspaceItem.positionEnum = this.singleTypeList[0]
|
||||
}
|
||||
},
|
||||
@@ -504,38 +509,12 @@ export default defineComponent({
|
||||
}else{
|
||||
rv.overallSingle = true
|
||||
}
|
||||
// rv.allKeywordsByStyle = {
|
||||
// Moodboard:[{
|
||||
// name:'Moodboard',
|
||||
// id:1,
|
||||
// },{
|
||||
// name:'Moodboard',
|
||||
// id:2,
|
||||
// },{
|
||||
// name:'Moodboard',
|
||||
// id:3,
|
||||
// }],
|
||||
// Printboard:[{
|
||||
// name:'Printboard',
|
||||
// id:1,
|
||||
// },{
|
||||
// name:'Printboard',
|
||||
// id:2,
|
||||
// },{
|
||||
// name:'Printboard',
|
||||
// id:3,
|
||||
// }],
|
||||
// Sketchboard:[{
|
||||
// name:'Sketchboard',
|
||||
// id:1,
|
||||
// },{
|
||||
// name:'Sketchboard',
|
||||
// id:2,
|
||||
// },{
|
||||
// name:'Sketchboard',
|
||||
// id:3,
|
||||
// }],
|
||||
// }
|
||||
let positionEnumName = rv.positionEnum.name
|
||||
rv.positionEnum.name = rv.positionEnum.value
|
||||
rv.positionEnum.value = positionEnumName
|
||||
let sexEnumName = rv.sexEnum.name
|
||||
rv.sexEnum.name = rv.sexEnum.value
|
||||
rv.sexEnum.value = sexEnumName
|
||||
rv.putName = false
|
||||
this.workspaceItem = rv
|
||||
this.setMannequinsSex()
|
||||
@@ -698,7 +677,7 @@ export default defineComponent({
|
||||
setSex(v:any){
|
||||
this.workspaceItem.sexEnum = v
|
||||
this.openType.sex = false
|
||||
this.workspaceItem.sex = v.name
|
||||
this.workspaceItem.sex = v.value
|
||||
this.getMannequins()
|
||||
this.setMannequinsSex()
|
||||
this.setPosition('sex')
|
||||
@@ -716,12 +695,12 @@ export default defineComponent({
|
||||
// this.workspaceItem.mannequinType = str
|
||||
// this.workspaceItem.mannequinUrl = item.presignedUrl
|
||||
let id
|
||||
if(this.workspaceItem.sexEnum.name == 'Female'){
|
||||
if(this.workspaceItem.sexEnum.value == 'Female'){
|
||||
id = this.workspaceItem.mannequinFemaleId
|
||||
this.workspaceItem.femalePresignedUrl = item.presignedUrl
|
||||
this.workspaceItem.mannequinFemaleType = str
|
||||
this.workspaceItem.mannequinFemaleId = item.id
|
||||
}else if(this.workspaceItem.sexEnum.name == 'Male'){
|
||||
}else if(this.workspaceItem.sexEnum.value == 'Male'){
|
||||
id = this.workspaceItem.mannequinMaleId
|
||||
this.workspaceItem.malePresignedUrl = item.presignedUrl
|
||||
this.workspaceItem.mannequinMaleType = str
|
||||
@@ -745,11 +724,11 @@ export default defineComponent({
|
||||
},
|
||||
// FEMALE MALE
|
||||
setMannequinsSex(){
|
||||
if(this.workspaceItem.sexEnum.name == 'Female'){
|
||||
if(this.workspaceItem.sexEnum.value == 'Female'){
|
||||
this.workspaceItem.mannequinUrl = this.workspaceItem.femalePresignedUrl
|
||||
this.workspaceItem.mannequinType = this.workspaceItem.mannequinFemaleType
|
||||
this.workspaceItem.mannequinId = this.workspaceItem.mannequinFemaleId
|
||||
}else if(this.workspaceItem.sexEnum.name == 'Male'){
|
||||
}else if(this.workspaceItem.sexEnum.value == 'Male'){
|
||||
this.workspaceItem.mannequinUrl = this.workspaceItem.malePresignedUrl
|
||||
this.workspaceItem.mannequinType = this.workspaceItem.mannequinMaleType
|
||||
this.workspaceItem.mannequinId = this.workspaceItem.mannequinMaleId
|
||||
|
||||
@@ -152,7 +152,8 @@ setup(props,{emit}) {
|
||||
habitSetStyleData.selectStyle.name = ''
|
||||
}
|
||||
let setItemSelect = (item:any)=>{
|
||||
habitSetStyleData.selectStyle = item
|
||||
habitSetStyleData.selectStyle.name = item.name
|
||||
habitSetStyleData.selectStyle.id = item.id
|
||||
}
|
||||
return {
|
||||
habitSetStyle,
|
||||
|
||||
@@ -456,7 +456,7 @@ export default defineComponent({
|
||||
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
version:1,//为1就是Print
|
||||
isTestUser:this.driver__.driver?false:this.isTest,
|
||||
gender:this.workspace.sexEnum.name,
|
||||
gender:this.workspace.sexEnum.value,
|
||||
sloganBase64:base64,
|
||||
}
|
||||
this.isGenerate = true
|
||||
@@ -510,15 +510,15 @@ export default defineComponent({
|
||||
data = data.filter((item:any) => item !== element.taskId);
|
||||
if(this.type_.type2 == 'Sketchboard'){
|
||||
this.sketchCatecoryList.forEach((itemCategory:any) => {
|
||||
if(itemCategory.value == element.category){
|
||||
if(itemCategory.value == element.categoryValue){
|
||||
console.log(element,itemCategory);
|
||||
element.categoryValue = itemCategory?.name
|
||||
element.category = itemCategory?.value
|
||||
element.categoryValue = itemCategory?.value
|
||||
element.category = itemCategory?.name
|
||||
}
|
||||
});
|
||||
}else{
|
||||
element.categoryValue = this.scene?.name
|
||||
element.category = this.scene?.value
|
||||
element.categoryValue = this.scene?.value
|
||||
element.category = this.scene?.name
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -689,7 +689,7 @@ export default defineComponent({
|
||||
if(str == 'like'){
|
||||
let level2Type = ''
|
||||
if(this.upload.level1Type == "Sketchboard"){
|
||||
level2Type = item.category
|
||||
level2Type = item.categoryValue
|
||||
}else if(this.upload.level1Type == "Printboard"){
|
||||
level2Type = this.scene?.value
|
||||
}
|
||||
@@ -697,7 +697,7 @@ export default defineComponent({
|
||||
generateDetailId:item.id,
|
||||
level1Type:this.type_.type2,
|
||||
level2Type: level2Type,
|
||||
gender:this.workspace.sexEnum.name,
|
||||
gender:this.workspace.sexEnum.value,
|
||||
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.generateLike, data).then(
|
||||
|
||||
@@ -278,8 +278,8 @@ export default defineComponent({
|
||||
selectImgItem(imgData:any){
|
||||
let parent:any = this.$parent
|
||||
if(this.selectCode != 'Moodboard'){
|
||||
imgData.categoryValue = imgData.level2TypeEnum.value
|
||||
imgData.category = imgData.level2TypeEnum.name
|
||||
imgData.categoryValue = imgData.level2TypeEnum.name
|
||||
imgData.category = imgData.level2TypeEnum.value
|
||||
}
|
||||
if(parent.isUseGenerate){
|
||||
this.setUseGenerate([])
|
||||
@@ -326,7 +326,7 @@ export default defineComponent({
|
||||
//选择所有的图片
|
||||
async getLibraryList(str:any){
|
||||
let workspace = JSON.parse(JSON.stringify(this.store.state.Workspace.workspace))
|
||||
if(this.searchPictureName != this.isOldSearchPictureName || this.workspace?.sex != workspace.sex){
|
||||
if(this.searchPictureName != this.isOldSearchPictureName || this.workspace?.sexEnum?.value != workspace.sexEnum.value){
|
||||
this.imgList = []
|
||||
this.currentPage = 1
|
||||
}else{
|
||||
@@ -338,7 +338,7 @@ export default defineComponent({
|
||||
let data = {
|
||||
level1Type:this.selectCode,
|
||||
level2Type: this.selectCode == 'Moodboard'?'':this.disignType,
|
||||
modelSex:workspace?.sex,
|
||||
modelSex:workspace?.sexEnum.value,
|
||||
page: this.currentPage,
|
||||
// page:this.currentPage,
|
||||
pictureName:this.searchPictureName,
|
||||
@@ -355,8 +355,8 @@ export default defineComponent({
|
||||
let arr
|
||||
if(this.type_.type2 == 'Sketchboard'){
|
||||
arr = this.store.state.UploadFilesModule.sketchMaterialFiles
|
||||
item.categoryValue = item.level2TypeEnum.value;
|
||||
item.category = item.level2Type;
|
||||
item.categoryValue = item.level2TypeEnum.name;
|
||||
item.category = item.level2TypeEnum.value;
|
||||
item.categoryShow = false;
|
||||
}else if(this.type_.type2 == 'Moodboard'){
|
||||
arr = this.store.state.UploadFilesModule.moodboardMaterialFiles
|
||||
|
||||
@@ -399,7 +399,7 @@ export default defineComponent({
|
||||
generateDetailId:item.id,
|
||||
level1Type:"Printboard",
|
||||
level2Type: '',
|
||||
gender:this.workspace.sexEnum.name,
|
||||
gender:this.workspace.sexEnum.value,
|
||||
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.generateLike, data).then(
|
||||
@@ -438,8 +438,8 @@ export default defineComponent({
|
||||
file.imgUrl = rv.url
|
||||
file.pin = false
|
||||
file.id = rv.id
|
||||
file.category = this.printCatecoryList[0].value
|
||||
file.categoryValue = this.printCatecoryList[0].name
|
||||
file.category = this.printCatecoryList[0].name
|
||||
file.categoryValue = this.printCatecoryList[0].value
|
||||
file.resData = rv
|
||||
|
||||
}
|
||||
@@ -513,8 +513,8 @@ export default defineComponent({
|
||||
file.imgUrl = rv.url
|
||||
file.id = rv.id
|
||||
file.resData = rv
|
||||
file.category = this.printCatecoryList[0].value
|
||||
file.categoryValue = this.printCatecoryList[0].name
|
||||
file.category = this.printCatecoryList[0].name
|
||||
file.categoryValue = this.printCatecoryList[0].value
|
||||
}
|
||||
}
|
||||
let fileList = this.fileList.filter((v:any)=> v.status === 'done')
|
||||
@@ -564,8 +564,8 @@ export default defineComponent({
|
||||
v.pin = v.pin == 1?true:false
|
||||
this.printCatecoryList.forEach((item:any) => {
|
||||
if(v.level2Type == item.value){
|
||||
v.category=item.value
|
||||
v.categoryValue=item.name
|
||||
v.category=item.name
|
||||
v.categoryValue=item.value
|
||||
}
|
||||
});
|
||||
if(v.type_.type1 == 'generate'){
|
||||
|
||||
@@ -280,7 +280,7 @@ export default defineComponent({
|
||||
"user_id" : this.userInfo?.userId,
|
||||
"session_id":sessionId,
|
||||
"message" : this.chatCentent,
|
||||
gender:this.workspace.sexEnum.name,
|
||||
gender:this.workspace.sexEnum.value,
|
||||
}
|
||||
let interaction = {onDownloadProgress: (progressEvent:any) => {
|
||||
this.clearTimer()
|
||||
|
||||
@@ -294,7 +294,7 @@ export default defineComponent({
|
||||
watch:{
|
||||
workspaceCom(newVal,oldVal){
|
||||
this.workspace = newVal
|
||||
this.upload.gender = newVal?.sexEnum?.name
|
||||
this.upload.gender = newVal?.sexEnum?.value
|
||||
},
|
||||
sketchboardList:{
|
||||
handler(newVal:any,oldVal:any){
|
||||
@@ -388,8 +388,8 @@ export default defineComponent({
|
||||
file.resData = res.data;
|
||||
// file.pin = false;
|
||||
//category用来数据处理
|
||||
file.categoryValue = category?.name;
|
||||
file.category = category?.value;
|
||||
file.categoryValue = category?.value;
|
||||
file.category = category?.name;
|
||||
file.categoryShow = false;
|
||||
file.id_ = GO.id++
|
||||
file.id = res.data.id
|
||||
@@ -485,8 +485,8 @@ export default defineComponent({
|
||||
v.pin = v.pin == 1?true:false
|
||||
this.sketchCatecoryList.forEach((item:any) => {
|
||||
if(v.level2Type == item.value){
|
||||
v.category=item.value
|
||||
v.categoryValue=item.name
|
||||
v.category=item.name
|
||||
v.categoryValue=item.value
|
||||
}
|
||||
});
|
||||
if(v.type_.type1 == 'generate'){
|
||||
|
||||
@@ -234,7 +234,7 @@ export default defineComponent({
|
||||
let numBottom = 0
|
||||
let top:any
|
||||
let bottom:any
|
||||
if(this.workspace.sexEnum.name == "Female"){
|
||||
if(this.workspace.sexEnum.value == "Female"){
|
||||
top = ['Outwear','Dress','Blouse']
|
||||
bottom = ['Trousers','Skirt']
|
||||
}else{
|
||||
@@ -246,8 +246,8 @@ export default defineComponent({
|
||||
this.position.forEach((item:any) => {
|
||||
let topBor
|
||||
let botBor
|
||||
topBor = top.includes(item.name)
|
||||
botBor = bottom.includes(item.name)
|
||||
topBor = top.includes(item.value)
|
||||
botBor = bottom.includes(item.value)
|
||||
if(topBor){
|
||||
topStr.push(item.value)
|
||||
}
|
||||
@@ -257,12 +257,12 @@ export default defineComponent({
|
||||
});
|
||||
list.forEach((item:any,index:number) => {
|
||||
top.forEach((positionItem:any) => {
|
||||
if(item.category == positionItem && item.pin){
|
||||
if(item.categoryValue == positionItem && item.pin){
|
||||
numTop++
|
||||
}
|
||||
});
|
||||
bottom.forEach((positionItem:any) => {
|
||||
if(item.category == positionItem && item.pin){
|
||||
if(item.categoryValue == positionItem && item.pin){
|
||||
numBottom++
|
||||
}
|
||||
});
|
||||
@@ -287,17 +287,14 @@ export default defineComponent({
|
||||
},
|
||||
//完成
|
||||
async finishCollection(){
|
||||
console.log(123123);
|
||||
|
||||
this.isShowMark = true
|
||||
let sketchList = this.store.state.UploadFilesModule.sketchboard
|
||||
let arr:any = []
|
||||
console.log(sketchList);
|
||||
sketchList.forEach((item:any) => {
|
||||
let obj = {
|
||||
designType:item.resData.designType,
|
||||
isPin:item.pin ? 1 : 0,
|
||||
level2Type:item.category,
|
||||
level2Type:item.categoryValue,
|
||||
sketchBoardId:item.id?item.id:item.resData.id
|
||||
}
|
||||
arr.push(obj)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
:class="driverClass.class1"
|
||||
@click.stop="showFileCategory(item)"
|
||||
>
|
||||
{{ item.categoryValue }}
|
||||
{{ item.category }}
|
||||
<div
|
||||
:class="[
|
||||
'icon',
|
||||
@@ -26,7 +26,7 @@
|
||||
<div
|
||||
:class="[
|
||||
'category_item',
|
||||
item.category == cate.value
|
||||
item.categoryValue == cate.value
|
||||
? 'select_category_item'
|
||||
: '',
|
||||
]"
|
||||
@@ -99,8 +99,8 @@
|
||||
for (let item of props.generateList) {
|
||||
item.categoryShow = false;
|
||||
}
|
||||
file.categoryValue = cate.name;
|
||||
file.category = cate.value;
|
||||
file.categoryValue = cate.value;
|
||||
file.category = cate.name;
|
||||
if(props.isSetSketchCategory){
|
||||
setSketchLibrary(props.item)
|
||||
}
|
||||
@@ -113,7 +113,7 @@
|
||||
let setSketchLibrary = (item:any)=>{
|
||||
let data = {
|
||||
libraryId:[item.id],
|
||||
level2Type:item.category,
|
||||
level2Type:item.categoryValue,
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.setSketchLibrary,data).then(
|
||||
(rv: any) => {
|
||||
|
||||
@@ -23,15 +23,40 @@
|
||||
</div>
|
||||
<div class="productImg_content_bottom">
|
||||
<div class="productImg_left">
|
||||
<div class="productImg_content_item_title productImg_content_item_title_menu">
|
||||
<span>{{$t('ProductImg.MagicTools')}}</span>
|
||||
<generalMenu class="productImg_content_item_title_menubtn" :dataList="productimgMenuList" @setprintModel="setproduct" :item="productimgMenu"></generalMenu>
|
||||
</div>
|
||||
<div class="input_border productImg_content_item_generate">
|
||||
<div class="input_box">
|
||||
<div class="input_box_btnBox">
|
||||
<input
|
||||
class="search_input"
|
||||
:placeholder="$t('Generate.inputContent1')"
|
||||
v-model="searchName"
|
||||
@keydown.enter="getPrductimg()"
|
||||
/>
|
||||
<i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="()=>isTextarea = !isTextarea"></i>
|
||||
<i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="()=>isTextarea = !isTextarea"></i>
|
||||
</div>
|
||||
<textarea
|
||||
v-show="isTextarea"
|
||||
class="search_textarea "
|
||||
@keydown.enter="getPrductimg()"
|
||||
v-model="searchName"
|
||||
></textarea>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="productImg_content_item_title">{{$t('ProductImg.SelectCollection')}}</div>
|
||||
<div class="productImg_content_item_imgBox generalScroll" v-mousewheel>
|
||||
<div class="content_item_imgBox_itemImg" v-for="item in likeDesignCollectionList" :key="item.id" >
|
||||
<div class="content_item_imgBox_itemImg" v-for="item in selectList[productimgMenu.value]" :key="item.id" >
|
||||
<img @click="setGenerate(item)" v-lazy="item.designOutfitUrl" alt="" :class="{active:item.isChecked}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="productImg_content_item_title">{{$t('ProductImg.Upload')}}</div>
|
||||
<div class="productImg_content_item_imgBox generalScroll upload_item" v-mousewheel>
|
||||
<div class="upload_file_item" v-for="(file, index) in fileList" :key="file">
|
||||
<div class="upload_file_item" v-for="(file, index) in fileList[productimgMenu.value]" :key="file">
|
||||
<div class="upload_file_item_content" v-show="file?.status === 'uploading'" >
|
||||
<a-spin
|
||||
:indicator="indicator"
|
||||
@@ -60,7 +85,7 @@
|
||||
}"
|
||||
:headers="{ Authorization: token }"
|
||||
:before-upload="beforeUpload"
|
||||
v-model:file-list="fileList"
|
||||
v-model:file-list="fileList[productimgMenu.value]"
|
||||
:multiple="true"
|
||||
:maxCount="8"
|
||||
accept=".jpg,.png,.jpeg,.bmp"
|
||||
@@ -76,28 +101,8 @@
|
||||
</a-upload>
|
||||
</div>
|
||||
</div>
|
||||
<div class="productImg_content_item_title productImg_content_item_title_menu">
|
||||
<span>{{$t('ProductImg.MagicTools')}}</span>
|
||||
<generalMenu class="productImg_content_item_title_menubtn" :dataList="productimgMenuList" @setprintModel="setproduct" :item="productimgMenu"></generalMenu>
|
||||
</div>
|
||||
<div class="input_border productImg_content_item_generate">
|
||||
<div class="productImg_content_item_generate_btn input_border">
|
||||
<div class="input_box">
|
||||
<div class="input_box_btnBox">
|
||||
<input
|
||||
class="search_input"
|
||||
:placeholder="$t('Generate.inputContent1')"
|
||||
v-model="searchName"
|
||||
@keydown.enter="getPrductimg()"
|
||||
/>
|
||||
<i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="()=>isTextarea = !isTextarea"></i>
|
||||
<i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="()=>isTextarea = !isTextarea"></i>
|
||||
</div>
|
||||
<textarea
|
||||
v-show="isTextarea"
|
||||
class="search_textarea "
|
||||
@keydown.enter="getPrductimg()"
|
||||
v-model="searchName"
|
||||
></textarea>
|
||||
<div v-show="!isProductimg" class="generage_btn started_btn" @click.stop="getPrductimg">
|
||||
{{ $t('Generate.Generate') }}
|
||||
</div>
|
||||
@@ -108,6 +113,7 @@
|
||||
{{$t('Generate.Close')}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="input_clear started_btn">清空</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="productImg_right">
|
||||
@@ -181,7 +187,7 @@ export default defineComponent({
|
||||
let productImgData:any = reactive({
|
||||
isShowMark:false,
|
||||
beenPublished:0,
|
||||
fileList:[],
|
||||
fileList:{},
|
||||
searchName:'',
|
||||
isTextarea:false,//是否展开
|
||||
remProductimg:false,//是否出现取消按钮
|
||||
@@ -198,10 +204,14 @@ export default defineComponent({
|
||||
{
|
||||
value:'ProductImage',
|
||||
label:useI18n().t('ProductImg.ProductImage')
|
||||
},{
|
||||
value:'ProductImage1',
|
||||
label:'123123'
|
||||
}
|
||||
])
|
||||
let productimgMenu = ref(productimgMenuList.value[0])
|
||||
let productimgMenu:any = ref(productimgMenuList.value[0])
|
||||
let ExportModel = ref()
|
||||
let selectList:any = ref({})
|
||||
let likeDesignCollectionList: any = computed(() => {
|
||||
return store.state.HomeStoreModule.likeDesignCollectionList;
|
||||
});
|
||||
@@ -209,6 +219,7 @@ export default defineComponent({
|
||||
let init = (userGroupId:any,beenPublished:any)=>{
|
||||
productImg.value = true
|
||||
productImgData.beenPublished = beenPublished
|
||||
selectList.value['ProductImage'] = JSON.parse(JSON.stringify(likeDesignCollectionList.value))
|
||||
upload.value = {
|
||||
userlikeGroupId:userGroupId
|
||||
}
|
||||
@@ -261,7 +272,7 @@ export default defineComponent({
|
||||
file.id = res.data.id
|
||||
file.isChecked = true
|
||||
file.type = 'ProductElement'
|
||||
productImgData.fileList.filter((v: any) => v.status === "done");
|
||||
productImgData.fileList[productimgMenu.value.value].filter((v: any) => v.status === "done");
|
||||
}else{
|
||||
bor = false
|
||||
}
|
||||
@@ -286,7 +297,7 @@ export default defineComponent({
|
||||
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
|
||||
}
|
||||
let deleteFile = (index:any)=>{
|
||||
productImgData.fileList.splice(index,1)
|
||||
productImgData.fileList[productimgMenu.value.value].splice(index,1)
|
||||
}
|
||||
let setGenerate = (item:any)=>{
|
||||
item.isChecked = !item.isChecked
|
||||
@@ -342,14 +353,14 @@ export default defineComponent({
|
||||
"toProductImageRecordId": 0,
|
||||
"url": ""
|
||||
}
|
||||
productImgData.fileList.forEach((item:any)=>{
|
||||
productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
|
||||
if(item.isChecked){
|
||||
obj.elementId = item.id
|
||||
obj.elementType = item.type
|
||||
selectArr.push(JSON.parse(JSON.stringify(obj)))
|
||||
}
|
||||
})
|
||||
likeDesignCollectionList.value.forEach((item:any)=>{
|
||||
selectList.value[productimgMenu.value.value].forEach((item:any)=>{
|
||||
if(item.isChecked){
|
||||
obj.elementId = item.designOutfitId
|
||||
obj.elementType = 'DesignOutfit'
|
||||
@@ -460,6 +471,7 @@ export default defineComponent({
|
||||
...toRefs(productImgData),
|
||||
productimgMenuList,
|
||||
productimgMenu,
|
||||
selectList,
|
||||
likeDesignCollectionList,
|
||||
ExportModel,
|
||||
init,
|
||||
@@ -633,6 +645,7 @@ export default defineComponent({
|
||||
}
|
||||
.productImg_left{
|
||||
width: 25%;
|
||||
position: relative;
|
||||
.upload_file_item{
|
||||
display: flex;
|
||||
margin-right: 1rem;
|
||||
@@ -651,7 +664,20 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
.productImg_content_item_generate{
|
||||
--width:60%;
|
||||
--width:100%;
|
||||
}
|
||||
.productImg_content_item_generate_btn{
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
top: auto;
|
||||
width: 100%;
|
||||
justify-content: space-around;
|
||||
.input_box{
|
||||
flex: 0;
|
||||
.generage_btn{
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.productImg_right{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
:class="driverClass.class1"
|
||||
@click.stop="showFileCategory(item)"
|
||||
>
|
||||
{{ item.categoryValue }}
|
||||
{{ item.category }}
|
||||
<div
|
||||
v-show="!isSpread"
|
||||
:class="[
|
||||
@@ -28,7 +28,7 @@
|
||||
<div
|
||||
:class="[
|
||||
'category_item',
|
||||
item.category == cate.value
|
||||
item.categoryValue == cate.value
|
||||
? 'select_category_item'
|
||||
: '',
|
||||
]"
|
||||
@@ -108,8 +108,8 @@ export default defineComponent({
|
||||
for (let item of props.generateList) {
|
||||
item.categoryShow = false;
|
||||
}
|
||||
file.categoryValue = cate.name;
|
||||
file.category = cate.value;
|
||||
file.categoryValue = cate.value;
|
||||
file.category = cate.name;
|
||||
if(props.isSetSketchCategory){
|
||||
setSketchLibrary(props.item)
|
||||
}
|
||||
@@ -123,7 +123,7 @@ export default defineComponent({
|
||||
|
||||
let data = {
|
||||
libraryId:[item.id],
|
||||
level2Type:item.category,
|
||||
level2Type:item.categoryValue,
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.setSketchLibrary,data).then(
|
||||
(rv: any) => {
|
||||
|
||||
@@ -58,6 +58,7 @@
|
||||
ref="select"
|
||||
v-model:value="editDesignType"
|
||||
:options="disignTypeList"
|
||||
:fieldNames="{ label: 'name', value: 'value' }"
|
||||
>
|
||||
<template #suffixIcon>
|
||||
<!-- <span
|
||||
@@ -235,13 +236,13 @@ export default defineComponent({
|
||||
let arr:any = []
|
||||
rv.forEach((item:any) => {
|
||||
arr.push({
|
||||
value:item.name,
|
||||
label:item.value,
|
||||
name:item.name,
|
||||
value:item.value,
|
||||
})
|
||||
});
|
||||
this.designType = arr[0]
|
||||
this.editDesignType = arr[0]
|
||||
this.disignTypeList = arr
|
||||
this.designType = rv[0]
|
||||
this.editDesignType = rv[0]
|
||||
this.disignTypeList = rv
|
||||
// this.workspaceItem.position = this.singleTypeList[0].label
|
||||
}
|
||||
})
|
||||
|
||||
@@ -35,9 +35,9 @@
|
||||
</div>
|
||||
<div class="newScaleImage_right">
|
||||
<div class="newScaleImage_right_content">
|
||||
<div class="newScaleImage_right_content_type">
|
||||
<!-- <div class="newScaleImage_right_content_type">
|
||||
<div class="generate_item_title_left scaleImage_chunk_title">{{$t('newScaleImage.Type')}}:{{ scaleImageData?.portfolioType=='History'? 'Collection' : 'Printboard' }}</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div v-if="true" class="newScaleImage_right_content_collection">
|
||||
<div class="scaleImage_chunk_item content_left_collection_detail">
|
||||
<!-- <div class="scaleImage_chunk_title">设计模式:</div>
|
||||
@@ -48,7 +48,7 @@
|
||||
<div class="scaleImage_chunk_title_intro">{{scaleImageData.portfolioDes}}</div>
|
||||
</div>
|
||||
<div class="scaleImage_chunk_item content_left_collection_content">
|
||||
<div class="scaleImage_chunk_title">Finished Products</div>
|
||||
<div class="scaleImage_chunk_title">{{scaleImageData.Collection}}</div>
|
||||
<div class="content_left_collection_content_list">
|
||||
<img v-for="item in scaleImageData?.designPythonOutfitList" v-lazy="item.designUrl">
|
||||
</div>
|
||||
@@ -146,10 +146,10 @@
|
||||
</div>
|
||||
<div class="newScaleImage_right_comment scaleImage_chunk_item">
|
||||
<div class="scaleImage_chunk_title">{{$t('newScaleImage.Comment')}}</div>
|
||||
<div v-show="commentList.length === 0" class="newScaleImage_right_comment_null">
|
||||
<!-- <div v-show="commentList.length === 0" class="newScaleImage_right_comment_null">
|
||||
<div class="scaleImage_chunk_title">{{$t('newScaleImage.NoComments')}}</div>
|
||||
<div class="scaleImage_chunk_title">{{$t('newScaleImage.first')}}</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div v-show="commentList.length !== 0" class="newScaleImage_right_comment_content">
|
||||
<div class="detail_left_content_item" v-for="item in commentList" :key="item.id">
|
||||
<!-- <div class="detail_left_content_item_img">
|
||||
@@ -170,6 +170,7 @@
|
||||
<span>123</span>
|
||||
</div> -->
|
||||
<div class="left_content_item_btn">
|
||||
{{userInfo.userName }}{{item.userName}}
|
||||
<div class="left_content_item_delete" v-if="userInfo.userName === item.userName" @click="setDelete(item)">删除</div>
|
||||
<div class="left_content_item_unfold" @click="()=>item.detailUnfold = !item.detailUnfold">{{item.detailUnfold?$t('newScaleImage.Collapse'):$t('newScaleImage.unfold')}}</div>
|
||||
</div>
|
||||
@@ -243,7 +244,6 @@ export default defineComponent({
|
||||
setup() {
|
||||
let {t} = useI18n()
|
||||
//首先在setup中定义
|
||||
console.log(getCookie('userInfo'));
|
||||
let userInfo = ref({});
|
||||
const store = useStore();
|
||||
const router = useRouter()
|
||||
@@ -441,7 +441,14 @@ export default defineComponent({
|
||||
}
|
||||
Https.axiosGet(url, {params:data})
|
||||
.then((rv) => {
|
||||
getDetail(getDeatilData,'zan')
|
||||
if(imgData.scaleImageData.isLike == 1){
|
||||
imgData.scaleImageData.likeNum -= 1
|
||||
imgData.scaleImageData.isLike = 0
|
||||
}else{
|
||||
imgData.scaleImageData.likeNum += 1
|
||||
imgData.scaleImageData.isLike = 1
|
||||
}
|
||||
// getDetail(getDeatilData,'zan')
|
||||
})
|
||||
.catch((rv) => {
|
||||
});
|
||||
@@ -833,7 +840,6 @@ export default defineComponent({
|
||||
flex-direction: column;
|
||||
padding-bottom: 0;
|
||||
>.scaleImage_chunk_title{
|
||||
text-align: center;
|
||||
}
|
||||
.newScaleImage_right_comment_null,.newScaleImage_right_comment_content{
|
||||
flex: 1;
|
||||
@@ -843,9 +849,9 @@ export default defineComponent({
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
.scaleImage_chunk_title{
|
||||
font-size: 3rem;
|
||||
}
|
||||
// .scaleImage_chunk_title{
|
||||
// font-size: 3rem;
|
||||
// }
|
||||
|
||||
}
|
||||
.newScaleImage_right_comment_content{
|
||||
@@ -958,7 +964,7 @@ export default defineComponent({
|
||||
align-items: center;
|
||||
height: 8rem;
|
||||
justify-content: center;
|
||||
margin-top: 5rem;
|
||||
margin-top: 3rem;
|
||||
position: sticky;
|
||||
z-index: 2;
|
||||
padding-bottom: var(--padding);
|
||||
|
||||
Reference in New Issue
Block a user