diff --git a/src/components/Common/BoxShowImgMaterial/indexNew.js b/src/components/Common/BoxShowImgMaterial/indexNew.js index 7b14875..9b55f54 100644 --- a/src/components/Common/BoxShowImgMaterial/indexNew.js +++ b/src/components/Common/BoxShowImgMaterial/indexNew.js @@ -249,7 +249,7 @@ const BoxShowImgMaterial = props => { fontSize: `${size || 11}px`, textAlign: "center", height: "30px", - bottom: `-${20}px`, + bottom: `-${80}px`, lineHeight: "30px", }} > @@ -318,7 +318,7 @@ const BoxShowImgMaterial = props => { style={{ position: "absolute", top: "0", - right: "-20px", + right: "-80px", height: `${dWlkd * scaleY}px`, lineHeight: `${dWlkd * scaleY}px`, fontSize: `${size || 11}px`, @@ -347,6 +347,8 @@ const BoxShowImgMaterial = props => { {dWlkd} diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js index ecee754..fd54248 100644 --- a/src/components/Common/Typesetting/typesetting.js +++ b/src/components/Common/Typesetting/typesetting.js @@ -43,9 +43,9 @@ const Typesetting = props => { if (!masterData) return; // 如果是卷筒类 那么上下左右留白等于左留白 if (selectedNode && selectedNode.sTypeKey === "juantong") { - dSBLB = dZBLB; - dXBLB = dZBLB; - dYBLB = dZBLB; + dXBLB = dSBLB; + dZBLB = 0 + dYBLB = 0 } // 生成盒子图片 const [boxKey, setBoxKey] = useState(new Date().getTime()); @@ -1198,6 +1198,33 @@ const Typesetting = props => { }} > {materialWidth} + {isJuantong ? ( + + {"门幅方向"} + + ) : ( + "" + )} + {isJuantong ? ( + + ) : ( + "" + )}
{ if (iTag === 20) { let showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; if (selectedNode.sTypeKey === "juantong") { - showNameKeyList = ["dZBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; + showNameKeyList = ["dSBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; } const UlToolPosition = commonFunc.showLocalMessage(props, "UlToolPosition", "上下刀位"); const RLToolPosition = commonFunc.showLocalMessage(props, "RLToolPosition", "左右刀位");