diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx index e9da38b3..61869db0 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -2,7 +2,7 @@ import { GlobalDataContext } from '@/app/GlobalDataProvider' import { POLYGON_TYPE } from '@/common/common' import { useMessage } from '@/hooks/useMessage' import { canvasState } from '@/store/canvasAtom' -import { modelState } from '@/store/circuitTrestleAtom' +import { modelState, moduleStatisticsState } from '@/store/circuitTrestleAtom' import { selectedModuleState } from '@/store/selectedModuleOptions' import { useContext, useEffect, useState } from 'react' import { useRecoilValue } from 'recoil' @@ -19,15 +19,16 @@ export default function PassivityCircuitAllocation() { const canvas = useRecoilValue(canvasState) const selectedModules = useRecoilValue(selectedModuleState) const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext) + const { header, rows, footer } = useRecoilValue(moduleStatisticsState) const [moduleData, setModuleData] = useState({ - header: [], - rows: [], + header: header, + rows: rows, + footer: footer, }) const model = useRecoilValue(modelState) const [selectedModels, setSelectedModels] = useState(model.selectedModels) const [selectedPcs, setSelectedPcs] = useState(selectedModels[0]) const [totalWpout, setTotalWpout] = useState(0) - useEffect(() => { setSurfaceInfo() if (!managementState) { diff --git a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx index fa4f82f6..aff0926b 100644 --- a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx +++ b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx @@ -4,7 +4,7 @@ import { useState } from 'react' import { useMessage } from '@/hooks/useMessage' import WithDraggable from '@/components/common/draggable/WithDraggable' import { moduleStatisticsState } from '@/store/circuitTrestleAtom' -import { useRecoilValue } from 'recoil' +import { useRecoilValue, useResetRecoilState } from 'recoil' export default function PanelBatchStatistics() { const { getMessage } = useMessage() @@ -24,23 +24,23 @@ export default function PanelBatchStatistics() {
| {item.name} | + {header.map((item, index) => ( +{item.name} | ))}|
|---|---|---|
| {item.prop === 'name' ? item.name : item.prop === 'powerGeneration' ? item.powerGeneration : item.amount} | -{row[item.prop]} | +{row[item.prop]} | ))}
| {item} | + {footer.map((item, index) => ( +{typeof item === 'number' ? item.toLocaleString('ko-KR', { maximumFractionDigits: 4 }) : item} | //{item.amount} | ))}