diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index c55f9219..1b8c393d 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -233,12 +233,10 @@ export default defineComponent({ let sketchH = editPrintElementData.sketchWH.height * editPrintElementData.sketchWH.scale[1] let x = sketchW / 2 - (sketchW * (width / editPrintElementData.sketchWH.width)/2) let y = sketchH / 2 -(sketchH * height/2) - if(!editPrintElementData.stateOverallSingle == 'single'){ + if(editPrintElementData.stateOverallSingle !== 'single'){ x = sketchW / 2 y = sketchH / 2 } - x = sketchW / 2 - y = sketchH / 2 let location = [x,y] resolve({scale,location}) } @@ -248,7 +246,7 @@ export default defineComponent({ const addPrintELement = async (data:any)=>{ if(!editPrintElementData.isSketchLoad)return let {scale,location} = await setScaleLocation(data) - let printIndex = 0 + let printIndex = 1 let allElementPrint = [] if(props.type == 'print'){ allElementPrint = [ @@ -262,9 +260,9 @@ export default defineComponent({ ...(editPrintElementData.selectDetail.printObject.prints || []), ] } - - printIndex = Math.max(...allElementPrint.map(item => Number(item.priority))) + 1 - console.log(printIndex) + if(allElementPrint.length >= 1){ + printIndex = Math.max(...allElementPrint.map(item => Number(item.priority))) + 1 + } let item = { angle:0, designType:data.designType, @@ -359,7 +357,6 @@ export default defineComponent({ top = item.location[1] / editPrintElementData.sketchWH.scale[1] }else{ //overall - console.log(item) left = item.location[0] / editPrintElementData.sketchWH.scale[0] top = item.location[1] / editPrintElementData.sketchWH.scale[1] item.scale = [1,1]