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

修复上传模特

Browse Source
This commit is contained in:
X1627315083
2023-11-30 13:52:36 +08:00
parent a181dd6176
commit 53b0bcae0b
10 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dist/css/237.2e789cd6.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/css/922.ca39e669.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/index.html vendored
View File

@@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>AiDA</title><link rel="stylesheet" href="./css/googleapis.css"><link rel="stylesheet" href="./css/roboto.css"><script defer="defer" src="/js/chunk-vendors.9c1ca004.js"></script><script defer="defer" src="/js/app.7de9a6f8.js"></script><link href="/css/chunk-vendors.5e9dbdc9.css" rel="stylesheet"><link href="/css/app.515c9595.css" rel="stylesheet"></head><body><script src="./js/color-thief.js"></script><noscript><strong>We're sorry but aida doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>AiDA</title><link rel="stylesheet" href="./css/googleapis.css"><link rel="stylesheet" href="./css/roboto.css"><script defer="defer" src="/js/chunk-vendors.9c1ca004.js"></script><script defer="defer" src="/js/app.04d53701.js"></script><link href="/css/chunk-vendors.5e9dbdc9.css" rel="stylesheet"><link href="/css/app.515c9595.css" rel="stylesheet"></head><body><script src="./js/color-thief.js"></script><noscript><strong>We're sorry but aida doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

3
dist/js/237.89d84820.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

