diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index bd6868a3..d467a734 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -449,7 +449,7 @@ export default defineComponent({ location:[0,0], ifSingle:false, } - this.systemDesignerPercentage = item.scale?item.scale*100:30 + this.systemDesignerPercentage = (item.scale[0] && !item.ifSingle)?item.scale[0]*100:30 }else{ this.printStyleList[this.stateOverallSingle].push(JSON.parse(JSON.stringify(this.currentPrintStyleList))) let currentIndex = this.printStyleList[this.stateOverallSingle].length-1 @@ -460,7 +460,7 @@ export default defineComponent({ minIOPath:item.minIOPath, path:item.path, priority:1, - scale:1, + scale:[1,1], location:[0,0], ifSingle:true, }) @@ -801,7 +801,8 @@ export default defineComponent({ let scale let location for (let index = 0; index < arr.length; index++) { - if(!this.overallSingle){ + if(this.stateOverallSingle == 'overall'){ + // if(!this.overallSingle){ scale =[ this.systemDesignerPercentage/100, this.systemDesignerPercentage/100] let overallScale = (arr[index].style.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) let x = Number(arr[index].style.left.replace(/px/g,'')) @@ -814,7 +815,6 @@ export default defineComponent({ location = [(x*sketchNum) - width/sketchNum/2 ,(y*sketchNum) - height/sketchNum/2] }else{ await this.setPrintWH(this.exhibitionOpenrtionList[this.stateOverallSingle][index].path) - console.log(arr[index].style.width.replace(/px/g,''),sketch.offsetWidth,arr[index].style.height.replace(/px/g,''),sketch.offsetHeight); scale = [arr[index].style.width.replace(/px/g,'')/sketch.offsetWidth,(arr[index].style.height.replace(/px/g,'')/sketch.offsetHeight)] location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum] }