-단위테스트(Unit Test) #557 수정
This commit is contained in:
parent
0491c14fb4
commit
bc06d35bcf
@ -38,7 +38,7 @@ export default function PowerConditionalSelect(props) {
|
|||||||
const { swalFire } = useSwal()
|
const { swalFire } = useSwal()
|
||||||
const modelHeader = [
|
const modelHeader = [
|
||||||
{ name: getMessage('시리즈'), width: '15%', prop: 'pcsSerNm', type: 'color-box' },
|
{ name: getMessage('시리즈'), width: '15%', prop: 'pcsSerNm', type: 'color-box' },
|
||||||
{ name: getMessage('명칭'), width: '15%', prop: 'itemNm', type: 'color-box' },
|
{ name: getMessage('명칭'), width: '15%', prop: 'goodsNo', type: 'color-box' },
|
||||||
{
|
{
|
||||||
name: `${getMessage('modal.circuit.trestle.setting.power.conditional.select.rated.output')} (kW)`,
|
name: `${getMessage('modal.circuit.trestle.setting.power.conditional.select.rated.output')} (kW)`,
|
||||||
width: '10%',
|
width: '10%',
|
||||||
@ -240,7 +240,7 @@ export default function PowerConditionalSelect(props) {
|
|||||||
<div className="circuit-data-form">
|
<div className="circuit-data-form">
|
||||||
{selectedModels?.map((model) => (
|
{selectedModels?.map((model) => (
|
||||||
<span className="normal-font">
|
<span className="normal-font">
|
||||||
{model.itemNm} <button className="del" onClick={() => onRemoveSelectedModel(model)}></button>
|
{model.goodsNo} <button className="del" onClick={() => onRemoveSelectedModel(model)}></button>
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -14,6 +14,7 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
tabNum,
|
tabNum,
|
||||||
setTabNum,
|
setTabNum,
|
||||||
selectedModels,
|
selectedModels,
|
||||||
|
setSelectedModels,
|
||||||
getOptYn: getApiProps,
|
getOptYn: getApiProps,
|
||||||
getUseModuleItemList: getSelectedModuleList,
|
getUseModuleItemList: getSelectedModuleList,
|
||||||
getSelectModelList: getSelectModelList,
|
getSelectModelList: getSelectModelList,
|
||||||
@ -201,6 +202,7 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let tempSelectedPcs = { ...selectedPcs }
|
||||||
canvas.discardActiveObject()
|
canvas.discardActiveObject()
|
||||||
canvas
|
canvas
|
||||||
.getObjects()
|
.getObjects()
|
||||||
@ -229,6 +231,8 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
obj.pcsItemId = selectedPcs.itemId
|
obj.pcsItemId = selectedPcs.itemId
|
||||||
obj.circuit = moduleCircuitText
|
obj.circuit = moduleCircuitText
|
||||||
obj.circuitNumber = getCircuitNumber()
|
obj.circuitNumber = getCircuitNumber()
|
||||||
|
tempSelectedPcs.used = true
|
||||||
|
setSelectedPcs(tempSelectedPcs)
|
||||||
canvas.add(moduleCircuitText)
|
canvas.add(moduleCircuitText)
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -249,25 +253,47 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
console.log('uniqueCircuitNumbers', uniqueCircuitNumbers)
|
console.log('uniqueCircuitNumbers', uniqueCircuitNumbers)
|
||||||
const pcsItemList = selectedModels.map((model, index) => {
|
const usedPcses = selectedModels.filter((model) => model.isUsed)
|
||||||
return {
|
const pcsItemList =
|
||||||
pcsMkrCd: model.pcsMkrCd,
|
usedPcses.length === 0
|
||||||
pcsSerCd: model.pcsSerCd,
|
? [
|
||||||
itemId: model.itemId,
|
{
|
||||||
itemNm: model.itemNm,
|
pcsMkrCd: selectedPcs.pcsMkrCd,
|
||||||
goodsNo: model.goodsNo,
|
pcsSerCd: selectedPcs.pcsSerCd,
|
||||||
serQtyList: [
|
itemId: selectedPcs.itemId,
|
||||||
{
|
itemNm: selectedPcs.itemNm,
|
||||||
serQty: targetModules.length,
|
goodsNo: selectedPcs.goodsNo,
|
||||||
paralQty: uniqueCircuitNumbers.length,
|
serQtyList: [
|
||||||
rmdYn: 'Y',
|
{
|
||||||
usePossYn: 'Y',
|
serQty: targetModules.length,
|
||||||
roofSurfaceList: roofSurfaceList,
|
paralQty: uniqueCircuitNumbers.length,
|
||||||
},
|
rmdYn: 'Y',
|
||||||
],
|
usePossYn: 'Y',
|
||||||
}
|
roofSurfaceList: roofSurfaceList,
|
||||||
})
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
]
|
||||||
|
: selectedModels.map((model, index) => {
|
||||||
|
return {
|
||||||
|
pcsMkrCd: model.pcsMkrCd,
|
||||||
|
pcsSerCd: model.pcsSerCd,
|
||||||
|
itemId: model.itemId,
|
||||||
|
itemNm: model.itemNm,
|
||||||
|
goodsNo: model.goodsNo,
|
||||||
|
serQtyList: [
|
||||||
|
{
|
||||||
|
serQty: targetModules.length,
|
||||||
|
paralQty: uniqueCircuitNumbers.length,
|
||||||
|
rmdYn: 'Y',
|
||||||
|
usePossYn: 'Y',
|
||||||
|
roofSurfaceList: roofSurfaceList,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
const params = {
|
const params = {
|
||||||
...getApiProps(),
|
...getApiProps(),
|
||||||
@ -276,6 +302,7 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getPcsManualConfChk(params).then((res) => {
|
getPcsManualConfChk(params).then((res) => {
|
||||||
|
console.log('targetModules', targetModules)
|
||||||
if (res.resultCode === 'E') {
|
if (res.resultCode === 'E') {
|
||||||
swalFire({
|
swalFire({
|
||||||
text: res.resultMsg,
|
text: res.resultMsg,
|
||||||
@ -295,10 +322,17 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
canvas.renderAll()
|
canvas.renderAll()
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
setSelectedPcs({ ...selectedPcs, used: false })
|
||||||
|
setTargetModules([])
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setSelectedModels(
|
||||||
|
selectedModels.map((model) => {
|
||||||
|
return { ...model, isUsed: model.id === selectedPcs.id ? true : model.isUsed }
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
setTargetModules([])
|
setTargetModules([])
|
||||||
setCircuitNumber(+circuitNumber + 1)
|
setCircuitNumber(+circuitNumber + 1)
|
||||||
setTableData()
|
setTableData()
|
||||||
@ -512,7 +546,7 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
onChange={() => setSelectedPcs(model)}
|
onChange={() => setSelectedPcs(model)}
|
||||||
/>
|
/>
|
||||||
<label htmlFor={`ra0${index + 1}`}>
|
<label htmlFor={`ra0${index + 1}`}>
|
||||||
{model.itemNm} (
|
{model.goodsNo} (
|
||||||
{getMessage(
|
{getMessage(
|
||||||
'modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.info',
|
'modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.info',
|
||||||
managementState?.coldRegionFlg === '1' ? [model.serMinQty, model.serColdZoneMaxQty] : [model.serMinQty, model.serMaxQty],
|
managementState?.coldRegionFlg === '1' ? [model.serMinQty, model.serColdZoneMaxQty] : [model.serMinQty, model.serMaxQty],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user