가대없음 , 랙리스 나눠서 처리

This commit is contained in:
hyojun.choi 2025-02-08 20:46:37 +09:00
parent 3c7ad140d7
commit 4a697fc152
2 changed files with 15 additions and 12 deletions

View File

@ -234,7 +234,6 @@ export default function CircuitTrestleSetting({ id }) {
...getOptYn(), ...getOptYn(),
useModuleItemList: getUseModuleItemList(), useModuleItemList: getUseModuleItemList(),
roofSurfaceList: getRoofSurfaceList().map((surface) => { roofSurfaceList: getRoofSurfaceList().map((surface) => {
console.log(surface.moduleList)
return { return {
...surface, ...surface,
moduleList: surface.moduleList.map((module) => { moduleList: surface.moduleList.map((module) => {

View File

@ -54,16 +54,20 @@ export const useTrestle = () => {
let isSnowGuard = construction.setupSnowCover let isSnowGuard = construction.setupSnowCover
const direction = parent.direction const direction = parent.direction
const rack = surface.trestleDetail.rack const rack = surface.trestleDetail.rack
let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn } = surface.trestleDetail let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn, lessSupFitIntvlPct, lessSupFitQty } = surface.trestleDetail
if (!rack) { if (!rack && lessSupFitIntvlPct === 0 && lessSupFitQty === 0) {
//25/02/06 가대없음의 경우 랙정보가 없음 //25/02/06 가대없음의 경우 랙정보가 없음
return return
} }
const rackInfos = Object.keys(rack).map((key) => { let rackInfos = []
return { key, value: rack[key] }
}) if (rack) {
rackInfos = Object.keys(rack).map((key) => {
return { key, value: rack[key] }
})
}
const result = calculateForApi(surface) const result = calculateForApi(surface)
@ -1318,9 +1322,9 @@ export const useTrestle = () => {
//랙 없음 인 경우 지지금구 설치 //랙 없음 인 경우 지지금구 설치
const installBracketWithOutRack = (surface, exposedBottomModules, leftExposedHalfBottomModules, rightExposedHalfBottomPoints, isChidory) => { const installBracketWithOutRack = (surface, exposedBottomModules, leftExposedHalfBottomModules, rightExposedHalfBottomPoints, isChidory) => {
let { rackQty, rackIntvlPct, moduleIntvlHor, moduleIntvlVer, lessSupFitQty, lessSupFitIntvlPct } = surface.trestleDetail let { rackQty, rackIntvlPct, moduleIntvlHor, moduleIntvlVer, lessSupFitQty, lessSupFitIntvlPct } = surface.trestleDetail
rackQty = lessSupFitQty
rackIntvlPct = lessSupFitIntvlPct
const direction = surface.direction const direction = surface.direction
rackQty = 3
rackIntvlPct = 10
canvas.renderAll() canvas.renderAll()
exposedBottomModules.forEach((module) => { exposedBottomModules.forEach((module) => {
@ -1472,13 +1476,13 @@ export const useTrestle = () => {
canvas.add(bracket) canvas.add(bracket)
canvas.renderAll() canvas.renderAll()
if (direction === 'south') { if (direction === 'south') {
startPointY -= height + moduleIntvlVer startPointY -= height
} else if (direction === 'north') { } else if (direction === 'north') {
startPointY += height + moduleIntvlVer startPointY += height
} else if (direction === 'east') { } else if (direction === 'east') {
startPointX -= width + moduleIntvlHor startPointX -= width
} else if (direction === 'west') { } else if (direction === 'west') {
startPointX += width + moduleIntvlHor startPointX += width
} }
} }
} }