diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 9bf081d6..e9e8ebdc 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) { @@ -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) } @@ -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) } @@ -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}`) @@ -308,6 +307,7 @@ export default function CanvasMenu(props) { const settingsModalOptions = useRecoilState(settingModalFirstOptionsState) useEffect(() => { + console.log(selectedMenu) if (selectedMenu === 'placement') { onClickPlacementInitialMenu() } @@ -316,8 +316,9 @@ export default function CanvasMenu(props) { if (moduleSurfacesArray.length > 0) { initRoofs() moduleSurfacesArray.forEach((moduleSurface) => { - moduleSurface.modules = [] + canvas.remove(...moduleSurface.modules) canvas.remove(moduleSurface) + moduleSurface.modules = [] }) canvas.renderAll() } @@ -423,7 +424,7 @@ export default function CanvasMenu(props) { const checkMenuState = (menu) => { return ( - (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'surface') || + (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'outline') || (selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type)) ) } @@ -543,7 +544,7 @@ export default function CanvasMenu(props) { key={`canvas-menu-${menu.type}`} className={`canvas-menu-item ${selectedMenu === menu.type ? 'active' : ''}`} onClick={async () => { - if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'surface') return + if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'outline') return if (selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type)) return await onClickNav(menu) }} diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx index 2fed8591..bfa86372 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx @@ -456,6 +456,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla