Commit e55278aaec4cb5a02302d869f9ceb21fc4112bb7
1 parent
d164c6f7
样式修改
Showing
3 changed files
with
35 additions
and
6 deletions
src/components/Common/BoxShowImgMaterial/indexNew.js
| @@ -249,7 +249,7 @@ const BoxShowImgMaterial = props => { | @@ -249,7 +249,7 @@ const BoxShowImgMaterial = props => { | ||
| 249 | fontSize: `${size || 11}px`, | 249 | fontSize: `${size || 11}px`, |
| 250 | textAlign: "center", | 250 | textAlign: "center", |
| 251 | height: "30px", | 251 | height: "30px", |
| 252 | - bottom: `-${20}px`, | 252 | + bottom: `-${80}px`, |
| 253 | lineHeight: "30px", | 253 | lineHeight: "30px", |
| 254 | }} | 254 | }} |
| 255 | > | 255 | > |
| @@ -318,7 +318,7 @@ const BoxShowImgMaterial = props => { | @@ -318,7 +318,7 @@ const BoxShowImgMaterial = props => { | ||
| 318 | style={{ | 318 | style={{ |
| 319 | position: "absolute", | 319 | position: "absolute", |
| 320 | top: "0", | 320 | top: "0", |
| 321 | - right: "-20px", | 321 | + right: "-80px", |
| 322 | height: `${dWlkd * scaleY}px`, | 322 | height: `${dWlkd * scaleY}px`, |
| 323 | lineHeight: `${dWlkd * scaleY}px`, | 323 | lineHeight: `${dWlkd * scaleY}px`, |
| 324 | fontSize: `${size || 11}px`, | 324 | fontSize: `${size || 11}px`, |
| @@ -347,6 +347,8 @@ const BoxShowImgMaterial = props => { | @@ -347,6 +347,8 @@ const BoxShowImgMaterial = props => { | ||
| 347 | <span | 347 | <span |
| 348 | style={{ | 348 | style={{ |
| 349 | color: "red", | 349 | color: "red", |
| 350 | + display:'inline-block', | ||
| 351 | + marginTop:'10px' | ||
| 350 | }} | 352 | }} |
| 351 | > | 353 | > |
| 352 | {dWlkd} | 354 | {dWlkd} |
src/components/Common/Typesetting/typesetting.js
| @@ -43,9 +43,9 @@ const Typesetting = props => { | @@ -43,9 +43,9 @@ const Typesetting = props => { | ||
| 43 | if (!masterData) return; | 43 | if (!masterData) return; |
| 44 | // 如果是卷筒类 那么上下左右留白等于左留白 | 44 | // 如果是卷筒类 那么上下左右留白等于左留白 |
| 45 | if (selectedNode && selectedNode.sTypeKey === "juantong") { | 45 | if (selectedNode && selectedNode.sTypeKey === "juantong") { |
| 46 | - dSBLB = dZBLB; | ||
| 47 | - dXBLB = dZBLB; | ||
| 48 | - dYBLB = dZBLB; | 46 | + dXBLB = dSBLB; |
| 47 | + dZBLB = 0 | ||
| 48 | + dYBLB = 0 | ||
| 49 | } | 49 | } |
| 50 | // 生成盒子图片 | 50 | // 生成盒子图片 |
| 51 | const [boxKey, setBoxKey] = useState(new Date().getTime()); | 51 | const [boxKey, setBoxKey] = useState(new Date().getTime()); |
| @@ -1198,6 +1198,33 @@ const Typesetting = props => { | @@ -1198,6 +1198,33 @@ const Typesetting = props => { | ||
| 1198 | }} | 1198 | }} |
| 1199 | > | 1199 | > |
| 1200 | <span style={{ color: "red", display: "inline-block", width: "100px" }}>{materialWidth}</span> | 1200 | <span style={{ color: "red", display: "inline-block", width: "100px" }}>{materialWidth}</span> |
| 1201 | + {isJuantong ? ( | ||
| 1202 | + <span | ||
| 1203 | + style={{ | ||
| 1204 | + position: "absolute", | ||
| 1205 | + top: '50%', | ||
| 1206 | + textAlign: "center", | ||
| 1207 | + width: "30px", | ||
| 1208 | + writingMode: "vertical-rl", | ||
| 1209 | + color: "red", | ||
| 1210 | + display: "flex", | ||
| 1211 | + alignItems: "center", | ||
| 1212 | + justifyContent: "center", | ||
| 1213 | + textOrientation: "upright", | ||
| 1214 | + }} | ||
| 1215 | + > | ||
| 1216 | + {"门幅方向"} | ||
| 1217 | + </span> | ||
| 1218 | + ) : ( | ||
| 1219 | + "" | ||
| 1220 | + )} | ||
| 1221 | + {isJuantong ? ( | ||
| 1222 | + <ArrowRightOutlined | ||
| 1223 | + style={{ position: "absolute", fontSize: "30px", top: `${(materialWidth * scaleYD) / 2}px`, left: "-30px" }} | ||
| 1224 | + /> | ||
| 1225 | + ) : ( | ||
| 1226 | + "" | ||
| 1227 | + )} | ||
| 1201 | <div | 1228 | <div |
| 1202 | style={{ | 1229 | style={{ |
| 1203 | position: "absolute", | 1230 | position: "absolute", |
src/components/QuickQuote/index.jsx
| @@ -1661,7 +1661,7 @@ const BoxComponent = props => { | @@ -1661,7 +1661,7 @@ const BoxComponent = props => { | ||
| 1661 | if (iTag === 20) { | 1661 | if (iTag === 20) { |
| 1662 | let showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; | 1662 | let showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; |
| 1663 | if (selectedNode.sTypeKey === "juantong") { | 1663 | if (selectedNode.sTypeKey === "juantong") { |
| 1664 | - showNameKeyList = ["dZBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; | 1664 | + showNameKeyList = ["dSBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; |
| 1665 | } | 1665 | } |
| 1666 | const UlToolPosition = commonFunc.showLocalMessage(props, "UlToolPosition", "上下刀位"); | 1666 | const UlToolPosition = commonFunc.showLocalMessage(props, "UlToolPosition", "上下刀位"); |
| 1667 | const RLToolPosition = commonFunc.showLocalMessage(props, "RLToolPosition", "左右刀位"); | 1667 | const RLToolPosition = commonFunc.showLocalMessage(props, "RLToolPosition", "左右刀位"); |