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
2024-10-10 11:32:49 +08:00
parent 982bbee122
commit 03a85a3642
20 changed files with 272 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/component/Detail/DesignDetail.vue
View File

@@ -741,8 +741,8 @@ export default defineComponent({
changed:item.changed?item.changed:false,
designType:item.designType?item.designType:"Library",
offset:item.layersObject?.[1]?.offset == null?[0,0]:item.layersObject[1].offset,
maskMinioUrl:item.layersObject[1].maskMinioUrl,
maskUrl:item.layersObject[1].maskUrl,
maskMinioUrl:item.layersObject[1]?.maskMinioUrl?item.layersObject[1].maskMinioUrl:'',
maskUrl:item.layersObject?.[1]?.maskUrl?item.layersObject[1].maskUrl:'',
scale:item.layersObject?.[1]?.scale?item.layersObject[1].scale:[1,1],
printObject:{
// path:item.printObject.path?item.printObject.path :'',
@@ -1030,6 +1030,13 @@ export default defineComponent({
undividedLayer:'',
sketchString:'',
"layersObject": [
{
maskMinioUrl:'',
maskUrl:'',
},{
maskMinioUrl:'',
maskUrl:'',
},
]
}
// this.designOrder = true
@@ -1059,7 +1066,6 @@ export default defineComponent({
},
//元素替换
clothesDetail(clothes:any, index:number){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
this.designOrder = true
@@ -1174,7 +1180,7 @@ export default defineComponent({
border-bottom: none;
}
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2);
display: flex;

31
src/component/Detail/DesignElements.vue
View File

@@ -657,19 +657,22 @@ export default defineComponent({
this.exhibitionElementsList = []
},
closeModal(){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
let _this = this
Modal.confirm({
title: this.t('DesignPrintOperation.jsContent1'),
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
centered:true,
onOk() {
_this.designElements=false
}
});
if(this.designItemDetailTS.rv){
let _this = this
Modal.confirm({
title: this.t('DesignPrintOperation.jsContent1'),
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
centered:true,
onOk() {
_this.designElements=false
}
});
}else{
this.designElements=false
}
},
},
});
@@ -686,7 +689,7 @@ export default defineComponent({
position: absolute;
}
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2);
display: flex;

2
src/component/Detail/DesignElementsMobile.vue
View File

@@ -624,7 +624,7 @@ export default defineComponent({
position: absolute;
}
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2);
display: flex;

42
src/component/Detail/DesignPrintOperation.vue
View File

@@ -334,11 +334,6 @@ export default defineComponent({
this.ifListOver()
if(this.$parent.exhibitionList.print)this.designOpenrtionList = JSON.parse(JSON.stringify(this.$parent.exhibitionList.print))
if(this.$parent.elementsList)this.designList = JSON.parse(JSON.stringify(this.$parent.printsList))
// if(this.overallSingle == false && this.designOpenrtionList.length > 0){
// this.designOpenrtionList[0].checked = true
// }else if(this.overallSingle == false && this.designOpenrtionList.length == 0){
// this.setpitch(this.designList[0],0)
// }
let skecth = new Image
skecth.onload=()=>{
this.sketch.width = skecth.width/10+'rem'
@@ -355,17 +350,13 @@ export default defineComponent({
})
})
}
// else if(!this.overallSingle){
// let str = 'overall'
// this.setOverallPosition(0,str)
// }
if(this.exhibitionOpenrtionList.single.length > 0){
let str = 'single'
this.exhibitionOpenrtionList[str].forEach((item,index)=>{
this.setTemplate(item,index,str)
})
}
if(this.exhibitionOpenrtionList.overall.length == 0 && this.exhibitionOpenrtionList.single.length == 0)this.setpitch(this.designList[0],0)
},
setprintList(arr){
arr.forEach(item=>{
@@ -917,19 +908,22 @@ export default defineComponent({
}
},
closeModal(){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
let _this = this
Modal.confirm({
title: this.t('DesignPrintOperation.jsContent1'),
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
centered:true,
onOk() {
_this.designOpenrtion=false
}
});
if(this.designItemDetailTS.rv){
let _this = this
Modal.confirm({
title: this.t('DesignPrintOperation.jsContent1'),
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
centered:true,
onOk() {
_this.designOpenrtion=false
}
});
}else{
this.designOpenrtion=false
}
},
},
});
@@ -946,7 +940,7 @@ export default defineComponent({
position: absolute;
}
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2);
display: flex;

2
src/component/Detail/DesignPrintOperationMobile.vue
View File

@@ -890,7 +890,7 @@ export default defineComponent({
position: absolute;
}
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2);
display: flex;

7
src/component/Detail/addDetails.vue
View File

@@ -3,10 +3,11 @@
class="addDetails_modal generalModel"
v-model:visible="addDetails"
:footer="null"
width="50%"
width="78%"
:maskClosable="false"
:centered="true"
:closable="false"
:destroyOnClose="true"
wrapClassName="#app"
:keyboard="false"
>
@@ -81,8 +82,8 @@ export default defineComponent({
margin: 0 auto;
}
.exportCanvasBox_submit{
margin-top: 2.4rem;
text-align: center;
// margin-top: 2.4rem;
// text-align: center;
}
}
</style>

2
src/component/Detail/setDesignItem.vue
View File

@@ -554,7 +554,7 @@ export default defineComponent({
-moz-user-select: none; /* Firefox */
-ms-user-select: none; /* Internet Explorer/Edge */
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2);
display: flex;

2
src/component/Detail/setDesignItem2.vue
View File

@@ -418,7 +418,7 @@ export default defineComponent({
.designOpenrtion_modal {
// max-width: 1440px;
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2);
display: flex;

2
src/component/Detail/setDesignItemMobile.vue
View File

@@ -473,7 +473,7 @@ export default defineComponent({
-khtml-user-select: none;
user-select: none;
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
padding: calc(5rem*1.2) calc(6rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.calc(4rem*1.2));
height: calc(65rem*1.2);
display: flex;