From debdc6b8ab5cc584ca28be2212bd69bf35b8addb Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 10 Jan 2025 11:38:12 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=20=EC=B5=9C=EC=B4=88=20?= =?UTF-8?q?=EB=B0=94=EB=A1=9C=20=EC=A0=80=EC=9E=A5=EC=8B=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/StuffDetail.jsx | 99 ++++++++++++----------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 506df945..ded9bbea 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 !== '') { @@ -1330,6 +1332,7 @@ export default function StuffDetail() { } } + console.log('editMode::', editMode, params) if (editMode === 'NEW') { await promisePost({ url: apiUrl, data: params }) .then((res) => { From 6bd3e782e6f2a9d145b140df90809bae8ba09fe4 Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 10 Jan 2025 11:53:33 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=BD=98=EC=86=94=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/StuffDetail.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index ded9bbea..e6133ce2 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -1332,7 +1332,6 @@ export default function StuffDetail() { } } - console.log('editMode::', editMode, params) if (editMode === 'NEW') { await promisePost({ url: apiUrl, data: params }) .then((res) => { From 8f7a847504fc4f77bbad87560e2dfa77ce196058 Mon Sep 17 00:00:00 2001 From: leeyongjae Date: Fri, 10 Jan 2025 13:26:23 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EB=B0=9C=EC=A0=84=20=EC=8B=9C=EB=AE=AC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EA=B2=BD=EC=82=AC/=EB=B0=A9?= =?UTF-8?q?=EC=9C=84=EA=B0=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/simulator/Simulator.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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() { {/* 연간예측발전량 */}
{getMessage('simulator.title.sub4')}
-
{chartData[chartData.length - 1]}
+
{convertNumberToPriceDecimal(chartData[chartData.length - 1])}
@@ -343,15 +343,15 @@ export default function Simulator() { {/* 지붕면 */} {moduleInfo.roofSurface} {/* 경사각 */} - {convertNumberToPriceDecimal(moduleInfo.slope)}寸 + {convertNumberToPriceDecimal(moduleInfo.slopeAngle)}寸 {/* 방위각(도) */} - {convertNumberToPriceDecimal(moduleInfo.angle)} + {convertNumberToPriceDecimal(moduleInfo.azimuth)} {/* 태양전지모듈 */}
{moduleInfo.itemNo}
{/* 매수 */} - {moduleInfo.amount} + {convertNumberToPriceDecimal(moduleInfo.amount)} ) @@ -393,7 +393,7 @@ export default function Simulator() {
{pcsInfo.itemNo}
{/* 대 */} - {pcsInfo.amount} + {convertNumberToPriceDecimal(pcsInfo.amount)} ) From 7b2e7fd362383315fcfa75be0ee6738e427aabf0 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 10 Jan 2025 13:35:42 +0900 Subject: [PATCH 4/5] =?UTF-8?q?pcs=20=EB=A9=94=EC=9D=B4=EC=BB=A4,=EC=8B=9C?= =?UTF-8?q?=EB=A6=AC=EC=A6=88=20=EC=A1=B0=ED=9A=8C=20api=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/common/useMasterController.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/hooks/common/useMasterController.js b/src/hooks/common/useMasterController.js index 94f455c5..f4bc607b 100644 --- a/src/hooks/common/useMasterController.js +++ b/src/hooks/common/useMasterController.js @@ -112,11 +112,27 @@ export function useMasterController() { }) } + /** + * PCS 메이커, 시리즈 목록 조회 + * @param {PCS 메이커코드} pcsMkrCd + * @param {혼합모듈번호} mixMatlNo + * @returns + */ + const getPcsMakerList = async (params) => { + const paramString = getQueryString(params) + console.log('🚀🚀 ~ getPcsMakerList ~ paramString:', paramString) + return await get({ url: '/api/v1/master/pcsMakerList' + paramString }).then((res) => { + console.log('🚀🚀 ~ getPcsMakerList ~ res:', res) + return res + }) + } + return { getRoofMaterialList, getModuleTypeItemList, getTrestleList, getConstructionList, getTrestleDetailList, + getPcsMakerList, } } From f0e6056e32c9b54aa17f8d016c6c70d8e470fde5 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 10 Jan 2025 13:40:24 +0900 Subject: [PATCH 5/5] =?UTF-8?q?pitch,=20angle=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/roofAllocation/RoofAllocationSetting.jsx | 2 +- src/hooks/option/useCanvasSetting.js | 3 ++- src/hooks/roofcover/useRoofAllocationSetting.js | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) 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/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index 1691d2cc..c4ac79c9 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -135,7 +135,8 @@ export function useCanvasSetting() { raft: item.raftBase && parseInt(item.raftBase), layout: ['ROOF_ID_SLATE', 'ROOF_ID_SINGLE'].includes(item.roofMatlCd) ? ROOF_MATERIAL_LAYOUT.STAIRS : ROOF_MATERIAL_LAYOUT.PARALLEL, hajebichi: item.roofPchBase && parseInt(item.roofPchBase), - pitch: item.pitch && parseInt(item.pitch), + pitch: item.pitch ? parseInt(item.pitch) : 4, + angle: item.angle ? parseInt(item.angle) : 21.8, })) setRoofMaterials(roofLists) const selectedRoofMaterial = roofLists[0] diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index 638da76a..3e999380 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -23,7 +23,7 @@ import { menuTypeState } from '@/store/menuAtom' import { useRoofFn } from '@/hooks/common/useRoofFn' import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementShape/PlacementShapeSetting' import { globalLocaleStore } from '@/store/localeAtom' -import { getChonByDegree } from '@/util/canvas-util' +import { getChonByDegree, getDegreeByChon } from '@/util/canvas-util' // 지붕면 할당 export function useRoofAllocationSetting(id) { @@ -473,7 +473,9 @@ export function useRoofAllocationSetting(id) { const value = e.target.value const newRoofList = currentRoofList.map((roof, idx) => { if (idx === index) { - return { ...roof, pitch: value } + const result = + currentAngleType === 'slope' ? { pitch: value, angle: getDegreeByChon(value) } : { pitch: getChonByDegree(value), angle: value } + return { ...roof, ...result } } return roof })