diff --git a/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx b/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx index dbd4d992..91268678 100644 --- a/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx +++ b/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx @@ -121,7 +121,7 @@ export default function RoofAllocationSetting(props) { onChange={(e) => { handleChangeInput(e, 'pitch', index) }} - defaultValue={currentAngleType === 'slope' ? roof.pitch : getDegreeByChon(roof.pitch)} + defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle} /> {pitchText} diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 506df945..e6133ce2 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -1265,57 +1265,59 @@ export default function StuffDetail() { return alert(getMessage('stuff.detail.save.valierror2')) } - let detail_sort = Object.keys(managementState) - .sort() - .reduce((obj, key) => ((obj[key] = managementState[key]), obj), {}) - let params_sort = Object.keys(params) - .sort() - .reduce((obj, key) => ((obj[key] = params[key]), obj), {}) + if (managementState) { + let detail_sort = Object.keys(managementState) + .sort() + .reduce((obj, key) => ((obj[key] = managementState[key]), obj), {}) + let params_sort = Object.keys(params) + .sort() + .reduce((obj, key) => ((obj[key] = params[key]), obj), {}) - delete detail_sort.areaName - delete detail_sort.contentsPath - delete detail_sort.createDatetime - delete detail_sort.createUserName - delete detail_sort.dispCompanyName - delete detail_sort.firstAgentId - delete detail_sort.lastEditDatetime - delete detail_sort.lastEditUserName - delete detail_sort.planList - delete detail_sort.planNo - delete detail_sort.planTotCnt - delete detail_sort.receiveCompanyName - delete detail_sort.saleStoreName - delete detail_sort.rowNumber - delete detail_sort.prefName - delete detail_sort.sameObjectInfo - delete detail_sort.specificationConfirmDate - delete detail_sort.totCnt - delete detail_sort.workNo - delete detail_sort.workName + delete detail_sort.areaName + delete detail_sort.contentsPath + delete detail_sort.createDatetime + delete detail_sort.createUserName + delete detail_sort.dispCompanyName + delete detail_sort.firstAgentId + delete detail_sort.lastEditDatetime + delete detail_sort.lastEditUserName + delete detail_sort.planList + delete detail_sort.planNo + delete detail_sort.planTotCnt + delete detail_sort.receiveCompanyName + delete detail_sort.saleStoreName + delete detail_sort.rowNumber + delete detail_sort.prefName + delete detail_sort.sameObjectInfo + delete detail_sort.specificationConfirmDate + delete detail_sort.totCnt + delete detail_sort.workNo + delete detail_sort.workName - delete params_sort.areaName - delete params_sort.contentsPath - delete params_sort.createDatetime - delete params_sort.createUserName - delete params_sort.dispCompanyName - delete params_sort.firstAgentId - delete params_sort.lastEditDatetime - delete params_sort.lastEditUserName - delete params_sort.planList - delete params_sort.planNo - delete params_sort.planTotCnt - delete params_sort.receiveCompanyName - delete params_sort.saleStoreName - delete params_sort.rowNumber - delete params_sort.prefName - delete params_sort.sameObjectInfo - delete params_sort.specificationConfirmDate - delete params_sort.totCnt - delete params_sort.workNo - delete params_sort.workName + delete params_sort.areaName + delete params_sort.contentsPath + delete params_sort.createDatetime + delete params_sort.createUserName + delete params_sort.dispCompanyName + delete params_sort.firstAgentId + delete params_sort.lastEditDatetime + delete params_sort.lastEditUserName + delete params_sort.planList + delete params_sort.planNo + delete params_sort.planTotCnt + delete params_sort.receiveCompanyName + delete params_sort.saleStoreName + delete params_sort.rowNumber + delete params_sort.prefName + delete params_sort.sameObjectInfo + delete params_sort.specificationConfirmDate + delete params_sort.totCnt + delete params_sort.workNo + delete params_sort.workName - if (Object.entries(detail_sort).toString() === Object.entries(params_sort).toString()) { - return alert(getMessage('stuff.detail.noChgData')) + if (Object.entries(detail_sort).toString() === Object.entries(params_sort).toString()) { + return alert(getMessage('stuff.detail.noChgData')) + } } if (params?.receiveUser !== '') { diff --git a/src/components/simulator/Simulator.jsx b/src/components/simulator/Simulator.jsx index 603a5fde..0d33bbf8 100644 --- a/src/components/simulator/Simulator.jsx +++ b/src/components/simulator/Simulator.jsx @@ -227,7 +227,7 @@ export default function Simulator() { {/* 연간예측발전량 */}