From 7092da42d646b7ecd417601b3f8f2e1e2217d056 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Wed, 25 Jun 2025 14:15:14 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=AC=EC=9D=B4=EC=9A=A9=EC=8B=A4=EC=A0=81?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prfmncSttn/pbnstPrfmncSttn/page.tsx | 20 ++++++++++++------- .../prfmncSttn/pbnstPrfmncSttn/index.tsx | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx index 8130dfbd5..a50c08071 100644 --- a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx @@ -91,6 +91,7 @@ export default function PbnstPrfmncSttn() { const prfFilter = prfList?.filter((e) => e.ym.slice(0, 4) === year) if (prfList && prfFilter.length > 0) { + prfList?.forEach((prfItem) => { const month = Number(prfItem?.ym?.slice(4)); // "MM" const monthKey = `${month}월`; @@ -194,11 +195,13 @@ export default function PbnstPrfmncSttn() { const dnOutData: dnChartForm[] = []; if (rawData) { + prfTableData([], year) rawData.forEach((item) => { // 실적 테이블 데이터 if (chartId){ - if(item.prfList?.[0]?.ym.slice(0, 4) === year && item.prfList?.[0]?.pbnstRuseFcltFk === chartId) - prfTableData(item.prfList, year); + if(item.prfList?.[0]?.ym.slice(0, 4) === year && item.prfList?.[0]?.pbnstRuseFcltFk === chartId){ + prfTableData(item.prfList, year); + } item.prfList.filter((e) => e.ym.slice(0, 4) === year && e.pbnstRuseFcltFk === chartId).forEach((element) => { // 누적 wshwtr += element.wshwtr; @@ -463,6 +466,7 @@ export default function PbnstPrfmncSttn() { useEffect(() => { setbdstTable(prfmncRes); + if(prfmncRes?.[0]?.pbnstRuseFcltPk) setChartId(prfmncRes[0].pbnstRuseFcltPk) }, [prfmncRes]); @@ -525,21 +529,21 @@ export default function PbnstPrfmncSttn() { setPbnRuseNm(searchNm || ""); }} setRtnData={function (rtnData: any[]): void { - setbdstTable(rtnData); + // setbdstTable(rtnData); }} searchList={pbnstSttn.pbnstSearchData || []} > - { }} /> + onSelectValue={() => { }} /> */} } queryClick={function (returnType: ReturnType): void { - pbnstPrfmncSearch(returnType, swtrmtFcltNm ?? "", fromDate, toDate); + pbnstPrfmncSearch(returnType, pbnRuseNm ?? "", fromDate, toDate); if (fromDate && toDate) { const fromNum = Number(fromDate); const toNum = Number(toDate); @@ -573,7 +577,9 @@ export default function PbnstPrfmncSttn() { cellClick={(index: number | undefined, headId: string) => { cellClick(index ?? undefined, headId); }} - onPageChange={() => { }} + onPageChange={() => { } + } + index={0} />
diff --git a/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx b/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx index c2cee87d6..b513085ae 100644 --- a/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx +++ b/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx @@ -152,7 +152,7 @@ export const pbnstPrfmncSttnActionsExport: (set: any) => pbnstPrfmncSttnActions res.data.forEach((item) => { if (item.prfList.length === 0) { const year = ""; // 연도 정보가 없으면 빈 문자열, 필요시 item에서 추출 - const yearVal = { year: year, pbnstRuseFcltPk: item.pbnstRuseFcltPk ?? "" }; + const yearVal = { year: year, pbnstRuseFcltPk: item.pbnstRuseFcltPk ?? "", ruseUtztnFcltNm : item.ruseUtztnFcltNm ?? "" }; yearVal[year + "inUsage"] = 0; yearVal[year + "outUsage"] = 0; yearVal[year + "total"] = 0; @@ -188,7 +188,7 @@ export const pbnstPrfmncSttnActionsExport: (set: any) => pbnstPrfmncSttnActions yearData[year + "outUsage"] += outUsageSum; yearData[year + "total"] += (inUsageSum + outUsageSum); } else { - const yearVal = { year: year, pbnstRuseFcltPk: acc.pbnstRuseFcltFk }; + const yearVal = { year: year, pbnstRuseFcltPk: acc.pbnstRuseFcltFk, ruseUtztnFcltNm : item.ruseUtztnFcltNm ?? "" }; yearVal[year + "inUsage"] = inUsageSum; yearVal[year + "outUsage"] = outUsageSum; yearVal[year + "total"] = inUsageSum + outUsageSum;