Compare commits
No commits in common. "b928d119c6a1fd599c6ecf44e7889fbb6ca09021" and "821601991780082aef91a7c14b1d9e470d20ec77" have entirely different histories.
b928d119c6
...
8216019917
@ -270,9 +270,9 @@ export default function Simulator() {
|
|||||||
setPwrGnrSimType(e.target.value)
|
setPwrGnrSimType(e.target.value)
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{/*<option value={`A`}>積雪考慮なし(ピークカットなし発電量)</option>*/}
|
<option value={`A`}>積雪考慮なし(ピークカットなし発電量)</option>
|
||||||
<option value={`B`}>積雪考慮なし(ピークカットあり発電量)</option>
|
<option value={`B`}>積雪考慮なし(ピークカットあり発電量)</option>
|
||||||
{/*<option value={`C`}>積雪考慮あり(ピークカットなし発電量)</option>*/}
|
<option value={`C`}>積雪考慮あり(ピークカットなし発電量)</option>
|
||||||
<option value={`D`}>積雪考慮あり(ピークカットあり発電量)</option>
|
<option value={`D`}>積雪考慮あり(ピークカットあり発電量)</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -743,19 +743,7 @@ export const useTrestle = () => {
|
|||||||
if (!data || data.length === 0) {
|
if (!data || data.length === 0) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
//itemList = data
|
itemList = data
|
||||||
// itemList에 northModuleYn 추가
|
|
||||||
itemList = data.map(item => {
|
|
||||||
if (item.itemTpCd === "MODULE") {
|
|
||||||
const matchedModule = modules.find(module => module.moduleItemId === item.itemId);
|
|
||||||
return {
|
|
||||||
...item,
|
|
||||||
northModuleYn: matchedModule?.northModuleYn || 'N'
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return item;
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
//northArrangement 북면 설치 여부
|
//northArrangement 북면 설치 여부
|
||||||
const northArrangement = getNorthArrangement()
|
const northArrangement = getNorthArrangement()
|
||||||
@ -2598,7 +2586,6 @@ export const useTrestle = () => {
|
|||||||
return {
|
return {
|
||||||
moduleTpCd: module.moduleInfo.itemTp,
|
moduleTpCd: module.moduleInfo.itemTp,
|
||||||
moduleItemId: module.moduleInfo.itemId,
|
moduleItemId: module.moduleInfo.itemId,
|
||||||
northModuleYn: module?.moduleInfo?.northModuleYn || 'N' // 기본값 'N'
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -2610,7 +2597,6 @@ export const useTrestle = () => {
|
|||||||
moduleTpCd: cur.moduleTpCd,
|
moduleTpCd: cur.moduleTpCd,
|
||||||
moduleItemId: cur.moduleItemId,
|
moduleItemId: cur.moduleItemId,
|
||||||
cnt: 0,
|
cnt: 0,
|
||||||
northModuleYn: cur.northModuleYn
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
acc[key].cnt++
|
acc[key].cnt++
|
||||||
@ -2623,11 +2609,6 @@ export const useTrestle = () => {
|
|||||||
moduleTpCd: groupedParam.moduleTpCd,
|
moduleTpCd: groupedParam.moduleTpCd,
|
||||||
moduleItemId: groupedParam.moduleItemId,
|
moduleItemId: groupedParam.moduleItemId,
|
||||||
moduleCnt: groupedParam.cnt,
|
moduleCnt: groupedParam.cnt,
|
||||||
northModuleYn: groupedParam.northModuleYn
|
|
||||||
// northModuleYn: params.find(p =>
|
|
||||||
// p.moduleTpCd === groupedParam.moduleTpCd &&
|
|
||||||
// p.moduleItemId === groupedParam.moduleItemId
|
|
||||||
// )?.northModuleYn || 'N'
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1809,7 +1809,6 @@ export function useMode() {
|
|||||||
const currentWall = line.currentWall
|
const currentWall = line.currentWall
|
||||||
const nextWall = line.nextWall
|
const nextWall = line.nextWall
|
||||||
const index = line.index + addPoint
|
const index = line.index + addPoint
|
||||||
const direction = currentWall.direction
|
|
||||||
const xDiff = Big(currentWall.x1).minus(Big(nextWall.x1))
|
const xDiff = Big(currentWall.x1).minus(Big(nextWall.x1))
|
||||||
const yDiff = Big(currentWall.y1).minus(Big(nextWall.y1))
|
const yDiff = Big(currentWall.y1).minus(Big(nextWall.y1))
|
||||||
const offsetCurrentPoint = offsetPolygon[index]
|
const offsetCurrentPoint = offsetPolygon[index]
|
||||||
@ -1821,10 +1820,12 @@ export function useMode() {
|
|||||||
x: xDiff.eq(0) ? offsetCurrentPoint.x : nextWall.x1,
|
x: xDiff.eq(0) ? offsetCurrentPoint.x : nextWall.x1,
|
||||||
y: yDiff.eq(0) ? offsetCurrentPoint.y : nextWall.y1,
|
y: yDiff.eq(0) ? offsetCurrentPoint.y : nextWall.y1,
|
||||||
}
|
}
|
||||||
|
let diffOffset
|
||||||
let diffOffset = ['top', 'right'].includes(direction)
|
if (nextWall.index > currentWall.index) {
|
||||||
? Big(nextWall.attributes.offset).minus(Big(currentWall.attributes.offset))
|
diffOffset = Big(nextWall.attributes.offset).minus(Big(currentWall.attributes.offset)).abs()
|
||||||
: Big(currentWall.attributes.offset).minus(Big(nextWall.attributes.offset))
|
} else {
|
||||||
|
diffOffset = Big(currentWall.attributes.offset).minus(Big(nextWall.attributes.offset))
|
||||||
|
}
|
||||||
|
|
||||||
const offsetPoint2 = {
|
const offsetPoint2 = {
|
||||||
x: yDiff.eq(0) ? offsetPoint1.x : Big(offsetPoint1.x).plus(diffOffset).toNumber(),
|
x: yDiff.eq(0) ? offsetPoint1.x : Big(offsetPoint1.x).plus(diffOffset).toNumber(),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user