+
@@ -133,7 +133,7 @@
-
+
@@ -359,6 +359,8 @@ export default defineComponent({
handler(newVal,oldVal){
if(newVal && newVal.length > 0){
this.exhibitionList.print = this.setExhibitionList(newVal)
+ }else{
+ this.exhibitionList.print = []
}
}
},
@@ -366,6 +368,8 @@ export default defineComponent({
handler(newVal,oldVal){
if(newVal && newVal.length > 0){
this.exhibitionList.elements = this.setExhibitionList(newVal)
+ }else{
+ this.exhibitionList.print = []
}
}
},
diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue
index 8c2fc6f8..bbea4a9f 100644
--- a/src/component/Detail/DesignDetailEnd.vue
+++ b/src/component/Detail/DesignDetailEnd.vue
@@ -24,9 +24,9 @@
![]()
-
@@ -92,10 +92,9 @@
{{ $t('DesignDetailEnd.preview') }}
-
{{ $t('DesignDetailEnd.Layout') }}
+
{{ $t('DesignDetailEnd.Layout') }}
-
{{ $t('DesignDetailEnd.Layout') }}
-
+
{{ $t('DesignDetailEnd.Layout') }}
diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue
index 8c972701..794f84f3 100644
--- a/src/component/Detail/DesignPrintOperation.vue
+++ b/src/component/Detail/DesignPrintOperation.vue
@@ -40,10 +40,10 @@
@@ -287,6 +288,9 @@ export default defineComponent({
this.ifListOver()
if(this.current.printObject.prints)this.exhibitionOpenrtionList[this.stateOverallSingle] = JSON.parse(JSON.stringify(this.current.printObject.prints))
if(this.$parent.exhibitionList.print)this.designOpenrtionList = JSON.parse(JSON.stringify(this.$parent.exhibitionList.print))
+ if(this.overallSingle == false && this.designOpenrtionList.length > 0){
+ this.designOpenrtionList[0].checked = true
+ }
if(this.$parent.elementsList)this.designList = JSON.parse(JSON.stringify(this.$parent.printsList))
// this.overallSingle = this.current.ifSingle?false:this.current.ifSingle
let skecth = new Image
@@ -341,14 +345,27 @@ export default defineComponent({
}
// this.random()
},
- async setpitch(item,index){
+ async setpitch(item,index,str){
await this.setPrintWH(item.path)
this.printStyleList[this.stateOverallSingle].forEach((v)=>{
v.designOpenrtionBtn = false
})
if(!this.overallSingle){
+ if(item.checked){
+ this.deletePrint()
+ item.checked = false
+ return
+ }else{
+ this.designOpenrtionList.forEach((itemElem)=>{
+ itemElem.checked = false
+ })
+ this.designList.forEach((itemElem)=>{
+ itemElem.checked = false
+ })
+ item.checked = true
+ }
this.printStyleList[this.stateOverallSingle][0] = JSON.parse(JSON.stringify(this.currentPrintStyleList))
- this.refetchTemplate(0)
+ this.refetchTemplate(0,true)
this.exhibitionOpenrtionList[this.stateOverallSingle][0] = {
angle:0,
designType:item.designType,
@@ -359,7 +376,7 @@ export default defineComponent({
scale:.3,
location:[0,0]
}
- this.systemDesignerPercentage = 30
+ this.systemDesignerPercentage = item.scale?item.scale*100:30
}else{
this.printStyleList[this.stateOverallSingle].push(JSON.parse(JSON.stringify(this.currentPrintStyleList)))
let currentIndex = this.printStyleList[this.stateOverallSingle].length-1
@@ -373,7 +390,7 @@ export default defineComponent({
scale:1,
location:[0,0]
})
- this.refetchTemplate(currentIndex)
+ this.refetchTemplate(currentIndex,false)
}
},
//设置移动
@@ -518,11 +535,11 @@ export default defineComponent({
},
random(){
this.exhibitionOpenrtionList[this.stateOverallSingle].forEach((v,index)=>{
- this.refetchTemplate(index)
+ this.refetchTemplate(index,false)
})
},
//随机重置图片顺序
- refetchTemplate(index) {
+ refetchTemplate(index,boor) {
// let scale = (Math.trunc(Math.random()*15)+1)*.1
let rotateZ1 = Math.trunc(Math.random()*360)+1
let rotateZ2 = Math.trunc(Math.random()*360)+1
@@ -549,8 +566,8 @@ export default defineComponent({
top:0,
},
style:{
- left:Math.trunc(Math.random()*x)+1+"px",
- top:Math.trunc(Math.random()*y)+1+"px",
+ left:(boor?sketch.offsetWidth/2:Math.trunc(Math.random()*x)+1)+"px",
+ top:(boor?sketch.offsetHeight/2:Math.trunc(Math.random()*y)+1)+"px",
right:"auto",
bottom:"auto",
width:this.print.width.replace(/px/g,'')*scale+'px',
@@ -915,6 +932,10 @@ export default defineComponent({
img{
width: 100%;
cursor: pointer;
+ &.active{
+ opacity: .5;
+ transform: scale(.8);
+ }
}
.designOpenrtion_overall{
width: 80%;
diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue
index 1e1541d0..d13cef0b 100644
--- a/src/component/Detail/DesignPrintOperationMobile.vue
+++ b/src/component/Detail/DesignPrintOperationMobile.vue
@@ -38,6 +38,20 @@