From 9e339cd4512d4549d337705c85dce6b117d6edef Mon Sep 17 00:00:00 2001 From: swcho Date: Sun, 27 Jul 2025 13:41:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix,=20feat:=20-=20=EB=B9=97=EB=AC=BC?= =?UTF-8?q?=ED=8E=8C=ED=94=84=20=EC=9E=90=EC=B2=B4=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20'=EC=B2=98=EB=A6=AC=EA=B5=AC=EC=97=AD',=20?= =?UTF-8?q?'=EC=B2=98=EB=A6=AC=EB=B6=84=EA=B5=AC'=20->=20'=EB=B0=B0?= =?UTF-8?q?=EC=88=98=EA=B5=AC=EC=97=AD',=20'=EB=B0=B0=EC=88=98=EB=B6=84?= =?UTF-8?q?=EA=B5=AC'=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95=20-=20?= =?UTF-8?q?=EC=9A=B4=EC=98=81=EC=A0=95=EB=B3=B4=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=97=90=20=EC=9D=BC=EB=A0=A8=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/components/popupComponent/sewagePump.tsx | 4 ++-- .../app/(map-layout)/map/searchModal/operationTab.tsx | 4 ++++ .../app/(map-layout)/map/searchModal/searchModal.tsx | 10 +++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx index 2a945edbc..2cde31b64 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx @@ -2,8 +2,8 @@ import { VerticalTable } from '@/components/ui/verticalTable'; import React, { useState, useEffect } from 'react' // 빗물펌프 자체 입력 정보 const exclnInputColumn = [ - { id: "swtrmtZoneCd", title: "처리구역", type: "input" }, - { id: "mltvDtdvNm", title: "처리분구", type: "input" }, + { id: "swtrmtZoneCd", title: "배수구역", type: "input" }, + { id: "mltvDtdvNm", title: "배수분구", type: "input" }, { id: "dsgnFrqnc", title: "설계빈도(년)", type: "input" }, ] // 오수펌프 자체 입력 정보 diff --git a/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx b/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx index a3ec069e9..16a3360e0 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx @@ -39,6 +39,7 @@ export const BIZ_TY_CD_SELECT_ARRAY = BIZ_TY_CD.map(item => ({ })); // 운영정보 - 사업 현황 export const operationTableHeadlist = [ + { id: 'rowNumber', title: '일련번호' }, { id: "bizNm", title: "사업명" }, { id: "flfmtBgngYmd", title: "수행시작일자" }, { id: "flfmtEndYmd", title: "수행종료일자" }, @@ -48,6 +49,7 @@ export const operationTableHeadlist = [ ]; // 운영정보 - 보수 및 갱신 결과표 export const operationMaintenanceTableHeadlist = [ + { id: 'rowNumber', title: '일련번호' }, { id: "fcltMngNo", title: "관리번호" }, { id: "usgCd", title: "용도" }, { id: "mqltCd", title: "재질" }, @@ -58,6 +60,7 @@ export const operationMaintenanceTableHeadlist = [ ]; // 운영정보 - 청소 및 준설 결과표 export const operationCleaningTableHeadlist = [ + { id: 'rowNumber', title: '일련번호' }, { id: "fcltMngNo", title: "관리번호" }, { id: "usgCd", title: "용도" }, { id: "mqltCd", title: "재질" }, @@ -67,6 +70,7 @@ export const operationCleaningTableHeadlist = [ ]; // 운영정보 - 점검 및 진단 결과표 export const operationInspectionTableHeadlist = [ + { id: 'rowNumber', title: '일련번호' }, { id: "fcltMngNo", title: "관리번호" }, { id: "usgCd", title: "용도" }, { id: "mqltCd", title: "재질" }, diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx index 749edfb38..d264455fd 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx @@ -265,12 +265,13 @@ const SearchModal: React.FC = ({ console.log('필터링된 API 결과(개수):', res.totalElements); console.log('필터링된 API 결과(데이터):', res.content); - const mappedContent = (res.content || []).map((item: any) => { + const mappedContent = (res.content || []).map((item: any, index: number) => { console.log("item:", item); const formattedItem = formatDisplayData(item); const matched = BIZ_TY_CD.find(code => code.lwpoCd === item.bizTyCd); return { ...formattedItem, + rowNumber: (curPage - 1) * 4 + index + 1, // 1부터 시작하는 일련번호 추가 bizTyCd: matched ? matched.lwpoCdNm : item.bizTyCd, }; }); @@ -529,11 +530,13 @@ const SearchModal: React.FC = ({ console.log('운영정보 cellClick 데이터:', res); console.log('운영정보 length:', res.data.length); - const mappedData = (res.data || []).map((item: any) => { + const mappedData = (res.data || []).map((item: any, detailIndex: number) => { + console.log("detailIndex", detailIndex); const usgCdObj = MS_SWAGE_PPL_USE_CODES.find(code => code.val === item.usgCd.trim()); const mqltCdObj = MS_SWAGE_PPL_CODES.find(code => code.val === item.mqltCd.trim()); return { ...item, + rowNumber: (detailCurPage - 1) * 4 + detailIndex + 1, usgCd: usgCdObj ? usgCdObj.text : item.usgCd, mqltCd: mqltCdObj ? mqltCdObj.text : item.mqltCd, }; @@ -564,11 +567,12 @@ const SearchModal: React.FC = ({ console.log('운영정보 페이지네이션 데이터:', res); console.log('운영정보 페이지네이션 length:', res.data.length); - const mappedData = (res.data || []).map((item: any) => { + const mappedData = (res.data || []).map((item: any, detailIndex: number) => { const usgCdObj = MS_SWAGE_PPL_USE_CODES.find(code => code.val === item.usgCd.trim()); const mqltCdObj = MS_SWAGE_PPL_CODES.find(code => code.val === item.mqltCd.trim()); return { ...item, + rowNumber: (detailCurPage - 1) * 4 + detailIndex + 1, usgCd: usgCdObj ? usgCdObj.text : item.usgCd, mqltCd: mqltCdObj ? mqltCdObj.text : item.mqltCd, }; From 46b98b99e2ba01493e2258c7d29ecdbc75f46576 Mon Sep 17 00:00:00 2001 From: swcho Date: Sun, 27 Jul 2025 13:47:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=9A=B4=EC=98=81=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC=20=EC=B0=BD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=84=A4=EC=B9=98=EC=9D=BC=EC=9E=90=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/(map-layout)/map/searchModal/searchModal.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx index d264455fd..9f323f9a6 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx @@ -531,11 +531,12 @@ const SearchModal: React.FC = ({ console.log('운영정보 length:', res.data.length); const mappedData = (res.data || []).map((item: any, detailIndex: number) => { - console.log("detailIndex", detailIndex); + const formattedItem = formatDisplayData(item); + const usgCdObj = MS_SWAGE_PPL_USE_CODES.find(code => code.val === item.usgCd.trim()); const mqltCdObj = MS_SWAGE_PPL_CODES.find(code => code.val === item.mqltCd.trim()); return { - ...item, + ...formattedItem, rowNumber: (detailCurPage - 1) * 4 + detailIndex + 1, usgCd: usgCdObj ? usgCdObj.text : item.usgCd, mqltCd: mqltCdObj ? mqltCdObj.text : item.mqltCd, @@ -564,14 +565,14 @@ const SearchModal: React.FC = ({ bizId: String(detailBizId), }; const res = await getData(`v1/bizInfo/fclts?${new URLSearchParams(RequestDTO).toString()}`); - console.log('운영정보 페이지네이션 데이터:', res); - console.log('운영정보 페이지네이션 length:', res.data.length); const mappedData = (res.data || []).map((item: any, detailIndex: number) => { + const formattedItem = formatDisplayData(item); + const usgCdObj = MS_SWAGE_PPL_USE_CODES.find(code => code.val === item.usgCd.trim()); const mqltCdObj = MS_SWAGE_PPL_CODES.find(code => code.val === item.mqltCd.trim()); return { - ...item, + ...formattedItem, rowNumber: (detailCurPage - 1) * 4 + detailIndex + 1, usgCd: usgCdObj ? usgCdObj.text : item.usgCd, mqltCd: mqltCdObj ? mqltCdObj.text : item.mqltCd,