qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api 데이텨 형태 변경

Browse Source 
사용된 PCS -> PCS 전체
This commit is contained in:
김민식 2025-02-27 13:57:18 +09:00
parent 7bd2ba637a
commit 6e1ae73ccc
2 changed files with 19 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
View File

@ -161,9 +161,9 @@ export default function PowerConditionalSelect(props) {
return return
} }
if (selectedMaker.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.MULTI) { if (selectedMaker.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.MULTI) {
setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }]) setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4() }])
} else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) { } else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) {
setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }]) setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4() }])
} }
setSelectedRow(null) setSelectedRow(null)
} }

62
src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
View File

@ -157,18 +157,10 @@ export default function PassivityCircuitAllocation(props) {
obj.pcsItemCode = selectedPcs.id obj.pcsItemCode = selectedPcs.id
obj.circuit = moduleCircuitText obj.circuit = moduleCircuitText
obj.circuitNumber = getCircuitNumber() obj.circuitNumber = getCircuitNumber()
tempSelectedPcs.used = true
setSelectedPcs(tempSelectedPcs) setSelectedPcs(tempSelectedPcs)
canvas.add(moduleCircuitText) canvas.add(moduleCircuitText)
}) })
let pcsList = JSON.parse(JSON.stringify(selectedModels)).map((model) => {
if (model.id === selectedPcs.id) {
model.isUsed = true
}
return model
})
const roofSurfaceList = canvas const roofSurfaceList = canvas
.getObjects() .getObjects()
.filter((obj) => POLYGON_TYPE.MODULE_SETUP_SURFACE === obj.name && obj?.modules.length > 0) .filter((obj) => POLYGON_TYPE.MODULE_SETUP_SURFACE === obj.name && obj?.modules.length > 0)
@ -210,29 +202,24 @@ export default function PassivityCircuitAllocation(props) {
result[firstPart].count += 1 result[firstPart].count += 1
} }
} }
console.log('🚀 ~ handleCircuitNumberFix ~ result:', result) const pcsItemList = selectedModels.map((model, index) => {
const usedPcses = pcsList.filter((model) => model.isUsed) return {
const pcsItemList = usedPcses.map((model, index) => { pcsMkrCd: model.pcsMkrCd,
if (result[(index + 1).toString()]) { pcsSerCd: model.pcsSerCd,
return { itemId: model.itemId,
pcsMkrCd: model.pcsMkrCd, itemNm: model.itemNm,
pcsSerCd: model.pcsSerCd, goodsNo: model.goodsNo,
itemId: model.itemId, serQtyList: [
itemNm: model.itemNm, {
goodsNo: model.goodsNo, serQty: result[(index + 1).toString()] ? result[(index + 1).toString()].maxValue : 0,
serQtyList: [ paralQty: result[(index + 1).toString()] ? result[(index + 1).toString()].count : 0,
{ rmdYn: 'Y',
serQty: result[(index + 1).toString()].maxValue, usePossYn: 'Y',
paralQty: result[(index + 1).toString()].count, roofSurfaceList: roofSurfaceList,
rmdYn: 'Y', },
usePossYn: 'Y', ],
roofSurfaceList: roofSurfaceList,
},
],
}
} }
}) })
const params = { const params = {
...getApiProps(), ...getApiProps(),
useModuleItemList: getSelectedModuleList(), useModuleItemList: getSelectedModuleList(),
@ -259,13 +246,10 @@ export default function PassivityCircuitAllocation(props) {
canvas.renderAll() canvas.renderAll()
}, },
}) })
setSelectedPcs({ ...selectedPcs, used: false })
setTargetModules([]) setTargetModules([])
return return
} }
setSelectedModels(pcsList)
setTargetModules([]) setTargetModules([])
setCircuitNumber(+circuitNumber + 1) setCircuitNumber(+circuitNumber + 1)
setModuleStatisticsData() setModuleStatisticsData()
@ -414,18 +398,10 @@ export default function PassivityCircuitAllocation(props) {
obj.pcsItemCode = selectedPcs.id obj.pcsItemCode = selectedPcs.id
obj.circuit = moduleCircuitText obj.circuit = moduleCircuitText
obj.circuitNumber = getCircuitNumber() obj.circuitNumber = getCircuitNumber()
tempSelectedPcs.used = true
setSelectedPcs(tempSelectedPcs) setSelectedPcs(tempSelectedPcs)
canvas.add(moduleCircuitText) canvas.add(moduleCircuitText)
}) })
let pcsList = JSON.parse(JSON.stringify(selectedModels)).map((model) => {
if (model.id === selectedPcs.id) {
model.isUsed = true
}
return model
})
const roofSurfaceList = canvas const roofSurfaceList = canvas
.getObjects() .getObjects()
.filter((obj) => POLYGON_TYPE.MODULE_SETUP_SURFACE === obj.name && obj?.modules.length > 0) .filter((obj) => POLYGON_TYPE.MODULE_SETUP_SURFACE === obj.name && obj?.modules.length > 0)
@ -443,8 +419,7 @@ export default function PassivityCircuitAllocation(props) {
}), }),
} }
}) })
const usedPcses = pcsList.filter((model) => model.isUsed) const pcsItemList = selectedModels.map((model, index) => {
const pcsItemList = usedPcses.map((model, index) => {
return { return {
pcsMkrCd: model.pcsMkrCd, pcsMkrCd: model.pcsMkrCd,
pcsSerCd: model.pcsSerCd, pcsSerCd: model.pcsSerCd,
@ -489,13 +464,10 @@ export default function PassivityCircuitAllocation(props) {
canvas.renderAll() canvas.renderAll()
}, },
}) })
setSelectedPcs({ ...selectedPcs, used: false })
setTargetModules([]) setTargetModules([])
return return
} }
setSelectedModels(pcsList)
setTargetModules([]) setTargetModules([])
setModuleStatisticsData() setModuleStatisticsData()
setTabNum(2) setTabNum(2)