aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2023-11-23-2

Browse Source
This commit is contained in:
X1627315083
2023-11-23 14:05:35 +08:00
parent 25c0a80bb4
commit 2e2fe56e1c
10 changed files with 76 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/assets/style/style.css
View File

@@ -388,6 +388,9 @@ li {
.ant-modal-wrap { .ant-modal-wrap {
z-index: 10001; z-index: 10001;
} }
.ant-select-dropdown {
z-index: 10001;
}
.habit :deep(.ant-btn:hover), .habit :deep(.ant-btn:hover),
:deep(.ant-btn:focus), :deep(.ant-btn:focus),
:deep(.ant-btn:active), :deep(.ant-btn:active),

3
src/assets/style/style.less
View File

@@ -445,6 +445,9 @@ ul,li{
.ant-modal-wrap{ .ant-modal-wrap{
z-index: 10001; z-index: 10001;
} }
.ant-select-dropdown{
z-index: 10001;
}
//提示框样式 //提示框样式
.ant-modal-root{ .ant-modal-root{
.ant-modal-wrap{ .ant-modal-wrap{

48
src/component/Detail/DesignDetailAlter.vue
View File

@@ -136,7 +136,7 @@
:key="index" :key="index"
@click.stop="selectFileCategory(file, cate)" @click.stop="selectFileCategory(file, cate)"
> >
{{ cate.label }} {{ cate.value }}
</div> </div>
</div> </div>
</div> </div>
@@ -280,26 +280,7 @@ export default defineComponent({
let searchPictureName = ref('') let searchPictureName = ref('')
//模型印花 //模型印花
let disignTypeList = [ let disignTypeList = [
{
value: "Outwear",
label: "Outwear",
},
{
value: "Blouse",
label: "Blouse",
},
{
value: "Dress",
label: "Dress",
},
{
value: "Trousers",
label: "Trousers",
},
{
value: "Skirt",
label: "Skirt",
},
] ]
let total = ref(0) let total = ref(0)
let pageSize = ref(10) let pageSize = ref(10)
@@ -413,7 +394,7 @@ export default defineComponent({
let lable = ""; let lable = "";
for (let item of this.disignTypeList) { for (let item of this.disignTypeList) {
if (item.value === value) { if (item.value === value) {
lable = item.label; value = item.value;
break; break;
} }
} }
@@ -521,22 +502,23 @@ export default defineComponent({
}, },
getPosition(){ getPosition(){
let params let params
if(this.workspace.sex == 'Female'){ if(this.workspace.sexEnum.name == 'Female'){
params = 'FemalePosition' params = 'FemalePosition'
}else{ }else{
params = 'MalePosition' params = 'MalePosition'
} }
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv) => { Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv) => {
if (rv) { if (rv) {
let arr = [] // let arr = []
rv.forEach((item) => { // rv.forEach((item) => {
let obj = { // let obj = {
value:item.name, // value:item.value,
label:item.name, // name:item.name,
} // key:item.key,
arr.push(obj) // }
}); // arr.push(obj)
this.disignTypeList = arr // });
this.disignTypeList = rv
} }
}) })
}, },
@@ -612,7 +594,7 @@ export default defineComponent({
document.addEventListener("click", this.hiddenFileCategory); document.addEventListener("click", this.hiddenFileCategory);
}, },
selectFileCategory(file, cate) { selectFileCategory(file, cate) {
file.level2Type = cate.value; file.level2Type = cate.name;
for (let item of this.clothesList) { for (let item of this.clothesList) {
item.categoryShow = false; item.categoryShow = false;
} }

25
src/component/Detail/habit.vue
View File

@@ -332,39 +332,22 @@ export default defineComponent({
async getSex(){ async getSex(){
await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'Sex'}}).then((rv: any) => { await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'Sex'}}).then((rv: any) => {
if (rv) { if (rv) {
let arr:any = []
rv.forEach((item:any) => { this.sex = rv
let obj = {
value:item.value,
name:item.name,
key:item.key,
}
arr.push(obj)
});
this.sex = arr
} }
}) })
this.getPosition('') this.getPosition('')
}, },
async getPosition(str:any){ async getPosition(str:any){
let params let params
if(this.workspaceItem.sex == 'Female'){ if(this.workspaceItem.sexEnum.name == 'Female'){
params = 'FemalePosition' params = 'FemalePosition'
}else{ }else{
params = 'MalePosition' params = 'MalePosition'
} }
await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => { await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
if (rv) { if (rv) {
let arr:any = [] this.singleTypeList = rv
rv.forEach((item:any) => {
let obj = {
value:item.value,
name:item.name,
key:item.key,
}
arr.push(obj)
});
this.singleTypeList = arr
if(str == 'sex'){ if(str == 'sex'){
this.workspaceItem.position = this.singleTypeList[0].name this.workspaceItem.position = this.singleTypeList[0].name
this.workspaceItem.positionEnum = this.singleTypeList[0] this.workspaceItem.positionEnum = this.singleTypeList[0]

10
src/component/HomePage/Material.vue
View File

@@ -27,7 +27,7 @@
class="select_category" class="select_category"
@click.stop="showFileCategory(item)" @click.stop="showFileCategory(item)"
> >
{{ item?.category }} {{ item?.categoryValue }}
<div <div
:class="[ :class="[
'icon', 'icon',
@@ -46,7 +46,7 @@
<div <div
:class="[ :class="[
'category_item', 'category_item',
item?.category == cate.value item?.category == cate.name
? 'select_category_item' ? 'select_category_item'
: '', : '',
]" ]"
@@ -56,7 +56,7 @@
:key="index" :key="index"
@click.stop="selectFileCategory(item, cate)" @click.stop="selectFileCategory(item, cate)"
> >
{{ cate.label }} {{ cate.value }}
</div> </div>
</div> </div>
</div> </div>
@@ -299,6 +299,7 @@ export default defineComponent({
let arr let arr
if(this.type_.type2 == 'Sketchboard'){ if(this.type_.type2 == 'Sketchboard'){
arr = this.store.state.UploadFilesModule.sketchMaterialFiles arr = this.store.state.UploadFilesModule.sketchMaterialFiles
item.categoryValue = item.level2Type;
item.category = item.level2Type; item.category = item.level2Type;
item.categoryShow = false; item.categoryShow = false;
}else if(this.type_.type2 == 'Moodboard'){ }else if(this.type_.type2 == 'Moodboard'){
@@ -348,7 +349,8 @@ export default defineComponent({
document.addEventListener("click", this.hiddenFileCategory); document.addEventListener("click", this.hiddenFileCategory);
}, },
selectFileCategory(file: any, cate: any) { selectFileCategory(file: any, cate: any) {
file.category = cate.value; file.categoryValue = cate.value;
file.category = cate.name;
for (let item of (this.imgList as any)) { for (let item of (this.imgList as any)) {
item.categoryShow = false; item.categoryShow = false;
} }

35
src/component/HomePage/SketchboardUpload.vue
View File

@@ -52,7 +52,7 @@
class="select_category" class="select_category"
@click.stop="showFileCategory(file)" @click.stop="showFileCategory(file)"
> >
{{ file.category }} {{ file.categoryValue }}
<div <div
:class="[ :class="[
'icon', 'icon',
@@ -86,7 +86,7 @@
) )
" "
> >
{{ cate.label }} {{ cate.value }}
</div> </div>
</div> </div>
</div> </div>
@@ -189,7 +189,7 @@
class="select_category" class="select_category"
@click.stop="showFileCategory(item)" @click.stop="showFileCategory(item)"
> >
{{ item.category }} {{ item.categoryValue }}
<div <div
:class="[ :class="[
'icon', 'icon',
@@ -209,7 +209,7 @@
<div <div
:class="[ :class="[
'category_item', 'category_item',
item.category == cate.value item.category == cate.name
? 'select_category_item' ? 'select_category_item'
: '', : '',
]" ]"
@@ -224,7 +224,7 @@
) )
" "
> >
{{ cate.label }} {{ cate.value }}
</div> </div>
</div> </div>
</div> </div>
@@ -361,22 +361,15 @@ export default defineComponent({
}, },
getPosition(){ getPosition(){
let params let params
if(this.workspace.sex == 'Female'){ if(this.workspace.sexEnum.name == 'Female'){
params = 'FemalePosition' params = 'FemalePosition'
}else{ }else{
params = 'MalePosition' params = 'MalePosition'
} }
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => { Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
if (rv) { if (rv) {
let arr:any = []
rv.forEach((item:any) => { this.sketchCatecoryList = rv
let obj = {
value:item.name,
label:item.name,
}
arr.push(obj)
});
this.sketchCatecoryList = arr
} }
}) })
}, },
@@ -390,7 +383,8 @@ export default defineComponent({
file.imgUrl = res.data.url; file.imgUrl = res.data.url;
file.resData = res.data; file.resData = res.data;
file.pin = false; file.pin = false;
file.category = this.sketchCatecoryList?.[0]?.value; file.categoryValue = this.sketchCatecoryList?.[0]?.value;
file.category = this.sketchCatecoryList?.[0]?.name;
file.categoryShow = false; file.categoryShow = false;
file.id_ = GO.id++ file.id_ = GO.id++
file.type_ = { file.type_ = {
@@ -442,13 +436,15 @@ export default defineComponent({
for (let item of this.generateList) { for (let item of this.generateList) {
item.categoryShow = false; item.categoryShow = false;
} }
file.category = cate.value; file.categoryValue = cate.value;
file.category = cate.name;
// this.store.commit("sketchGenerateFiles", this.fileList); // this.store.commit("sketchGenerateFiles", this.fileList);
}else{ }else{
for (let item of this.fileList) { for (let item of this.fileList) {
item.categoryShow = false; item.categoryShow = false;
} }
file.category = cate.value; file.categoryValue = cate.value;
file.category = cate.name;
this.store.commit("setSketchboardFile", this.fileList); this.store.commit("setSketchboardFile", this.fileList);
} }
}, },
@@ -631,7 +627,8 @@ export default defineComponent({
arr = { arr = {
id:v.generateItemId, id:v.generateItemId,
imgUrl:v.generateItemUrl, imgUrl:v.generateItemUrl,
category:generage.level2Type?generage.level2Type:this.sketchCatecoryList[0].label, category:generage.level2Type?generage.level2Type:this.sketchCatecoryList[0].name,
categoryValue:generage.level2Type?generage.level2Type:this.sketchCatecoryList[0].value,
id_:GO.id++, id_:GO.id++,
like:rv.generatedCollectionItems[index].isLiked like:rv.generatedCollectionItems[index].isLiked
} }

1
src/component/HomePage/collectionModal.vue
View File

@@ -242,7 +242,6 @@ export default defineComponent({
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
bottom: 3rem; bottom: 3rem;
height: 3.2rem;
display: flex; display: flex;
.fi-rr-arrow-small-left{ .fi-rr-arrow-small-left{
margin-right: 10rem; margin-right: 10rem;

7
src/component/LibraryPage/ModelPlacement.vue
View File

@@ -322,11 +322,10 @@ export default defineComponent({
if (rv) { if (rv) {
let arr:any = [] let arr:any = []
rv.forEach((item:any) => { rv.forEach((item:any) => {
let obj = { arr.push({
value:item.name, value:item.name,
label:item.name, label:item.value,
} })
arr.push(obj)
}); });
this.sex = arr[0].value this.sex = arr[0].value
this.sexList = arr this.sexList = arr

4
src/component/LibraryPage/ModelPlacementMobile.vue
View File

@@ -158,12 +158,14 @@ export default defineComponent({
rv.forEach((item:any) => { rv.forEach((item:any) => {
let obj = { let obj = {
value:item.name, value:item.name,
label:item.name, label:item.value,
} }
arr.push(obj) arr.push(obj)
}); });
this.sex = arr[0].value this.sex = arr[0].value
this.sexList = arr this.sexList = arr
console.log(this.sexList);
} }
}) })
}, },

48
src/views/LibraryPage.vue
View File

@@ -40,7 +40,7 @@
<div class="select_block" v-show="selectCode == 'Sketchboard' || selectCode == 'MarketingSketch'"> <div class="select_block" v-show="selectCode == 'Sketchboard' || selectCode == 'MarketingSketch'">
<a-select <a-select
ref="select" ref="select"
v-model:value="sex" v-model:value="sex.value"
:options="sexList" :options="sexList"
@change="sexChange" @change="sexChange"
> >
@@ -53,7 +53,7 @@
</a-select> </a-select>
<a-select <a-select
ref="select" ref="select"
v-model:value="designType" v-model:value="designType.value"
:options="disignTypeList" :options="disignTypeList"
@change="handleChange" @change="handleChange"
> >
@@ -550,13 +550,12 @@ export default defineComponent({
if (rv) { if (rv) {
let arr:any = [] let arr:any = []
rv.forEach((item:any) => { rv.forEach((item:any) => {
let obj = { arr.push({
value:item.name, value:item.name,
label:item.name, label:item.value,
} })
arr.push(obj)
}); });
this.sex = arr[0].value this.sex = arr[0]
this.sexList = arr this.sexList = arr
this.getPosition() this.getPosition()
} }
@@ -564,7 +563,7 @@ export default defineComponent({
}, },
async getPosition(){ async getPosition(){
let params let params
if(this.sex == 'Female'){ if(this.sex.value == 'Female'){
params = 'FemalePosition' params = 'FemalePosition'
}else{ }else{
params = 'MalePosition' params = 'MalePosition'
@@ -573,27 +572,26 @@ export default defineComponent({
if (rv) { if (rv) {
let arr:any = [] let arr:any = []
rv.forEach((item:any) => { rv.forEach((item:any) => {
let obj = { arr.push({
value:item.name, value:item.name,
label:item.name, label:item.value,
} })
arr.push(obj)
}); });
this.designType = arr[0].value this.designType = arr[0]
this.disignTypeList = arr this.disignTypeList = arr
// this.workspaceItem.position = this.singleTypeList[0].label // this.workspaceItem.position = this.singleTypeList[0].label
} }
}) })
}, },
likeFile(item:any,str:string){ likeFile(item:any,str:string){
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : '' let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType.value : ''
if(str == 'like'){ if(str == 'like'){
let data = { let data = {
generateDetailId:item.id, generateDetailId:item.id,
level1Type:this.selectCode, level1Type:this.selectCode,
level2Type: designType, level2Type: designType,
gender:this.sex, gender:this.sex.name,
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
} }
Https.axiosPost(Https.httpUrls.generateLike, data).then( Https.axiosPost(Https.httpUrls.generateLike, data).then(
@@ -625,8 +623,8 @@ export default defineComponent({
this.total = 0, this.total = 0,
this.searchPictureName = '' this.searchPictureName = ''
this.imgList = [], this.imgList = [],
this.sex = 'Female', // this.sex = 'Female',
this.designType = 'Outwear', // this.designType = 'Outwear',
this.selectImgList = [] this.selectImgList = []
this.selectSingleImg = {} this.selectSingleImg = {}
this.getLibraryList() this.getLibraryList()
@@ -717,7 +715,7 @@ export default defineComponent({
libraryName:this.newPicName, libraryName:this.newPicName,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
} }
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : '' let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType.value : ''
let labelArr:any = [] let labelArr:any = []
this.value.editLabelValue.forEach((item:any)=>{ this.value.editLabelValue.forEach((item:any)=>{
// if(item.length > 1){ // if(item.length > 1){
@@ -920,12 +918,12 @@ export default defineComponent({
message.info(this.t('isTest.image')); message.info(this.t('isTest.image'));
return return
} }
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : '' let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType.value : ''
let new_data = { let new_data = {
file:event.file, file:event.file,
level1Type:this.selectCode, level1Type:this.selectCode,
level2Type:designType, level2Type:designType,
sex:this.selectCode == 'Sketchboard' ? this.sex:'', sex:this.selectCode == 'Sketchboard' ? this.sex.name:'',
modelType:'', modelType:'',
checkMd5:1, checkMd5:1,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
@@ -988,13 +986,13 @@ export default defineComponent({
this.value.labelValue.forEach((item:any)=>{ this.value.labelValue.forEach((item:any)=>{
labelArr.push(item[item.length-1]) labelArr.push(item[item.length-1])
}) })
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : '' let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType.value : ''
let data = { let data = {
classificationIdList:labelArr, classificationIdList:labelArr,
level1Type:this.selectCode, level1Type:this.selectCode,
level2Type:designType, level2Type:designType,
page:this.currentPage, page:this.currentPage,
modelSex:this.sex?this.sex:'', modelSex:this.sex.name?this.sex.name:'',
pictureName:this.searchPictureName, pictureName:this.searchPictureName,
size:this.pageSize, size:this.pageSize,
intersection:this.intersection, intersection:this.intersection,
@@ -1121,11 +1119,11 @@ export default defineComponent({
designType:'', designType:'',
collectionElementId:generageImg?.id, collectionElementId:generageImg?.id,
level1Type:this.selectCode, level1Type:this.selectCode,
level2Type:this.selectCode == 'Sketchboard'?this.designType:'', level2Type:this.selectCode == 'Sketchboard'?this.designType.value:'',
text:this.captionGeneration, text:this.captionGeneration,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
version:this.selectCode == 'Printboard'?this.printModel.num:1,//为1就是Print version:this.selectCode == 'Printboard'?this.printModel.num:1,//为1就是Print
gender:this.selectCode == 'Sketchboard'?this.sex:'', gender:this.selectCode == 'Sketchboard'?this.sex.name:'',
} }
if(generateType == 'image'||generateType == 'text-image'){ if(generateType == 'image'||generateType == 'text-image'){
if(generageImg?.id){ if(generageImg?.id){
@@ -1228,7 +1226,7 @@ export default defineComponent({
}, },
getClass(){ getClass(){
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : '' let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType.value : ''
let data = { let data = {
"classificationIdList": [], "classificationIdList": [],
"classificationName": "", "classificationName": "",