From 3b8234b5a2528536292486a7a60cfcbf709fccc3 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 3 Feb 2025 21:19:37 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/CircuitTrestleSetting.jsx | 12 ++++++++---- .../floor-plan/modal/circuitTrestle/step/StepUp.jsx | 2 +- src/hooks/module/useTrestle.js | 7 +++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index cd204c15..4ec0c08a 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -366,6 +366,7 @@ export default function CircuitTrestleSetting({ id }) { }) console.log(canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)) + apply() } const onClickPrev = () => { @@ -443,11 +444,14 @@ export default function CircuitTrestleSetting({ id }) { pcsMkrCd: item.pcsMkrCd, pcsSerCd: item.pcsSerCd, pcsItemId: item.itemId, - pcsOptCd: seletedOption.code, + pscOptCd: seletedOption.code, + // pcsOptCd: 'CLC_RMC', paralQty: serQty.paralQty, - connections: { - connItemId: item.connList[0].itemId, - }, + connections: [ + { + connItemId: item.connList[0].itemId, + }, + ], } })[0] }) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index f92eb3ef..9f558f16 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -65,7 +65,7 @@ export default function StepUp(props) { // PCS 옵션 조회 const formattedOptCodes = formatOptionCodes(res.data.optionList) setOptCodes(formattedOptCodes) - setSeletedOption(formattedOptCodes[0].code) + setSeletedOption(formattedOptCodes[0]) } } catch (error) { console.error('Error fetching step up data:', error) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index f9aa1de0..8f1ed94c 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -194,7 +194,6 @@ export const useTrestle = () => { height = Math.floor(height) let { x: startX, y: startY } = { ...module.getCenterPoint() } let { x, y } = { ...module.getCenterPoint() } - //TODO : 방향별로 가대 설치해야함 let leftRows = 1 let rightRows = 1 @@ -446,9 +445,9 @@ export const useTrestle = () => { const getQuoationItems = () => { const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) - const params = { trestles: surfaces.map((surface) => surface.quotationParam), pcses: [] } + const params = { trestles: surfaces.map((surface) => surface.quotationParam), pcses: surfaces[0].pcses ?? [] } getQuotationItem(params).then((res) => { - console.log(res) + console.log('res', res) }) } @@ -1884,7 +1883,7 @@ export const useTrestle = () => { const clear = () => { canvas.getObjects().forEach((obj) => { - if (obj.name === 'eaveBar' || obj.name === 'rack' || obj.name === 'halfEaveBar' || obj.name === 'smartRack') { + if (obj.name === 'eaveBar' || obj.name === 'rack' || obj.name === 'halfEaveBar' || obj.name === 'smartRack' || obj.name === 'bracket') { canvas.remove(obj) } })