Merge branch 'dev' into dev-yj
This commit is contained in:
commit
a214cd2dff
@ -273,7 +273,7 @@ export function useRoofAllocationSetting(id) {
|
||||
|
||||
setRoofList(newRoofList)
|
||||
const selectedRoofMaterial = newRoofList.find((roof) => roof.selected)
|
||||
setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial)
|
||||
setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true)
|
||||
modifyModuleSelectionData()
|
||||
closeAll()
|
||||
}
|
||||
|
||||
@ -129,7 +129,7 @@ export function usePlan(params = {}) {
|
||||
* objectNo에 해당하는 canvas 목록을 조회
|
||||
*/
|
||||
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) => ({
|
||||
id: item.id,
|
||||
objectNo: item.objectNo,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user