From b22f0495d9aa300aa96fe60367e9aecfbfa39f47 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 2 Sep 2024 11:23:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetailAlter.vue | 1 - src/component/Detail/DesignPrintOperation.vue | 102 ++++++++-------- .../Detail/DesignPrintOperationMobile.vue | 110 +++++++++--------- 3 files changed, 114 insertions(+), 99 deletions(-) diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 10c17c57..6bc6c426 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -20,7 +20,6 @@ {{ $t('DesignDetailAlter.Library') }} - {{designType}}
0?false:this.exhibitionOpenrtionList.single.length>0?true:false + 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) - } + // 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.src = this.current.path skecth.onload=()=>{ this.sketch.width = skecth.width/10+'rem' this.sketch.height = skecth.height/10+'rem' skecth.remove() } - if(this.exhibitionOpenrtionList.overall.length > 0 && !this.overallSingle){ + skecth.src = this.current.path + if(this.exhibitionOpenrtionList.overall.length > 0){ let str = 'overall' this.exhibitionOpenrtionList[str].forEach((item,index)=>{ this.setTemplate(item,index,str) + this.designOpenrtionList.forEach((openrtItem)=>{ + if(item.minIOPath == openrtItem.minIOPath)openrtItem.checked=true + }) }) - }else if(!this.overallSingle){ - let str = 'overall' - this.setOverallPosition(0,str) } - if(this.exhibitionOpenrtionList.single.length > 0 && this.overallSingle){ + // 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) @@ -633,39 +638,44 @@ export default defineComponent({ await this.setPrintWH(item.path) this.designOpenrtionList let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0] - let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth - let scale - scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) - let zIndex = 1 - let left = item.location[0]/sketchNum+'px' - let top = item.location[1]/sketchNum+'px' - if(sketch.offsetWidth < item.location[0]/sketchNum){ - left = sketch.offsetWidth +'px' - } - if(sketch.offsetHeight < item.location[1]/sketchNum){ - top = sketch.offsetHeight +'px' - } - this.systemDesignerPercentage = item.scale?item.scale*100:30 - this.printStyleList[str][index]={ - centers:{ - left:0, - top:0, - }, - style:{ - left:left, - top:top, - right:"auto", - bottom:"auto", - width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', - height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', - zIndex:zIndex++ - }, - transform:{ - // scale:scale<.2?.2:scale,//0.2-3 - rotateZ:item.angle, - }, - designOpenrtionBtn:false + let sketchImg = new Image() + sketchImg.onload = ()=>{ + let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth + let scale + scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) + let zIndex = 1 + let left = item.location[0]/sketchNum+'px' + let top = item.location[1]/sketchNum+'px' + if(sketch.offsetWidth < item.location[0]/sketchNum){ + left = sketch.offsetWidth +'px' + } + if(sketch.offsetHeight < item.location[1]/sketchNum){ + top = sketch.offsetHeight +'px' + } + if(str == 'overall')this.systemDesignerPercentage = item.scale?item.scale*100:30 + this.printStyleList[str][index]={ + centers:{ + left:0, + top:0, + }, + style:{ + left:left, + top:top, + right:"auto", + bottom:"auto", + width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', + height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', + zIndex:zIndex++ + }, + transform:{ + // scale:scale<.2?.2:scale,//0.2-3 + rotateZ:item.angle, + }, + designOpenrtionBtn:false + } + sketchImg.remove() } + sketchImg.src = sketch.src }, setOverallPosition(index,str){ nextTick(()=>{ diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index cf262a3c..a6e03391 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -292,6 +292,7 @@ export default defineComponent({ }, methods: { init(){ + this.designOpenrtion = true let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) this.currentFullBodyView = designItemDetail.currentFullBodyView? designItemDetail.currentFullBodyView:designItemDetail.designItemUrl if(designItemDetail.others.length == 0){ @@ -299,36 +300,40 @@ export default defineComponent({ } //设置前片后片 this.operationCurrent = Object.assign({},this.current) - this.designOpenrtion = true this.clearModal() - this.overallSingle = this.current.printObject.ifSingle?true:false - this.ifListOver() let printList = JSON.parse(JSON.stringify(this.current.printObject.prints)) this.setprintList(printList) + + this.overallSingle = this.exhibitionOpenrtionList.overall.length>0?false:this.exhibitionOpenrtionList.single.length>0?true:false + 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) - } + // 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.src = this.current.path skecth.onload=()=>{ this.sketch.width = skecth.width/10+'rem' this.sketch.height = skecth.height/10+'rem' skecth.remove() } - if(this.exhibitionOpenrtionList.overall.length > 0 && !this.overallSingle){ + skecth.src = this.current.path + if(this.exhibitionOpenrtionList.overall.length > 0){ let str = 'overall' this.exhibitionOpenrtionList[str].forEach((item,index)=>{ this.setTemplate(item,index,str) + this.designOpenrtionList.forEach((openrtItem)=>{ + if(item.minIOPath == openrtItem.minIOPath)openrtItem.checked=true + }) }) - }else if(!this.overallSingle){ - let str = 'overall' - this.setOverallPosition(0,str) } - if(this.exhibitionOpenrtionList.single.length > 0 && this.overallSingle){ + // 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) @@ -366,8 +371,6 @@ export default defineComponent({ }) }, systemDesigner(num) { - let DesignPrintOperationParent = this.$parent - DesignPrintOperationParent.systemDesignerPercentage = num }, formatter(value) { return `${value*3}%`; @@ -430,7 +433,7 @@ export default defineComponent({ location:[0,0], ifSingle:true, }) - this.refetchTemplate(currentIndex,false) + this.refetchTemplate(currentIndex,true) } }, //设置移动 @@ -581,9 +584,6 @@ export default defineComponent({ }, //随机重置图片顺序 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 let sketch = document.getElementsByClassName("designOpenrtionMobile_modal")[0]?.getElementsByClassName('designOpenrtionMobile_sketch')[0] let width let scale @@ -638,39 +638,44 @@ export default defineComponent({ await this.setPrintWH(item.path) this.designOpenrtionList let sketch = document.getElementsByClassName("designOpenrtionMobile_modal")[0]?.getElementsByClassName('designOpenrtionMobile_sketch')[0] - let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth - let scale - scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) - let zIndex = 1 - let left = item.location[0]/sketchNum+'px' - let top = item.location[1]/sketchNum+'px' - if(sketch.offsetWidth < item.location[0]/sketchNum){ - left = sketch.offsetWidth +'px' - } - if(sketch.offsetHeight < item.location[1]/sketchNum){ - top = sketch.offsetHeight +'px' - } - this.systemDesignerPercentage = item.scale?item.scale*100:30 - this.printStyleList[str][index]={ - centers:{ - left:0, - top:0, - }, - style:{ - left:left, - top:top, - right:"auto", - bottom:"auto", - width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', - height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', - zIndex:zIndex++ - }, - transform:{ - // scale:scale<.2?.2:scale,//0.2-3 - rotateZ:item.angle, - }, - designOpenrtionBtn:false + let sketchImg = new Image() + sketchImg.onload = ()=>{ + let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth + let scale + scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) + let zIndex = 1 + let left = item.location[0]/sketchNum+'px' + let top = item.location[1]/sketchNum+'px' + if(sketch.offsetWidth < item.location[0]/sketchNum){ + left = sketch.offsetWidth +'px' + } + if(sketch.offsetHeight < item.location[1]/sketchNum){ + top = sketch.offsetHeight +'px' + } + if(str == 'overall')this.systemDesignerPercentage = item.scale?item.scale*100:30 + this.printStyleList[str][index]={ + centers:{ + left:0, + top:0, + }, + style:{ + left:left, + top:top, + right:"auto", + bottom:"auto", + width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', + height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', + zIndex:zIndex++ + }, + transform:{ + // scale:scale<.2?.2:scale,//0.2-3 + rotateZ:item.angle, + }, + designOpenrtionBtn:false + } + sketchImg.remove() } + sketchImg.src = sketch.src }, setOverallPosition(index,str){ @@ -813,6 +818,7 @@ export default defineComponent({ designItemDetail.currentFullBodyView = this.designItemDetailTS.rv.currentFullBodyView designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle designItemDetail.clothes[index].layersObject = this.designItemDetailTS.rv.clothes[index].layersObject + designItemDetail.clothes[index].undividedLayer = this.designItemDetailTS.rv.clothes[index].undividedLayer designItemDetail.clothes[index].trims = this.designItemDetailTS.rv.clothes[index].trims designItemDetail.clothes[index].printObject.prints = this.setOkData // designItemDetail.clothes[index].printObject.prints = this.computeZindex()