diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js index fc7bf45..98305b3 100644 --- a/src/components/Common/Typesetting/typesetting.js +++ b/src/components/Common/Typesetting/typesetting.js @@ -277,6 +277,16 @@ const Typesetting = props => { let remaining = isVertical ? commonHeightCheck : commonWidthCheck; // const remaining = false; + console.log(innerWidth, '盒长'); + console.log(innerHeight, '盒高'); + console.log(dFWidthOffset, '首盒纵向偏移'); + console.log(dFLengthOffset, '首盒横向偏移'); + console.log(dSWidthOffset,radioValue?.sSWidthOffset, '次盒纵向偏移'); + console.log(dSLengthOffset,radioValue?.sSLengthOffset, '次盒横向偏移'); + console.log(boxLengthOffset, '第二列横向偏移'); + console.log(boxWidthOffset, '第二列纵向偏移'); + console.log(variabless,'variabless'); + const isOdd = num => { return num % 2 !== 0; @@ -336,7 +346,7 @@ const Typesetting = props => { }} >
- {!sSvgPath ? : } + {!sSvgPath ? : } {/* */}
@@ -371,11 +381,11 @@ const Typesetting = props => { alignItems: "center", position: "absolute", left: `${dFLengthOffset + dYBJJ}px`, - top: `${iFAngle === 90 || iFAngle === 270 ? 0 : dFWidthOffset + dXBJJ}px`, + top: `${iFAngle === 90 || iFAngle === 270 ? dFLengthOffset : dFWidthOffset + dXBJJ}px`, }} >
- {!sSvgPath ? : } + {!sSvgPath ? : }
{ justifyContent: "center", alignItems: "center", position: "absolute", - left: `${isVertical ? dSLengthOffset + dYBJJ : jInnerWidth + dFLengthOffset + dSLengthOffset + dYBJJ}px`, + left: `${isVertical ? dSLengthOffset : innerWidth + dFLengthOffset + dSLengthOffset + dYBJJ}px`, top: `${ isVertical ? jInnerHeight + dXBJJ + dFWidthOffset + dSWidthOffset : iSAngle === 90 || iSAngle === 270 ? dSWidthOffset : dSWidthOffset + dXBJJ }px`, }} >
- {!sSvgPath ? : } + {!sSvgPath ? : }
@@ -434,7 +444,7 @@ const Typesetting = props => { {/* */} {/* {isSvg ? : } */}
- {!sSvgPath ? : } + {!sSvgPath ? : }