3
dist/js/922.a4f64d9a.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/app.7de9a6f8.js → dist/js/app.04d53701.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -50,7 +50,7 @@
<div class="select_block"> <div class="select_block">
<a-select <a-select
ref="select" ref="select"
v-model:value="sex" v-model:value="sex.name"
:options="sexList" :options="sexList"
> >
<template #suffixIcon <template #suffixIcon
@@ -159,7 +159,10 @@ export default defineComponent({
let isSubmit:any = ref(false) //判断历史是否有提交过 let isSubmit:any = ref(false) //判断历史是否有提交过
let manager:any = ref(false) let manager:any = ref(false)
let userInfo:any = ref() let userInfo:any = ref()
let sex:any = ref({})
let sexList:any = ref([
])
let cropperTime:any = ref() let cropperTime:any = ref()
let {t} = useI18n() let {t} = useI18n()
@@ -176,7 +179,8 @@ export default defineComponent({
isSubmit, isSubmit,
manager, manager,
userInfo, userInfo,
sex,
sexList,
cropperTime, cropperTime,
t t
@@ -193,10 +197,7 @@ export default defineComponent({
perviewUrl:'',//预览的图片地址 perviewUrl:'',//预览的图片地址
isShowMark:false, isShowMark:false,
modelType:'Library', modelType:'Library',
sex:'Male',
sexList: [
],
option:{ option:{
img: '', //裁剪图片的地址 img: '', //裁剪图片的地址
outputSize: 1, //裁剪生成图片的质量(可选0.1 - 1) outputSize: 1, //裁剪生成图片的质量(可选0.1 - 1)
@@ -248,8 +249,9 @@ export default defineComponent({
formatter(value:number){ formatter(value:number){
return `${value}%`; return `${value}%`;
}, },
showPlacementModal(data:any){ showPlacementModal(data:any,sex:any){
// this.sex = arr[0].value
this.sex = sex
this.placementShow = true this.placementShow = true
this.printObject = { this.printObject = {
...data ...data
@@ -329,7 +331,6 @@ export default defineComponent({
label:item.value, label:item.value,
}) })
}); });
this.sex = arr[0].value
this.sexList = arr this.sexList = arr
} }
}) })
@@ -604,11 +605,11 @@ export default defineComponent({
}, },
confrimSubmit(){ confrimSubmit(){
let param = { let param = {
libraryId:this.printObject.id, libraryId:this.printObject.id,
templateId:this.printObject.templateId || null, templateId:this.printObject.templateId || null,
modelType:'Library', modelType:'Library',
modelSex:this.sex.value,
checkMd5:1, checkMd5:1,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...this.getPrintLocation() ...this.getPrintLocation()
@@ -636,13 +637,13 @@ export default defineComponent({
level1Type:'Models', level1Type:'Models',
level2Type:'', level2Type:'',
checkMd5:1, checkMd5:1,
sex:this.sex, sex:this.sex.value,
modelType:'Library', modelType:'Library',
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
} }
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){ if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
new_data.modelType = this.modelType new_data.modelType = this.modelType
new_data.sex = this.sex // new_data.sex = this.sex
} }
this.isShowMark = true this.isShowMark = true
return new Promise((resolve,reject)=>{ return new Promise((resolve,reject)=>{

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

@@ -50,7 +50,7 @@
<div class="select_block"> <div class="select_block">
<a-select <a-select
ref="select" ref="select"
v-model:value="sex" v-model:value="sex.name"
:options="sexList" :options="sexList"
> >
<template #suffixIcon <template #suffixIcon
@@ -159,7 +159,10 @@ export default defineComponent({
let isSubmit:any = ref(false) //判断历史是否有提交过 let isSubmit:any = ref(false) //判断历史是否有提交过
let manager:any = ref(false) let manager:any = ref(false)
let userInfo:any = ref() let userInfo:any = ref()
let sex:any = ref({})
let sexList:any = ref([
])
let cropperTime:any = ref() let cropperTime:any = ref()
let option:any = ref({ let option:any = ref({
img: '', //裁剪图片的地址 img: '', //裁剪图片的地址
@@ -199,7 +202,8 @@ export default defineComponent({
isSubmit, isSubmit,
manager, manager,
userInfo, userInfo,
sex,
sexList,
cropperTime, cropperTime,
option, option,
t t
@@ -216,10 +220,6 @@ export default defineComponent({
perviewUrl:'',//预览的图片地址 perviewUrl:'',//预览的图片地址
isShowMark:false, isShowMark:false,
modelType:'Library', modelType:'Library',
sex:'Male',
sexList: [
],
} }
}, },
mounted(){ mounted(){
@@ -247,8 +247,8 @@ export default defineComponent({
formatter(value:number){ formatter(value:number){
return `${value}%`; return `${value}%`;
}, },
showPlacementModal(data:any){ showPlacementModal(data:any,sex:any){
this.sex = sex
this.placementShow = true this.placementShow = true
this.printObject = { this.printObject = {
...data ...data
@@ -328,7 +328,7 @@ export default defineComponent({
label:item.value, label:item.value,
}) })
}); });
this.sex = arr[0].value // this.sex = arr[0].value
this.sexList = arr this.sexList = arr
} }
}) })
@@ -606,6 +606,7 @@ export default defineComponent({
libraryId:this.printObject.id, libraryId:this.printObject.id,
templateId:this.printObject.templateId || null, templateId:this.printObject.templateId || null,
modelType:'Library', modelType:'Library',
modelSex:this.sex.value,
checkMd5:1, checkMd5:1,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...this.getPrintLocation() ...this.getPrintLocation()
@@ -633,7 +634,7 @@ export default defineComponent({
level1Type:'Models', level1Type:'Models',
level2Type:'', level2Type:'',
checkMd5:1, checkMd5:1,
sex:this.sex, sex:this.sex.value,
modelType:'Library', modelType:'Library',
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
} }

30
src/component/LibraryPage/setLabel.vue
View File

@@ -12,7 +12,7 @@
<div class="setLabel_centent"> <div class="setLabel_centent">
<ul class="optionsItem"> <ul class="optionsItem">
<li class="optionsItem_title" @click.stop="" v-for="optionsItem,optionsIndex in options" :key="optionsItem.id"> <li class="optionsItem_title" @click.stop="" v-for="optionsItem,optionsIndex in options" :key="optionsItem.id">
<div class="setLabel_text"> <div class="setLabel_text" :class="{active:optionsItem.checAll}">
<a-checkbox v-model:checked="optionsItem.checkAll" @change="onCheckAllChange(optionsItem)"></a-checkbox> <a-checkbox v-model:checked="optionsItem.checkAll" @change="onCheckAllChange(optionsItem)"></a-checkbox>
<span v-show="!optionsItem.openType" :title="optionsItem.classificationName">{{ optionsItem.classificationName }}</span> <span v-show="!optionsItem.openType" :title="optionsItem.classificationName">{{ optionsItem.classificationName }}</span>
<input v-show="optionsItem.openType" type="text" v-model="itemName"> <input v-show="optionsItem.openType" type="text" v-model="itemName">
@@ -21,7 +21,7 @@
</div> </div>
<ul class="childrenItem active" v-mousewheel> <ul class="childrenItem active" v-mousewheel>
<li class="childrenItem_title setLabel_text" v-for="childrenItem,childrenIndex in optionsItem.childList" :key="childrenItem.id"> <li class="childrenItem_title setLabel_text" :class="{active:optionsItem.checAll}" v-for="childrenItem,childrenIndex in optionsItem.childList" :key="childrenItem.id">
<a-checkbox v-model:checked="childrenItem.checkAll" @change="onCheckAllchildrenItem(optionsItem)"></a-checkbox> <a-checkbox v-model:checked="childrenItem.checkAll" @change="onCheckAllchildrenItem(optionsItem)"></a-checkbox>
<span v-show="!childrenItem.openType" :title="childrenItem.classificationName">{{ childrenItem.classificationName }}</span> <span v-show="!childrenItem.openType" :title="childrenItem.classificationName">{{ childrenItem.classificationName }}</span>
<input v-show="childrenItem.openType" type="text" v-model="itemName"> <input v-show="childrenItem.openType" type="text" v-model="itemName">
@@ -369,6 +369,7 @@ export default defineComponent({
flex-shrink: 0; flex-shrink: 0;
font-size: 1.8rem; font-size: 1.8rem;
font-weight: 900; font-weight: 900;
transition: .3s all;
i{ i{
display: flex; display: flex;
} }
@@ -385,6 +386,7 @@ export default defineComponent({
flex-direction: column; flex-direction: column;
padding: 1rem; padding: 1rem;
flex: 1; flex: 1;
.optionsItem_title{ .optionsItem_title{
margin-bottom: 2rem; margin-bottom: 2rem;
border-radius: 1rem; border-radius: 1rem;
@@ -396,6 +398,21 @@ export default defineComponent({
>label{ >label{
align-items: center; align-items: center;
} }
.fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 0;
transition: .3s all;
}
:hover{
// background: #efefef;
.fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 1;
}
}
.active{
.fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 1 !important;
}
}
.childrenItem{ .childrenItem{
max-width: 100%; max-width: 100%;
overflow: hidden; overflow: hidden;
@@ -407,17 +424,18 @@ export default defineComponent({
background: #f0f0f0; background: #f0f0f0;
// background: #d5d5d5; // background: #d5d5d5;
font-size: 1.4rem; font-size: 1.4rem;
label{ label{
transform: scale(.8); transform: scale(.8);
} }
.fi-rr-edit{ .fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 0; opacity: 0;
transition: .3s all; transition: .3s all;
} }
} }
.setLabel_text:hover{ .setLabel_text:hover{
// background: #efefef; // background: #efefef;
.fi-rr-edit{ .fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 1; opacity: 1;
} }
} }
@@ -466,8 +484,8 @@ export default defineComponent({
position: sticky; position: sticky;
background: #fff; background: #fff;
border: none; border: none;
// margin-top: auto; margin-top: auto;
bottom: 0; bottom: 2rem;
>div{ >div{
} }
.started_btn{ .started_btn{

7
src/views/LibraryPage.vue
View File

@@ -37,7 +37,7 @@
</div> </div>
<div class="librart_headr_right"> <div class="librart_headr_right">
<div class="select_block" v-show="selectCode == 'Sketchboard' || selectCode == 'MarketingSketch'"> <div class="select_block" v-show="selectCode == 'Sketchboard' || selectCode == 'Models'">
<a-select <a-select
ref="select" ref="select"
v-model:value="sex.value" v-model:value="sex.value"
@@ -53,6 +53,7 @@
</a-select> </a-select>
<a-select <a-select
ref="select" ref="select"
v-show="selectCode == 'Sketchboard'"
v-model:value="designType.value" v-model:value="designType.value"
:options="disignTypeList" :options="disignTypeList"
@change="handleChange" @change="handleChange"
@@ -1024,9 +1025,7 @@ export default defineComponent({
//给模特打点编辑 //给模特打点编辑
placementClick(data:any){ placementClick(data:any){
let placementModal:any = isMoible() ? this.$refs.ModelPlacementMobile : this.$refs.ModelPlacement let placementModal:any = isMoible() ? this.$refs.ModelPlacementMobile : this.$refs.ModelPlacement
console.log(isMoible()); placementModal.showPlacementModal(data,this.sex)
placementModal.showPlacementModal(data)
}, },
//generate //generate
setKeyword(num: any) { setKeyword(num: any) {