fix
This commit is contained in:
@@ -449,7 +449,7 @@ export default defineComponent({
|
|||||||
location:[0,0],
|
location:[0,0],
|
||||||
ifSingle:false,
|
ifSingle:false,
|
||||||
}
|
}
|
||||||
this.systemDesignerPercentage = (item.scale[0] && !item.ifSingle)?item.scale[0]*100:30
|
this.systemDesignerPercentage = (item.scale?.[0] && !item.ifSingle)?item.scale[0]*100:30
|
||||||
}else{
|
}else{
|
||||||
this.printStyleList[this.stateOverallSingle].push(JSON.parse(JSON.stringify(this.currentPrintStyleList)))
|
this.printStyleList[this.stateOverallSingle].push(JSON.parse(JSON.stringify(this.currentPrintStyleList)))
|
||||||
let currentIndex = this.printStyleList[this.stateOverallSingle].length-1
|
let currentIndex = this.printStyleList[this.stateOverallSingle].length-1
|
||||||
@@ -705,41 +705,44 @@ export default defineComponent({
|
|||||||
let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
|
let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
|
||||||
let sketchImg = new Image()
|
let sketchImg = new Image()
|
||||||
sketchImg.onload = ()=>{
|
sketchImg.onload = ()=>{
|
||||||
let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
|
nextTick(()=>{
|
||||||
let scale
|
let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
|
||||||
scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
|
let scale
|
||||||
let zIndex = 1
|
scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
|
||||||
let left = item.location[0]/sketchNum+'px'
|
let zIndex = 1
|
||||||
let top = item.location[1]/sketchNum+'px'
|
let left = item.location[0]/sketchNum+'px'
|
||||||
if(sketch.offsetWidth < item.location[0]/sketchNum){
|
let top = item.location[1]/sketchNum+'px'
|
||||||
left = sketch.offsetWidth +'px'
|
if(sketch.offsetWidth < item.location[0]/sketchNum){
|
||||||
}
|
left = sketch.offsetWidth +'px'
|
||||||
if(sketch.offsetHeight < item.location[1]/sketchNum){
|
}
|
||||||
top = sketch.offsetHeight +'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]={
|
if(str == 'overall')this.systemDesignerPercentage = item.scale?.[0]?item.scale[0]*100:30
|
||||||
centers:{
|
this.printStyleList[str][index]={
|
||||||
left:0,
|
centers:{
|
||||||
top:0,
|
left:0,
|
||||||
},
|
top:0,
|
||||||
style:{
|
},
|
||||||
left:left,
|
style:{
|
||||||
top:top,
|
left:left,
|
||||||
right:"auto",
|
top:top,
|
||||||
bottom:"auto",
|
right:"auto",
|
||||||
// width:this.print.width.replace(/px/g,'')/sketchNum*item.scale[0]+'px',
|
bottom:"auto",
|
||||||
// height:this.print.height.replace(/px/g,'')/sketchNum*item.scale[1]+'px',
|
// width:this.print.width.replace(/px/g,'')/sketchNum*item.scale[0]+'px',
|
||||||
width:sketch.offsetWidth*item.scale[0]+'px',
|
// height:this.print.height.replace(/px/g,'')/sketchNum*item.scale[1]+'px',
|
||||||
height:sketch.offsetHeight*item.scale[1]+'px',
|
width:sketch.offsetWidth*item.scale[0]+'px',
|
||||||
zIndex:zIndex++
|
height:sketch.offsetHeight*item.scale[1]+'px',
|
||||||
},
|
zIndex:zIndex++
|
||||||
transform:{
|
},
|
||||||
// scale:scale<.2?.2:scale,//0.2-3
|
transform:{
|
||||||
rotateZ:item.angle,
|
// scale:scale<.2?.2:scale,//0.2-3
|
||||||
},
|
rotateZ:item.angle,
|
||||||
designOpenrtionBtn:false
|
},
|
||||||
}
|
designOpenrtionBtn:false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
sketchImg.remove()
|
sketchImg.remove()
|
||||||
}
|
}
|
||||||
sketchImg.src = sketch.src
|
sketchImg.src = sketch.src
|
||||||
|
|||||||
Reference in New Issue
Block a user