Compare commits

..

No commits in common. "5dae6c37388de894782ca838cae669ee730c3f83" and "e3ae71a16125ffc7b557e41212d0f6e48f90acbe" have entirely different histories.

2 changed files with 6 additions and 10 deletions

View File

@ -118,7 +118,7 @@ export default function CanvasMenu(props) {
const params = {
objectNo: objectNo,
planNo: selectedPlan?.planNo ? selectedPlan.planNo : pid,
planNo: selectedPlan.planNo,
schDownload: donwloadType,
schDrawingFlg: drawingFlg,
pwrGnrSimType: pwrGnrSimTypeRecoil.type,
@ -238,13 +238,10 @@ export default function CanvasMenu(props) {
await reloadCanvasStatus(objectNo, currentCanvasPlan?.planNo ?? pid)
break
case 'estimate':
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) {
@ -315,6 +312,7 @@ export default function CanvasMenu(props) {
const settingsModalOptions = useRecoilState(settingModalFirstOptionsState)
useEffect(() => {
console.log(selectedMenu)
if (selectedMenu === 'placement') {
onClickPlacementInitialMenu()
}

View File

@ -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,7 +34,6 @@ export default function Simulator() {
const { get } = useAxios()
const { getMessage } = useMessage()
const { setSelectedMenu } = useCanvasMenu()
//
const [chartData, setChartData] = useState([])
@ -104,7 +103,6 @@ export default function Simulator() {
}
useEffect(() => {
setSelectedMenu('simulation')
/* 초기화 작업 */
setChartData([])
setObjectDetail({})