From 60064850fd25442c90a735bbe88406f9c222f48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?= <43837214+Minsiki@users.noreply.github.com> Date: Thu, 13 Feb 2025 17:18:07 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EC=8A=B9=EC=95=95=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=ED=8D=BC=EB=B8=94=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?-=20table=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EC=A7=91=EA=B3=84?= =?UTF-8?q?=ED=91=9C=20=EB=B0=98=EC=98=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circuitTrestle/CircuitTrestleSetting.jsx | 1 + .../modal/circuitTrestle/step/StepUp.jsx | 222 +++++++++--------- src/hooks/useCirCuitTrestle.js | 12 +- src/styles/_modal.scss | 59 ++++- 4 files changed, 179 insertions(+), 115 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 736c4f48..d53c1f4f 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -440,6 +440,7 @@ export default function CircuitTrestleSetting({ id }) { seletedOption, setSeletedOption, getModuleList, + setModuleStatisticsData, } // 승압설정 목록 조회 diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index d9398aa7..d8fa01e5 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -28,6 +28,7 @@ export default function StepUp(props) { setSelectedModels, getSelectedPcsItemList, getModuleList, + setModuleStatisticsData, } = props const { getMessage } = useMessage() const { swalFire } = useSwal() @@ -148,6 +149,7 @@ export default function StepUp(props) { }) canvas.renderAll() + setModuleStatisticsData() } else { swalFire({ text: getMessage('common.message.send.error') }) // swalFire({ @@ -467,6 +469,7 @@ export default function StepUp(props) { }) canvas.renderAll() + setModuleStatisticsData() } // 현재 선택된 값들을 가져오는 함수 추가 @@ -511,114 +514,7 @@ export default function StepUp(props) { return ( <>
-
- {/* 3개일때 className = by-max */} - {stepUpListData.map((stepUp, index) => ( -
- {stepUp?.pcsItemList.map((pcsItem, idx) => ( -
-
-
{stepUp.pcsItemList[idx].goodsNo}
-
- - - - - - - - - {pcsItem.serQtyList.map((item, serQtyIdx) => { - return ( - handleRowClick(idx, serQtyIdx)} - style={{ cursor: allocationType === 'auto' ? 'pointer' : 'default' }} - > - - - - ) - })} - -
{getMessage('modal.circuit.trestle.setting.step.up.allocation.serial.amount')}{getMessage('modal.circuit.trestle.setting.step.up.allocation.total.amount')}
{item.serQty}{item.paralQty}
-
-
-
- - -
-
- {(moduleTabs[`${stepUp.pcsItemList[idx].goodsNo}_${idx}`] || 1) === 1 && ( -
-
- - - - - - - - - - - - - - - -
{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}{getMessage('modal.circuit.trestle.setting.power.conditional.select.circuit.amount')}{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}
- {stepUp.pcsItemList[idx].connList?.[0]?.goodsNo ? stepUp.pcsItemList[idx].connList?.[0]?.goodsNo : '-'} - - {stepUp.pcsItemList[idx].connList?.[0]?.connMaxParalCnt - ? (stepUp.pcsItemList[idx].connList?.[0]?.connMaxParalCnt ?? '-') - : '-'} - - {stepUp.pcsItemList[idx].connList?.[0]?.vstuParalCnt ? stepUp.pcsItemList[idx].connList?.[0]?.vstuParalCnt : '-'} -
-
-
- )} - {(moduleTabs[`${stepUp.pcsItemList[idx].goodsNo}_${idx}`] || 1) === 2 && ( -
-
- - - - {/* - */} - - - - - - - - - - -
名称昇圧回路数{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}
--
-
-
- )} -
-
- ))} -
- ))} -
-
+
{getMessage('modal.circuit.trestle.setting.step.up.allocation.select.monitor')} @@ -642,6 +538,116 @@ export default function StepUp(props) { )}
+ +
+
+ {/* 3개일때 className = by-max */} + {stepUpListData.map((stepUp, index) => ( +
+ {stepUp?.pcsItemList.map((pcsItem, idx) => ( +
+
+
{stepUp.pcsItemList[idx].goodsNo}
+
+ + + + + + + + + {pcsItem.serQtyList.map((item, serQtyIdx) => { + return ( + handleRowClick(idx, serQtyIdx)} + style={{ cursor: allocationType === 'auto' ? 'pointer' : 'default' }} + > + + + + ) + })} + +
{getMessage('modal.circuit.trestle.setting.step.up.allocation.serial.amount')}{getMessage('modal.circuit.trestle.setting.step.up.allocation.total.amount')}
{item.serQty}{item.paralQty}
+
+
+
+ + +
+
+ {(moduleTabs[`${stepUp.pcsItemList[idx].goodsNo}_${idx}`] || 1) === 1 && ( +
+
+ + + + + + + + + + + + + + + +
{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}{getMessage('modal.circuit.trestle.setting.power.conditional.select.circuit.amount')}{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}
+ {stepUp.pcsItemList[idx].connList?.[0]?.goodsNo ? stepUp.pcsItemList[idx].connList?.[0]?.goodsNo : '-'} + + {stepUp.pcsItemList[idx].connList?.[0]?.connMaxParalCnt + ? (stepUp.pcsItemList[idx].connList?.[0]?.connMaxParalCnt ?? '-') + : '-'} + + {stepUp.pcsItemList[idx].connList?.[0]?.vstuParalCnt ? stepUp.pcsItemList[idx].connList?.[0]?.vstuParalCnt : '-'} +
+
+
+ )} + {(moduleTabs[`${stepUp.pcsItemList[idx].goodsNo}_${idx}`] || 1) === 2 && ( +
+
+ + + + {/* + */} + + + + + + + + + + +
名称昇圧回路数{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}
--
+
+
+ )} +
+
+ ))} +
+ ))} +
+
) diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js index a0b77644..0d811dfd 100644 --- a/src/hooks/useCirCuitTrestle.js +++ b/src/hooks/useCirCuitTrestle.js @@ -208,7 +208,7 @@ export function useCircuitTrestle() { surface.modules.forEach((module) => { if (!surfaceObjects[surface.id][module.moduleInfo.itemId]) { // 지붕면에 모듈 존재 여부 - surfaceObjects[surface.id][module.moduleInfo.itemId] = new Big(0) // 모듈 초기화 + surfaceObjects[surface.id][module.moduleInfo.itemId] = Big(0) // 모듈 초기화 } surfaceObjects[surface.id][module.moduleInfo.itemId]++ @@ -266,7 +266,7 @@ export function useCircuitTrestle() { }) let ftWpOut = 0 tempRows.forEach((row) => { - ftWpOut = Big(ftWpOut).plus(+row.wpOut).toNumber() + ftWpOut = Big(ftWpOut).plus(Big(row.wpOut)).toNumber() }) const tempFooter = { @@ -277,9 +277,11 @@ export function useCircuitTrestle() { selectedModules.itemList.forEach((module) => { let wpOut = 0 tempRows.forEach((row) => { - wpOut = Big(wpOut) - .plus(+row[module.itemId] ?? 0) - .toNumber() + if (row[module.itemId]) { + wpOut = Big(wpOut) + .plus(Big(row[module.itemId] ?? 0)) + .toNumber() + } }) tempFooter[module.itemId] = wpOut }) diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss index 95db2ea7..b6e2d322 100644 --- a/src/styles/_modal.scss +++ b/src/styles/_modal.scss @@ -142,8 +142,28 @@ $alert-color: #101010; background: url(../../public/static/images/canvas/modal_close.svg)no-repeat center; } } + .modal-body{ + position: relative; padding: 24px; + .left-bar{ + position: absolute; + top: 0; + left: 0; + width: 5px; + height: 100%; + background-color: #000; + cursor: pointer; + } + .right-bar{ + position: absolute; + top: 0; + right: 0; + width: 5px; + height: 100%; + background-color: #000; + cursor: pointer; + } .modal-btn-wrap{ display: flex; align-items: center; @@ -524,7 +544,7 @@ $alert-color: #101010; align-items: center; gap: 10px; &.place{ - gap: 15px; + gap: 33px; .outline-form{ span{ width: fit-content; @@ -1648,7 +1668,6 @@ $alert-color: #101010; .circuit-overflow{ overflow-x: auto; - margin-bottom: 25px; &::-webkit-scrollbar { height: 4px; background-color: transparent; @@ -1666,6 +1685,42 @@ $alert-color: #101010; } } } +.circuit-title-sel{ + padding-bottom: 14px; + .outline-form{ + span{ + color: #62C207; + } + .grid-select{ + .sort-select{ + border: 1px solid #4E9E04; + background-color: #1A3104; + p{ + line-height: 27px; + } + .select-item-wrap{ + background-color: #1A3104; + border: 1px solid #4E9E04; + .select-item:hover{ + background-color: #294e07; + } + &::-webkit-scrollbar { + width: 2px; + background-color: transparent; + + } + &::-webkit-scrollbar-thumb { + background-color: #fff; + border-radius: 10px; + } + &::-webkit-scrollbar-track { + background-color: transparent; + } + } + } + } + } +} .circuit-table-flx-wrap{ display: flex;