Merge branch 'dev' into dev-yj

This commit is contained in:
yjnoh 2025-02-04 13:23:34 +09:00
commit a214cd2dff
2 changed files with 2 additions and 2 deletions

View File

@ -273,7 +273,7 @@ export function useRoofAllocationSetting(id) {
setRoofList(newRoofList) setRoofList(newRoofList)
const selectedRoofMaterial = newRoofList.find((roof) => roof.selected) const selectedRoofMaterial = newRoofList.find((roof) => roof.selected)
setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial) setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true)
modifyModuleSelectionData() modifyModuleSelectionData()
closeAll() closeAll()
} }

View File

@ -129,7 +129,7 @@ export function usePlan(params = {}) {
* objectNo에 해당하는 canvas 목록을 조회 * objectNo에 해당하는 canvas 목록을 조회
*/ */
const getCanvasByObjectNo = async (userId, objectNo, planNo) => { const getCanvasByObjectNo = async (userId, objectNo, planNo) => {
return await get({ url: `/api/canvas-management/canvas-statuses/by-object/${objectNo}/${userId}` }).then((res) => return await get({ url: `/api/canvas-management/canvas-statuses/by-object/${objectNo}` }).then((res) =>
res.map((item) => ({ res.map((item) => ({
id: item.id, id: item.id,
objectNo: item.objectNo, objectNo: item.objectNo,