排版

陈鑫涛
1 parent de832460
Showing 3 changed files with 10 additions and 32 deletions
src/components/Common/BoxShowImgMaterial/indexNew.js
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
@@ -219,7 +219,7 @@ const BoxShowImgMaterial = props =&gt; {
               fontSize: `${size || 11}px`,
               textAlign: "center",
               height: "30px",
-              bottom: `-${100}px`,
+              bottom: `-${20}px`,
               lineHeight: "30px",
             }}
           >
@@ -288,7 +288,7 @@ const BoxShowImgMaterial = props =&gt; {
             style={{
               position: "absolute",
               top: "0",
-              right: "-140px",
+              right: "-20px",
               height: `${dWlkd * scaleY}px`,
               lineHeight: `${dWlkd * scaleY}px`,
               fontSize: `${size || 11}px`,
@@ -202,7 +202,6 @@ const Typesetting = props =&gt; {
   const boxWidthOffset = evaluateFormula(sSecondLongitudinalOffset, variabless); // 第二列纵向偏移
   const isVertical = sSettingMethod === "从上到下"; // true 表示竖向排列，false 表示横向排列 sSettingMethod === '从上到下'
   const reference = sSGroupOffset === "首盒"; // 第三列参考
-  console.log(innerWidth, innerHeight, dFWidthOffset, dFLengthOffset, dSWidthOffset, dSLengthOffset, boxLengthOffset, boxWidthOffset, "typeSetting");
   // 计算内层盒子尺寸 加上间距
   let jInnerHeight = innerHeight;
@@ -227,8 +226,6 @@ const Typesetting = props =&gt; {
 ? Math.max(jInnerWidth + dFLengthOffset, jInnerWidth + dSLengthOffset) + dYBJJ
     : jInnerWidth * 2 + dSLengthOffset + dFLengthOffset + dYBJJ;
-    console.log(innerWidthCombined,dFLengthOffset,dSLengthOffset,jInnerWidth,'innerHeightCombined');
-    console.log(innerHeightCombined,dFWidthOffset,dSWidthOffset,innerHeightCombined,'innerHeightCombined');
   const style = {
     width: `${outerWidth}px`,
@@ -273,16 +270,7 @@ const Typesetting = props =&gt; {
   const isCustomized = bAdvancedSetting;
   let remaining = isVertical ? commonHeightCheck : commonWidthCheck;
-  console.log('剩余长',remainingWidth);
-  console.log('剩余高',remainingHeight);
-  console.log('剩余长是否放下',commonWidthCheck);
-  console.log('剩余高是否放下',commonHeightCheck);
-  console.log('剩余是否放下',remaining,cols,rows);
-  console.log('剩余 总高 盒高' , outerHeight, rowsCombined);
-  console.log('剩余 总长 盒长' , outerWidth, dSWidthOffsetCombined);
-  console.log('剩余 根据列排最大长高',colsMaxLength,rowsMaxLength);
-  console.log('剩余 一组盒长盒高', innerWidthCombined,innerHeightCombined,boxLengthOffset,boxWidthOffset);
-  console.log('剩余 次盒偏移量',dSLengthOffset,dSWidthOffset);
+
@@ -588,7 +576,6 @@ const Typesetting = props =&gt; {
     const propsDataHeight = Number(propsData.props.style.height.slice(0, -2));
     const propsDataTop = Number(propsData.props.style.top.slice(0, -2));
     // 判断列是否是单独的
-    console.log(propsDataLeft, propsDataWidth, propsDataHeight, propsDataTop, "propsDataLeft propsDataWidth propsDataHeight propsDataTop");
     const newMaterialLength = parseFloat(propsDataLeft + (remaining ? jInnerWidth : innerWidthCombined)  + dZBLB + dYBLB).toFixed(2); // 原纸长
     const newMaterialWidth = parseFloat(propsDataTop + propsDataHeight + dSBLB + dXBLB).toFixed(2);
@@ -713,16 +700,7 @@ const Typesetting = props =&gt; {
     Number(slaveDataDetail?.dMaxWidth) >= Number(slaveRowData?.dMachineWidth);
   const isShow =  slaveRowData && slaveRowData.dMachineLength && slaveRowData.dMaxWidth && slaveRowData.dMaxLength && isMax && innerDivs.length > 0;
-  console.log(
-    slaveDataDetail?.dMaxLength,
-    slaveDataDetail?.dMaxWidth,
-    slaveRowData?.dMachineLength,
-    slaveRowData?.dMachineWidth,
-    innerDivs,
-    isMax,
-    isShow,
-    "isMax"
-  );
+
   const confirmParam = commonFunc.showLocalMessage(props, "confirmParam", "排版尺寸大于上机尺寸，请确认参数!");
   if (isCustomized && !isShow) {
@@ -916,7 +894,7 @@ const Typesetting = props =&gt; {
                 style={{
                   position: "absolute",
                   left: 0,
-                  bottom: "-70px",
+                  bottom: "-30px",
                   textAlign: "center",
                   width: `${maxWidth * scaleXD}px`,
                   height: "30px",
@@ -969,7 +947,7 @@ const Typesetting = props =&gt; {
               <div
                 style={{
                   position: "absolute",
-                  right: "-120px",
+                  right: "-10px",
                   top: 0,
                   textAlign: "center",
                   width: `${30}px`,
@@ -1266,7 +1244,7 @@ const Typesetting = props =&gt; {
                 style={{
                   position: "absolute",
                   left: 0,
-                  bottom: "-70px",
+                  bottom: "-30px",
                   textAlign: "center",
                   width: `${maxWidth}px`,
                   height: "30px",
@@ -1332,7 +1310,7 @@ const Typesetting = props =&gt; {
               <div
                 style={{
                   position: "absolute",
-                  right: "-90px",
+                  right: "-40px",
                   top: 0,
                   textAlign: "center",
                   width: `${30}px`,
@@ -1922,8 +1922,8 @@ const BoxComponent = props =&gt; {
             100
           ).toFixed(2)
         ),
-        dWlcd: dWlcd,
-        dWlkd: dWlkd,
+        dWlcd:slaveData[index].dWlcd || dWlcd,
+        dWlkd: slaveData[index].dWlkd || dWlkd,
         dMachineQty: Math.floor(dProductQty / dSinglePQty),
         dSinglePQty: dSinglePQty,
         dMaterialsKQty: dMaterialsKQty,