diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
index 555ec619..75dba1a3 100644
--- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
@@ -95,7 +95,8 @@ export default function CircuitTrestleSetting({ id }) {
return
}
- setAllocationType(ALLOCATION_TYPE.AUTO)
+ // setAllocationType(ALLOCATION_TYPE.AUTO)
+ setTabNum(2)
}
const onPassivityAllocation = () => {
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
index 0898de1c..a3f69548 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
@@ -4,16 +4,11 @@ import { useMessage } from '@/hooks/useMessage'
import { canvasState } from '@/store/canvasAtom'
import { modelState, pcsCheckState } from '@/store/circuitTrestleAtom'
import { selectedModuleState } from '@/store/selectedModuleOptions'
-import { useContext, useState } from 'react'
-import { useRecoilState } from 'recoil'
-import { useState } from 'react'
-import { useRecoilValue } from 'recoil'
+import { useContext, useEffect, useState } from 'react'
+import { useRecoilState, useRecoilValue } from 'recoil'
import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
import { canvasPopupStatusStore } from '@/store/canvasPopupStatusAtom'
-import { useMessage } from '@/hooks/useMessage'
-import QSelectBox from '@/components/common/select/QSelectBox'
-
-const SelectOption01 = [{ name: '0' }, { name: '0' }, { name: '0' }, { name: '0' }]
+import { useMasterController } from '@/hooks/common/useMasterController'
export default function StepUp({}) {
const { getMessage } = useMessage()
@@ -25,6 +20,7 @@ export default function StepUp({}) {
const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
const canvas = useRecoilValue(canvasState)
const selectedModules = useRecoilValue(selectedModuleState)
+
useEffect(() => {
if (!managementState) {
console.log('๐ ~ useEffect ~ managementState:', managementState)
@@ -71,7 +67,6 @@ export default function StepUp({}) {
getPcsAutoRecommendList(params)
}, [])
-
useCanvasPopupStatusController(6)
const canvasPopupStatusState = useRecoilValue(canvasPopupStatusStore)
if (Object.keys(canvasPopupStatusState[6]).length !== 0) {
@@ -186,7 +181,7 @@ export default function StepUp({}) {
{getMessage('modal.circuit.trestle.setting.step.up.allocation.select.monitor')}
-
+
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 5ace632a..cd2e4469 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -1,16 +1,27 @@
+import { GlobalDataContext } from '@/app/GlobalDataProvider'
import { useMessage } from '@/hooks/useMessage'
+import { canvasState } from '@/store/canvasAtom'
import { modelState } from '@/store/circuitTrestleAtom'
import { selectedModuleState } from '@/store/selectedModuleOptions'
-import { useEffect, useState } from 'react'
+import { useContext, useEffect, useState } from 'react'
import { useRecoilValue } from 'recoil'
+const DIRECTION = {
+ north: 'ๅ',
+ south: 'ๅ',
+ west: '่ฅฟ',
+ east: 'ๆฑ',
+}
+
export default function PassivityCircuitAllocation() {
const { getMessage } = useMessage()
+ const canvas = useRecoilValue(canvasState)
const selectedModules = useRecoilValue(selectedModuleState)
+ const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
const moduleData = {
header: [
{ name: getMessage('modal.panel.batch.statistic.roof.shape'), prop: 'roofShape' },
- { name: getMessage('modal.circuit.trestle.setting.circuilt'), prop: 'circuit' },
+ { name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' },
...selectedModules.itemList.map((module) => {
return {
name: module.itemNm,
@@ -40,9 +51,25 @@ export default function PassivityCircuitAllocation() {
const model = useRecoilValue(modelState)
const [selectedModels, setSelectedModels] = useState(model.selectedModels)
const [selectedPcs, setSelectedPcs] = useState(selectedModels[0])
+ const [totalWpout, setTotalWpout] = useState(0)
+
useEffect(() => {
- console.log('๐ ~ useEffect ~ selectedPcs:', selectedPcs)
- }, [selectedPcs])
+ setSurfaceInfo()
+ if (!managementState) {
+ setManagementState(managementStateLoaded)
+ }
+ }, [])
+
+ const setSurfaceInfo = () => {
+ const surfaces = canvas.getObjects().filter((obj) => ['roofSurface', 'moduleSetupSurface'].includes(obj.name))
+ const modules = canvas.getObjects().filter((obj) => obj.name === 'module')
+ surfaces.forEach((surface) => {
+ surface.moduleList = modules.filter((obj) => obj.surfaceId === surface.id)
+ })
+ // ์ง๋ถ๋ฉด ๋ฆฌ์คํธ -> ์ง๋ถ๋ฉด์ ์๋ ๋ชจ๋ ๋ฆฌ์คํธ -> ๋ฐ์ ๋ ์ดํฉ ๊ณ์ฐ
+ // wpOut
+ console.log('๐ ~ setSurfaceInfo ~ modules:', surfaces)
+ }
return (
<>
@@ -62,7 +89,7 @@ export default function PassivityCircuitAllocation() {
{moduleData.rows.map((row, index) => (
-
+
{moduleData.header.map((header) => (
|
{row[header.prop].name}
@@ -70,6 +97,13 @@ export default function PassivityCircuitAllocation() {
))}
|
))}
+
+ | ์ดํฉ |
+ {Array.from({ length: moduleData.header.length - 2 }).map((_, index) => {
+ return |
+ })}
+ {totalWpout.toLocaleString('ko-KR', { maximumFractionDigits: 4 })} |
+
@@ -91,7 +125,14 @@ export default function PassivityCircuitAllocation() {
checked={selectedPcs === model}
onChange={() => setSelectedPcs(model)}
/>
-
+
))}
{/*
diff --git a/src/locales/ja.json b/src/locales/ja.json
index a96ff061..ff6018f6 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -141,9 +141,11 @@
"modal.circuit.trestle.setting.circuit.allocation": "ๅ่ทฏๅฒใๅฝใฆ",
"modal.circuit.trestle.setting.circuit.allocation.auto": "่ชๅๅ่ทฏๅฒใๅฝใฆ",
"modal.circuit.trestle.setting.circuit.allocation.passivity": "ๆๅๅ่ทฏๅฒๅฝ",
+ "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit": "ๅ่ทฏ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.info": "ๅใๅ่ทฏใฎใขใธใฅใผใซใ้ธๆ็ถๆ
ใซใใๅพใ [็ชๅท็ขบ่ช]ใใฟใณใๆผใใจ็ชๅทใๅฒใๅฝใฆใใใพใใ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional": "้ธๆใใใใฏใผใณใณใใฃใทใงใใผ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num": "่จญๅฎใใๅ่ทฏ็ชๅท (1~)",
+ "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.info": "ๆจๆบๅ่ทฏ{0}ๆ๏ฝ{1}ๆ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional.reset": "้ธๆใใใใใฏใผใณใณใใฃใทใงใใผใฎๅ่ทฏ็ชๅทใฎๅๆๅ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset": "ใในใฆใฎๅ่ทฏ็ชๅทใฎๅๆๅ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num.fix": "็ชๅท็ขบๅฎ",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 2d049d61..d23f1813 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -145,9 +145,11 @@
"modal.circuit.trestle.setting.circuit.allocation": "ํ๋ก ํ ๋น",
"modal.circuit.trestle.setting.circuit.allocation.auto": "์๋ ํ๋ก ํ ๋น",
"modal.circuit.trestle.setting.circuit.allocation.passivity": "์๋ ํ๋ก ํ ๋น",
+ "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit": "ํ๋ก",
"modal.circuit.trestle.setting.circuit.allocation.passivity.info": "๋์ผํ ํ๋ก์ ๋ชจ๋์ ์ ํ ์ํ๋ก ๋ง๋ ํ [๋ฒํธ ํ์ ] ๋ฒํผ์ ๋๋ฅด๋ฉด ๋ฒํธ๊ฐ ํ ๋น๋ฉ๋๋ค.",
"modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional": "์ ํ๋ ํ์์ปจ๋์
๋",
"modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num": "์ค์ ํ ํ๋ก๋ฒํธ(1~)",
+ "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.info": "ํ์คํ๋ก{0}์ฅ๏ฝ{1}์ฅ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional.reset": "์ ํ๋ ํ์์ปจ๋์
๋์ ํ๋ก๋ฒํธ ์ด๊ธฐํ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset": "๋ชจ๋ ํ๋ก๋ฒํธ ์ด๊ธฐํ",
"modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num.fix": "๋ฒํธ ํ์ ",