- 회로 번호 초기화시 해당 회로 번호의 최소 번호로 회로번호 초기화
- 모듈에 pcsCode추가
This commit is contained in:
parent
9400a8a271
commit
7cdeb8a0dd
@ -148,6 +148,7 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
strokeWidth: 0.3,
|
strokeWidth: 0.3,
|
||||||
})
|
})
|
||||||
obj.pcsItemId = selectedPcs.itemId
|
obj.pcsItemId = selectedPcs.itemId
|
||||||
|
obj.pcsItemCode = selectedPcs.id
|
||||||
obj.circuit = moduleCircuitText
|
obj.circuit = moduleCircuitText
|
||||||
obj.circuitNumber = getCircuitNumber()
|
obj.circuitNumber = getCircuitNumber()
|
||||||
tempSelectedPcs.used = true
|
tempSelectedPcs.used = true
|
||||||
@ -207,7 +208,7 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getPcsManualConfChk(params).then((res) => {
|
getPcsManualConfChk(params).then((res) => {
|
||||||
if (res.resultCode === 'E') {
|
if (res?.resultCode === 'E') {
|
||||||
swalFire({
|
swalFire({
|
||||||
text: res.resultMsg,
|
text: res.resultMsg,
|
||||||
type: 'alert',
|
type: 'alert',
|
||||||
@ -254,11 +255,18 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
icon: 'warning',
|
icon: 'warning',
|
||||||
confirmFn: () => {
|
confirmFn: () => {
|
||||||
const circuitModules = canvas.getObjects().filter((obj) => obj.name === 'module' && obj.circuit?.circuitInfo?.id === selectedPcs.id)
|
const circuitModules = canvas.getObjects().filter((obj) => obj.name === 'module' && obj.circuit?.circuitInfo?.id === selectedPcs.id)
|
||||||
|
const circuitNumbers = circuitModules.map((obj) => {
|
||||||
|
const circuitNumber = obj.circuitNumber.replace(/[()]/g, '').split('-')
|
||||||
|
return parseInt(circuitNumber[circuitNumber.length - 1])
|
||||||
|
})
|
||||||
|
const minCircuitNumber = Math.min(...circuitNumbers)
|
||||||
|
console.log(circuitNumbers, minCircuitNumber)
|
||||||
canvas.remove(...circuitModules.map((module) => module.circuit))
|
canvas.remove(...circuitModules.map((module) => module.circuit))
|
||||||
circuitModules.forEach((obj) => {
|
circuitModules.forEach((obj) => {
|
||||||
obj.circuit = null
|
obj.circuit = null
|
||||||
obj.pcsItemId = null
|
obj.pcsItemId = null
|
||||||
})
|
})
|
||||||
|
setCircuitNumber(minCircuitNumber)
|
||||||
setTargetModules([])
|
setTargetModules([])
|
||||||
|
|
||||||
canvas.renderAll()
|
canvas.renderAll()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user