Compare commits

..

No commits in common. "690c2a784c73b5302202e7681aaa9d53c903149e" and "65192b76906543f98d16ac24f2abbdbd471d3a95" have entirely different histories.

View File

@ -44,9 +44,6 @@ export const useTrestle = () => {
// exposedBottomPoints는 노출 최하면 들의 centerPoint 배열.
const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
surfaces.forEach((surface) => {
surface.set({ quotationParam: null })
})
// 기존 eaveBar를 삭제
canvas.getObjects().forEach((obj) => {
if (obj.name === 'eaveBar' || obj.name === 'rack' || obj.name === 'halfEaveBar' || obj.name === 'smartRack') {
@ -748,16 +745,17 @@ export const useTrestle = () => {
}
//itemList = data
// itemList에 northModuleYn 추가
itemList = data.map((item) => {
if (item.itemTpCd === 'MODULE') {
const matchedModule = modules.find((module) => module.moduleItemId === item.itemId)
itemList = data.map(item => {
if (item.itemTpCd === "MODULE") {
const matchedModule = modules.find(module => module.moduleItemId === item.itemId);
return {
...item,
northModuleYn: matchedModule?.northModuleYn || 'N',
northModuleYn: matchedModule?.northModuleYn || 'N'
};
}
}
return item
})
return item;
});
//northArrangement 북면 설치 여부
const northArrangement = getNorthArrangement()
@ -822,11 +820,11 @@ export const useTrestle = () => {
// 발전 시뮬레이션 용 각도 재계산
const getAzimuth = (parent) => {
if (typeof parent === 'string') {
console.warn('getAzimuth: parent is string, expected object', parent)
return 0 // 또는 적절한 기본값
console.warn('getAzimuth: parent is string, expected object', parent);
return 0; // 또는 적절한 기본값
}
const { moduleCompass, surfaceCompass, direction } = parent || {}
const { moduleCompass, surfaceCompass, direction } = parent || {};
if (surfaceCompass) {
return -surfaceCompass
@ -2605,7 +2603,7 @@ export const useTrestle = () => {
return {
moduleTpCd: module.moduleInfo.itemTp,
moduleItemId: module.moduleInfo.itemId,
northModuleYn: module?.moduleInfo?.northModuleYn || 'N', // 기본값 'N'
northModuleYn: module?.moduleInfo?.northModuleYn || 'N' // 기본값 'N'
}
})
@ -2617,7 +2615,7 @@ export const useTrestle = () => {
moduleTpCd: cur.moduleTpCd,
moduleItemId: cur.moduleItemId,
cnt: 0,
northModuleYn: cur.northModuleYn,
northModuleYn: cur.northModuleYn
}
}
acc[key].cnt++
@ -2630,7 +2628,7 @@ export const useTrestle = () => {
moduleTpCd: groupedParam.moduleTpCd,
moduleItemId: groupedParam.moduleItemId,
moduleCnt: groupedParam.cnt,
northModuleYn: groupedParam.northModuleYn,
northModuleYn: groupedParam.northModuleYn
// northModuleYn: params.find(p =>
// p.moduleTpCd === groupedParam.moduleTpCd &&
// p.moduleItemId === groupedParam.moduleItemId