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

fix

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
src/component/HomePage/Generate.vue
View File

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

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

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

14
src/component/HomePage/PrintboardUpload.vue
View File

@@ -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'){

2
src/component/HomePage/RobotAssist.vue
View File

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

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

@@ -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'){

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

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

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

@@ -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) => {

88
src/component/HomePage/productImg.vue
View File

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

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

@@ -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) => {