修复上传模特

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

View File

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

View File

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

View File

@@ -12,7 +12,7 @@
<div class="setLabel_centent">
<ul class="optionsItem">
<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>
<span v-show="!optionsItem.openType" :title="optionsItem.classificationName">{{ optionsItem.classificationName }}</span>
<input v-show="optionsItem.openType" type="text" v-model="itemName">
@@ -21,7 +21,7 @@
</div>
<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>
<span v-show="!childrenItem.openType" :title="childrenItem.classificationName">{{ childrenItem.classificationName }}</span>
<input v-show="childrenItem.openType" type="text" v-model="itemName">
@@ -369,6 +369,7 @@ export default defineComponent({
flex-shrink: 0;
font-size: 1.8rem;
font-weight: 900;
transition: .3s all;
i{
display: flex;
}
@@ -385,6 +386,7 @@ export default defineComponent({
flex-direction: column;
padding: 1rem;
flex: 1;
.optionsItem_title{
margin-bottom: 2rem;
border-radius: 1rem;
@@ -396,6 +398,21 @@ export default defineComponent({
>label{
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{
max-width: 100%;
overflow: hidden;
@@ -407,17 +424,18 @@ export default defineComponent({
background: #f0f0f0;
// background: #d5d5d5;
font-size: 1.4rem;
label{
transform: scale(.8);
}
.fi-rr-edit{
.fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 0;
transition: .3s all;
}
}
.setLabel_text:hover{
// background: #efefef;
.fi-rr-edit{
.fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 1;
}
}
@@ -466,8 +484,8 @@ export default defineComponent({
position: sticky;
background: #fff;
border: none;
// margin-top: auto;
bottom: 0;
margin-top: auto;
bottom: 2rem;
>div{
}
.started_btn{