Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite
This commit is contained in:
@@ -185,7 +185,6 @@ export default defineComponent({
|
||||
width:props.sketchSize.width,
|
||||
height:props.sketchSize.height,
|
||||
}).then((rv)=>{
|
||||
console.log(rv,'================',props.sketchSize)
|
||||
if(oldSelectDetail?.partialDesign)oldSelectDetail.partialDesign.partialDesignBase64 = rv
|
||||
})
|
||||
|
||||
|
||||
@@ -907,7 +907,7 @@ export default defineComponent({
|
||||
action: ACTIONS.UPDATE,
|
||||
token: arr[editPrintElementData.imgDomIndex].token,
|
||||
key: 'location[0]',
|
||||
value: offset.left,
|
||||
value: location[0],
|
||||
},
|
||||
]);
|
||||
editPrintElementDom.pingpuRef.updataList([
|
||||
@@ -915,7 +915,7 @@ export default defineComponent({
|
||||
action: ACTIONS.UPDATE,
|
||||
token: arr[editPrintElementData.imgDomIndex].token,
|
||||
key: 'location[1]',
|
||||
value: offset.top,
|
||||
value: location[1],
|
||||
},
|
||||
]);
|
||||
// editPrintElementData.overallDetail.offsetX = offset.left
|
||||
|
||||
@@ -92,6 +92,7 @@
|
||||
let img = new Image();
|
||||
let size = [0,0];
|
||||
img.src = props.sketchPath;
|
||||
console.log(props.sketchPath)
|
||||
await new Promise((resolve, reject) => {
|
||||
img.onload = () => {
|
||||
size = [img.width, img.height]
|
||||
|
||||
Reference in New Issue
Block a user