样式修改

陈鑫涛
1 parent d164c6f7
Showing 3 changed files with 35 additions and 6 deletions
src/components/Common/BoxShowImgMaterial/indexNew.js
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
@@ -249,7 +249,7 @@ const BoxShowImgMaterial = props =&gt; {
               fontSize: `${size || 11}px`,
               textAlign: "center",
               height: "30px",
-              bottom: `-${20}px`,
+              bottom: `-${80}px`,
               lineHeight: "30px",
             }}
           >
@@ -318,7 +318,7 @@ const BoxShowImgMaterial = props =&gt; {
             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 =&gt; {
             <span
               style={{
                 color: "red",
+                display:'inline-block',
+                marginTop:'10px'
               }}
             >
               {dWlkd}
@@ -43,9 +43,9 @@ const Typesetting = props =&gt; {
   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 =&gt; {
                   }}
                 >
                   <span style={{ color: "red", display: "inline-block", width: "100px" }}>{materialWidth}</span>
+                   {isJuantong ? (
+                    <span
+                      style={{
+                        position: "absolute",
+                        top: '50%',
+                        textAlign: "center",
+                        width: "30px",
+                        writingMode: "vertical-rl",
+                        color: "red",
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "center",
+                        textOrientation: "upright",
+                      }}
+                    >
+                      {"门幅方向"}
+                    </span>
+                  ) : (
+                    ""
+                  )}
+                  {isJuantong ? (
+                    <ArrowRightOutlined
+                      style={{ position: "absolute", fontSize: "30px", top: `${(materialWidth * scaleYD) / 2}px`, left: "-30px" }}
+                    />
+                  ) : (
+                    ""
+                  )}
                   <div
                     style={{
                       position: "absolute",
@@ -1661,7 +1661,7 @@ const BoxComponent = props =&gt; {
     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", "左右刀位");