diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 8f6b90c1..1a92cfe8 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -118,7 +118,7 @@ export default function CanvasMenu(props) { const params = { objectNo: objectNo, - planNo: selectedPlan.planNo, + planNo: selectedPlan?.planNo ? selectedPlan.planNo : pid, schDownload: donwloadType, schDrawingFlg: drawingFlg, pwrGnrSimType: pwrGnrSimTypeRecoil.type, @@ -238,10 +238,13 @@ export default function CanvasMenu(props) { await reloadCanvasStatus(objectNo, currentCanvasPlan?.planNo ?? pid) break case 'estimate': - if (!isAllComplete()) { - swalFire({ text: getMessage('estimate.menu.move.valid1') }) - return + if (selectedMenu !== 'simulation') { + if (!isAllComplete()) { + swalFire({ text: getMessage('estimate.menu.move.valid1') }) + return + } } + setIsGlobalLoading(true) promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan?.planNo ?? pid}/detail` }).then((res) => { if (res.status === 200) { @@ -312,7 +315,6 @@ export default function CanvasMenu(props) { const settingsModalOptions = useRecoilState(settingModalFirstOptionsState) useEffect(() => { - console.log(selectedMenu) if (selectedMenu === 'placement') { onClickPlacementInitialMenu() } diff --git a/src/components/simulator/Simulator.jsx b/src/components/simulator/Simulator.jsx index 43beffbb..d59eabe1 100644 --- a/src/components/simulator/Simulator.jsx +++ b/src/components/simulator/Simulator.jsx @@ -18,7 +18,7 @@ import { usePlan } from '@/hooks/usePlan' import { usePopup } from '@/hooks/usePopup' import { QcastContext } from '@/app/QcastProvider' - +import { useCanvasMenu } from '@/hooks/common/useCanvasMenu' export default function Simulator() { // global 로딩바 const { setIsGlobalLoading } = useContext(QcastContext) @@ -34,6 +34,7 @@ export default function Simulator() { const { get } = useAxios() const { getMessage } = useMessage() + const { setSelectedMenu } = useCanvasMenu() // 차트 관련 const [chartData, setChartData] = useState([]) @@ -103,6 +104,7 @@ export default function Simulator() { } useEffect(() => { + setSelectedMenu('simulation') /* 초기화 작업 */ setChartData([]) setObjectDetail({})