From 9561cd077c7d681bb31484d4a0d35bee802f6207 Mon Sep 17 00:00:00 2001 From: yjnoh Date: Tue, 25 Feb 2025 10:05:52 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=94=94=EB=B2=84=EA=B9=85=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useModuleBasicSetting.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js index 224e088f..1d86e5bf 100644 --- a/src/hooks/module/useModuleBasicSetting.js +++ b/src/hooks/module/useModuleBasicSetting.js @@ -1333,9 +1333,9 @@ export function useModuleBasicSetting(tabNum) { installedLastHeightCoord = moduleY + height + heightMargin } else { //디버깅용 - tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 }) - canvas?.add(tempModule) - canvas.renderAll() + // tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 }) + // canvas?.add(tempModule) + // canvas.renderAll() } } if (isInstall) { @@ -1643,9 +1643,9 @@ export function useModuleBasicSetting(tabNum) { // } } else { //디버깅용 - tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 }) - canvas?.add(tempModule) - canvas.renderAll() + // tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 }) + // canvas?.add(tempModule) + // canvas.renderAll() } } @@ -2625,7 +2625,7 @@ export function useModuleBasicSetting(tabNum) { * 스냅기능 */ let snapDistance = 10 - let cellSnapDistance = 20 + let cellSnapDistance = 50 let intvHor = flowDirection === 'south' || flowDirection === 'north' ? 1 : 3 let intvVer = flowDirection === 'south' || flowDirection === 'north' ? 3 : 1 From dc1c2311f96069da84f70c9125139d12aaf9c6a3 Mon Sep 17 00:00:00 2001 From: LEEYONGJAE Date: Tue, 25 Feb 2025 10:06:31 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=B0=9C=EC=A0=84=EC=8B=9C=EB=AC=BC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=BA=94=EB=B2=84=EC=8A=A4?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20index=EC=97=90=EC=84=9C=20type=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 9bf081d6..d76d4519 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -257,7 +257,7 @@ export default function CanvasMenu(props) { } }) break - case 6: + case 'simulation': setIsGlobalLoading(true) promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { if (res.status === 200) { @@ -265,7 +265,7 @@ export default function CanvasMenu(props) { if (estimateDetail.estimateDate !== null && estimateDetail.docNo) { setSelectedMenu(menu.type) setCurrentMenu(menu.title) - router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) + router.push(`/floor-plan/simulator/6?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) if (pathname === '/floor-plan/simulator/6') { setIsGlobalLoading(false) } From 4da4bd5959e5fba716cb208dc7db33ef2e3212b0 Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 25 Feb 2025 10:07:38 +0900 Subject: [PATCH 3/4] =?UTF-8?q?CanvasMenu=20case=EB=AC=B8=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88,=ED=9A=8C=EB=A1=9C=EA=B5=AC=EC=84=B1/=EA=B2=AC?= =?UTF-8?q?=EC=A0=81=EC=84=9C/=EB=B0=9C=EC=A0=84=EC=8B=9C=EB=AE=AC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=ED=83=AD=204,5,6=20->=20'module'?= =?UTF-8?q?,=20'estimate',=20'simulation'=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 7 +++---- src/store/menuAtom.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 9bf081d6..356b461e 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -222,7 +222,7 @@ export default function CanvasMenu(props) { } await reloadCanvasStatus(objectNo, pid) break - case 4: + case 'module': if (selectedMenu < menu.index) { if (!checkMenuAndCanvasState()) { swalFire({ text: getMessage('menu.validation.canvas.roof') }) @@ -236,7 +236,7 @@ export default function CanvasMenu(props) { } await reloadCanvasStatus(objectNo, pid) break - case 5: + case 'estimate': setIsGlobalLoading(true) promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { if (res.status === 200) { @@ -257,7 +257,7 @@ export default function CanvasMenu(props) { } }) break - case 6: + case 'simulation': setIsGlobalLoading(true) promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { if (res.status === 200) { @@ -283,7 +283,6 @@ export default function CanvasMenu(props) { setCurrentMenu(menu.title) } if (pathname !== '/floor-plan') { - // if (menu.index !== 0 ) { //견적서 or 발전시뮬레이션 탭에서 같은 탭 클릭시 화면 이동했다 돌아오지않도록.. if (menu.type !== 'drawing' && menu.type !== 'estimate' && menu.type !== 'simulation') { router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) diff --git a/src/store/menuAtom.js b/src/store/menuAtom.js index 0254cbb9..6cfa656c 100644 --- a/src/store/menuAtom.js +++ b/src/store/menuAtom.js @@ -14,7 +14,7 @@ export const selectedMenuState = atom({ export const menusState = atom({ key: 'menusState', default: [ - { type: 'drawing', name: 'plan.menu.plan.drawing', icon: 'con00', title: MENU.PLAN_DRAWING }, //. 도면 작성 + { type: 'drawing', name: 'plan.menu.plan.drawing', icon: 'con00', title: MENU.PLAN_DRAWING }, //. 물건정보 { type: 'placement', // 배치면 초기설정 name: 'plan.menu.placement.surface.initial.setting', From 1f5ea792799656cd229d2434dbdd9a3cc4dda5eb Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 25 Feb 2025 10:12:17 +0900 Subject: [PATCH 4/4] =?UTF-8?q?CanvasMenu=20=EA=B2=AC=EC=A0=81=EC=84=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=EB=A9=94=EB=89=B4=EB=B2=88=ED=98=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 80c48640..108ff52d 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -246,7 +246,7 @@ export default function CanvasMenu(props) { setCurrentMenu(menu.title) setFloorPlanObjectNo({ floorPlanObjectNo: objectNo }) setIsGlobalLoading(false) - router.push(`/floor-plan/estimate/${menu.type}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) + router.push(`/floor-plan/estimate/5?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) if (pathname === '/floor-plan/estimate/5') { setIsGlobalLoading(false) }