- 버그 수정
This commit is contained in:
parent
bac63e23ea
commit
75bc0ac8a2
@ -7,8 +7,9 @@ import { useCanvasSetting } from '@/hooks/option/useCanvasSetting'
|
|||||||
import { usePopup } from '@/hooks/usePopup'
|
import { usePopup } from '@/hooks/usePopup'
|
||||||
import '@/styles/contents.scss'
|
import '@/styles/contents.scss'
|
||||||
import { notFound, useSearchParams } from 'next/navigation'
|
import { notFound, useSearchParams } from 'next/navigation'
|
||||||
import { useRecoilState } from 'recoil'
|
import { useRecoilState, useResetRecoilState } from 'recoil'
|
||||||
import { correntObjectNoState } from '@/store/settingAtom'
|
import { correntObjectNoState } from '@/store/settingAtom'
|
||||||
|
import { currentMenuState } from '@/store/canvasAtom'
|
||||||
|
|
||||||
export default function FloorPlan({ children }) {
|
export default function FloorPlan({ children }) {
|
||||||
const [correntObjectNo, setCurrentObjectNo] = useRecoilState(correntObjectNoState)
|
const [correntObjectNo, setCurrentObjectNo] = useRecoilState(correntObjectNoState)
|
||||||
@ -19,6 +20,12 @@ export default function FloorPlan({ children }) {
|
|||||||
const { closeAll } = usePopup()
|
const { closeAll } = usePopup()
|
||||||
const { menuNumber, setMenuNumber } = useCanvasMenu()
|
const { menuNumber, setMenuNumber } = useCanvasMenu()
|
||||||
const { fetchSettings, fetchBasicSettings } = useCanvasSetting()
|
const { fetchSettings, fetchBasicSettings } = useCanvasSetting()
|
||||||
|
const resetCurrentMenu = useResetRecoilState(currentMenuState)
|
||||||
|
useEffect(() => {
|
||||||
|
return () => {
|
||||||
|
resetCurrentMenu()
|
||||||
|
}
|
||||||
|
}, [])
|
||||||
|
|
||||||
// URL 파라미터에서 objectNo 설정
|
// URL 파라미터에서 objectNo 설정
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@ -50,9 +50,7 @@ export default function PanelBatchStatistics() {
|
|||||||
{rows.map((row, index) => (
|
{rows.map((row, index) => (
|
||||||
<tr key={`statistic-row-${index}`}>
|
<tr key={`statistic-row-${index}`}>
|
||||||
{header.map((item, i) => (
|
{header.map((item, i) => (
|
||||||
<td key={`statistic-col-${i}`}>
|
<td key={`statistic-col-${i}`}>{row[item.prop] ?? 0}</td>
|
||||||
{typeof row[item.prop] === 'number' ? row[item.prop].toLocaleString('ko-KR', { maximumFractionDigits: 4 }) : row[item.prop]}
|
|
||||||
</td>
|
|
||||||
))}
|
))}
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@ -188,7 +188,8 @@ export function useCircuitTrestle() {
|
|||||||
roofSurfaceList.forEach((surface) => {
|
roofSurfaceList.forEach((surface) => {
|
||||||
surface.modules = modules.filter((module) => module.surfaceId === surface.id)
|
surface.modules = modules.filter((module) => module.surfaceId === surface.id)
|
||||||
})
|
})
|
||||||
if (!moduleSelectionData.module || moduleSelectionData.module?.itemList?.length === 0) return
|
// console.log(moduleSelectionData)
|
||||||
|
if (!moduleSelectionData || !moduleSelectionData.module || moduleSelectionData.module?.itemList?.length === 0) return
|
||||||
const tempHeader = [
|
const tempHeader = [
|
||||||
{ name: getMessage('simulator.table.sub1'), prop: 'name' },
|
{ name: getMessage('simulator.table.sub1'), prop: 'name' },
|
||||||
{ name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' },
|
{ name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' },
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user