From 8d6a934717bf18b429a711e139dd6195811d74f8 Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Tue, 21 Jan 2025 14:41:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EC=BA=94=EB=B2=84=EC=8A=A4=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20render=20=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasFrame.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx index 6722fea8..e0c9191f 100644 --- a/src/components/floor-plan/CanvasFrame.jsx +++ b/src/components/floor-plan/CanvasFrame.jsx @@ -31,7 +31,7 @@ export default function CanvasFrame() { const loadCanvas = () => { if (canvas) { canvas?.clear() // 캔버스를 초기화합니다. - if (selectedPlan?.canvasStatus && floorPlanState.objectNo === selectedPlan.objectNo) { + if (selectedPlan?.canvasStatus && floorPlanState.objectNo === selectedPlan.objectNo && floorPlanState.pid === selectedPlan.planNo) { canvas?.loadFromJSON(JSON.parse(selectedPlan.canvasStatus), function () { canvasLoadInit() //config된 상태로 캔버스 객체를 그린다 canvas?.renderAll() // 캔버스를 다시 그립니다. From 71abfe469db66fb60190e8a2fa210d923d338ed6 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Tue, 21 Jan 2025 14:48:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=9A=B0=EC=83=81?= =?UTF-8?q?=EB=8B=A8=20=EC=A7=80=EB=B6=95=EC=9E=AC=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=85=B8=EC=B6=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/step/StepUp.jsx | 4 +- src/hooks/common/useMasterController.js | 79 ++++++++++++++++++- src/hooks/option/useCanvasSetting.js | 10 +-- .../roofcover/useRoofAllocationSetting.js | 3 +- 4 files changed, 87 insertions(+), 9 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index a3f69548..4597999c 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -16,7 +16,7 @@ export default function StepUp({}) { const [arrayLength, setArrayLength] = useState(3) //module-table-inner의 반복 개수 const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState) const model = useRecoilValue(modelState) - const { getPcsAutoRecommendList } = useMasterController() + const { getPcsVoltageStepUpList } = useMasterController() const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext) const canvas = useRecoilValue(canvasState) const selectedModules = useRecoilValue(selectedModuleState) @@ -64,7 +64,7 @@ export default function StepUp({}) { roofSurfaceList: roofSurfaceList, pscItemList: pscItemList, } - getPcsAutoRecommendList(params) + getPcsVoltageStepUpList(null) }, []) useCanvasPopupStatusController(6) diff --git a/src/hooks/common/useMasterController.js b/src/hooks/common/useMasterController.js index 013c7870..62558d8a 100644 --- a/src/hooks/common/useMasterController.js +++ b/src/hooks/common/useMasterController.js @@ -147,7 +147,7 @@ export function useMasterController() { ], } - return await post({ url: '/api/v1/master/getPcsSeriesItemList', data: params }).then((res) => { + return await post({ url: '/api/v1/master/getPcsSeriesItemList', data: test }).then((res) => { return res }) } @@ -169,6 +169,82 @@ export function useMasterController() { }) } + /** + * PCS 승압설정 정보 조회 + * @param {Max접속(과적)여부} maxConnYn + * @param {동일회로도여부} smpCirYn + * @param {한랭지여부} coldZoneYn + * @param {사용된 모듈아이템 목록} useModuleItemList + * @param {지붕면 목록} roofSurfaceList + * @param {PCS 아이템 목록} pcsItemList + + * @returns + */ + const getPcsVoltageStepUpList = async (params2 = null) => { + const params = { + maxConnYn: 'N', + smpCirYn: 'Y', + coldZoneYn: 'N', + useModuleItemList: [{ itemId: '107077', mixMatlNo: '0' }], + roofSurfaceList: [ + { + roofSurfaceId: '1', + roofSurface: '남서', + roofSurfaceIncl: '5', + moduleList: [ + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + ], + }, + { + roofSurfaceId: '2', + roofSurface: '남서', + roofSurfaceIncl: '5', + moduleList: [ + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + ], + }, + { + roofSurfaceId: '3', + roofSurface: '남', + roofSurfaceIncl: '3', + moduleList: [ + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + { itemId: '107077' }, + ], + }, + ], + pcsItemList: [ + { itemId: '106857', pcsMkrCd: 'MKR001', pcsSerCd: 'SER001' }, + { itemId: '106856', pcsMkrCd: 'MKR001', pcsSerCd: 'SER001' }, + ], + } + + return await post({ url: '/api/v1/master/getPcsVoltageStepUpList', data: params }).then((res) => { + console.log('🚀🚀 ~ getPcsVoltageStepUpList ~ res:', res) + return res + }) + } + return { getRoofMaterialList, getModuleTypeItemList, @@ -178,5 +254,6 @@ export function useMasterController() { getPcsMakerList, getPcsModelList, getPcsAutoRecommendList, + getPcsVoltageStepUpList, } } diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index cad8c57a..080c78c4 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -316,7 +316,7 @@ export function useCanvasSetting() { roofsArray = res.map((item) => { return { roofApply: item.roofApply, - roofSeq: 0, + roofSeq: item.roofSeq, roofMatlCd: item.roofMatlCd, roofWidth: item.roofWidth, roofHeight: item.roofHeight, @@ -381,16 +381,16 @@ export function useCanvasSetting() { roofSizeSet: roofsRow[0].roofSizeSet, roofAngleSet: roofsRow[0].roofAngleSet, roofsData: roofsArray, - selectedRoofMaterial: addRoofs[0], + selectedRoofMaterial: addRoofs.find((roof) => roof.selected), }) }) } catch (error) { console.error('Data fetching error:', error) } - if (!(Object.keys(canvasSetting).length === 0 && canvasSetting.constructor === Object)) { - setBasicSettings({ ...canvasSetting }) - } + // if (!(Object.keys(canvasSetting).length === 0 && canvasSetting.constructor === Object)) { + // setBasicSettings({ ...canvasSetting }) + // } setCanvasSetting({ ...basicSetting }) } diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index 1488fb26..824e4b4a 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -169,6 +169,7 @@ export function useRoofAllocationSetting(id) { roofSizeSet: res[0].roofSizeSet, roofAngleSet: res[0].roofAngleSet, roofsData: roofsArray, + selectedRoofMaterial: selectRoofs.find((roof) => roof.selected), }) setBasicInfo({ roofSizeSet: '' + res[0].roofSizeSet, @@ -188,7 +189,7 @@ export function useRoofAllocationSetting(id) { roofSizeSet: Number(basicSetting.roofSizeSet), roofAngleSet: basicSetting.roofAngleSet, roofAllocationList: currentRoofList.map((item, index) => ({ - roofApply: item.selected === null || item.selected === undefined ? 'true' : item.selected, + roofApply: item.selected, roofSeq: index, roofMatlCd: item.roofMatlCd === null || item.roofMatlCd === undefined ? 'ROOF_ID_WA_53A' : item.roofMatlCd, roofWidth: item.width === null || item.width === undefined ? 0 : Number(item.width),