From 923dbf14bbf9557f980b36e27642936fde68f2a9 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Thu, 6 Feb 2025 11:08:03 +0900 Subject: [PATCH 1/3] =?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=EC=A1=B0=ED=9A=8C=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 2df04fdc..916e28d7 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -52,7 +52,7 @@ export const useTrestle = () => { let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn } = surface.trestleDetail if (!rack) { - //25/01/16 기준 랙이 없는 경우는 그냥 안그려준다. + //25/02/06 가대없음의 경우 랙정보가 없음 return } @@ -105,8 +105,6 @@ export const useTrestle = () => { leftExposedHalfTopModules.length > 0 || rightExposedHalfTopPoints.length > 0 - console.log('isChidory', isChidory) - if (plvrYn === 'N' && isChidory) { alert('치조불가공법입니다.') clear() @@ -619,7 +617,21 @@ export const useTrestle = () => { } } }) - const params = { trestles: surfaces.map((surface) => surface.quotationParam), pcses } + + const allModules = surfaces.map((surface) => surface.modules).flat() + // 모듈 파라미터 생성 + const modules = getModulesParam(allModules) + const trestles = [] + //가대 파라미터 생성 + surfaces.forEach((surface) => { + if (surface.quotationParam) { + trestles.push(surface.quotationParam) + } + }) + + // trestles 배열에서 null인 경우 제거 + const params = { trestles, pcses, modules } + //견적서 itemList 조회 const { data: itemList, data2, result } = await getQuotationItem(params) @@ -1883,7 +1895,7 @@ export const useTrestle = () => { cvrYn: moduleSelection.construction.setupCover ? 'Y' : 'N', snowGdYn: moduleSelection.construction.setupSnowCover ? 'Y' : 'N', plvrYn: cvrPlvrYn, - modules: getModules(surface), + // modules: getModules(surface), // 2025-02-06 api 수정 trestleMkrCd, constMthdCd, roofBaseCd, @@ -1895,10 +1907,9 @@ export const useTrestle = () => { } } - const getModules = (surface) => { - const { modules } = surface - - const params = modules.map((module, index) => { + // 전체 모듈 파라미터 생성 + const getModulesParam = (allModules) => { + const params = allModules.map((module, index) => { return { moduleTpCd: module.moduleInfo.itemTp, moduleItemId: module.moduleInfo.itemId, From 05dbf50bb71b3cc8593c1a71f04fbd95a9476565 Mon Sep 17 00:00:00 2001 From: LEEYONGJAE Date: Thu, 6 Feb 2025 11:15:40 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=B0=9C=EC=A0=84=EC=8B=9C=EB=AE=AC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20excel/pdf=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 2 +- src/components/simulator/Simulator.jsx | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 68808aa9..f00e292f 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -112,7 +112,7 @@ export default function CanvasMenu(props) { const params = { objectNo: objectNo, - planNo: pid, + planNo: selectedPlan.planNo, schDownload: donwloadType, schDrawingFlg: drawingFlg, pwrGnrSimType: pwrGnrSimTypeRecoil.type, diff --git a/src/components/simulator/Simulator.jsx b/src/components/simulator/Simulator.jsx index 306b5365..f7f09969 100644 --- a/src/components/simulator/Simulator.jsx +++ b/src/components/simulator/Simulator.jsx @@ -176,7 +176,6 @@ export default function Simulator() { const [content, setContent] = useState('') const fetchSimulatorNotice = async () => { - setIsGlobalLoading(true) get({ url: '/api/pwrGnrSimulation/guideInfo' }).then((res) => { if (res.data) { setContent(res.data.replaceAll('\n', '
')) @@ -184,7 +183,6 @@ export default function Simulator() { setContent(getMessage('common.message.no.data')) } }) - setIsGlobalLoading(false) } // 차트 데이터 변경 시, list type 셋팅 From 316c3483c86a939c52c8ef70bfe99bc3cf126213 Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 6 Feb 2025 11:59:30 +0900 Subject: [PATCH 3/3] =?UTF-8?q?key=20=EC=A4=91=EB=B3=B5=20=EA=B2=BD?= =?UTF-8?q?=EA=B3=A0=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index b5d8bce0..18fd2343 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -1188,7 +1188,7 @@ export default function Estimate({}) { @@ -1206,7 +1206,7 @@ export default function Estimate({}) { @@ -1297,13 +1297,13 @@ export default function Estimate({}) { //사양시공 let constructSpecificationMulti = estimateContextState?.constructSpecificationMulti?.split('、') return ( -
+
- +
{constructSpecificationMulti ? (
- +
) : null}
@@ -1316,7 +1316,6 @@ export default function Estimate({}) { {getMessage('estimate.detail.remarks')}
- {/* */}