This commit is contained in:
X1627315083
2024-06-24 09:47:59 +08:00
parent 8b0af784de
commit a5ac4a341f
20 changed files with 160 additions and 761 deletions

View File

@@ -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
}
});
})

View File

@@ -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
}
})

View File

@@ -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

View File

@@ -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,