Compare commits

...

3 Commits

2 changed files with 7 additions and 5 deletions

View File

@ -56,19 +56,20 @@ export default function StuffSubHeader({ type }) {
*/ */
const moveFloorPlan = () => { const moveFloorPlan = () => {
setFloorPlanObjectNo({ floorPlanObjectNo: objectNo }) setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
const param = { const param = {
pid: managementState?.planList?.length === 0 ? '1' : managementState?.planList[0].planNo, pid: managementState?.planList?.length > 0 ? managementState?.planList[0].planNo : '1',
objectNo: objectNo, objectNo: objectNo,
} }
if (managementState?.planList?.length === 0) { if (managementState?.planList?.length > 0) {
setSelectedMenu('surface')
} else {
if (managementState?.planList[0].estimateDate) { if (managementState?.planList[0].estimateDate) {
setSelectedMenu('module') setSelectedMenu('module')
} else { } else {
setSelectedMenu('surface') setSelectedMenu('surface')
} }
} else {
setSelectedMenu('surface')
} }
const url = `/floor-plan?${queryStringFormatter(param)}` const url = `/floor-plan?${queryStringFormatter(param)}`

View File

@ -314,7 +314,8 @@ export function useRoofAllocationSetting(id) {
setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true) setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true)
drawDirectionArrow(currentObject) drawDirectionArrow(currentObject)
modifyModuleSelectionData() modifyModuleSelectionData()
closeAll() // closeAll()
closePopup(id)
basicSettingSave() basicSettingSave()
setModuleSelectionData({ ...moduleSelectionData, roofConstructions: newRoofList }) setModuleSelectionData({ ...moduleSelectionData, roofConstructions: newRoofList })
} }