From 8b2efad803ed7d1a24cb5d99bdb8a359280c15b8 Mon Sep 17 00:00:00 2001 From: jsyang Date: Tue, 9 Sep 2025 14:46:11 +0900 Subject: [PATCH] =?UTF-8?q?-=EC=A3=BC=EC=84=9D=20style=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95=20-=EB=8C=80?= =?UTF-8?q?=EC=8B=9C=EB=B3=B4=EB=93=9C,=20rdii=EC=A1=B0=ED=9A=8C=20rdi?= =?UTF-8?q?=EA=B3=84=EC=82=B0=20=EC=9B=90=EB=B3=B8=EA=B0=92=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=B0=98=EC=98=AC=EB=A6=BC=ED=95=9C=20=ED=9B=84=20?= =?UTF-8?q?=EA=B3=84=EC=82=B0=EB=90=98=EB=8F=84=EB=A1=9D=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 --- .../fo/app/components/common/UnderComment.tsx | 3 +-- apps/fo/app/store/dashboard/index.tsx | 26 ++++++++++++------- apps/fo/app/store/rdi/index.tsx | 17 +++++++++--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/apps/fo/app/components/common/UnderComment.tsx b/apps/fo/app/components/common/UnderComment.tsx index f8a03769b..898eb861e 100644 --- a/apps/fo/app/components/common/UnderComment.tsx +++ b/apps/fo/app/components/common/UnderComment.tsx @@ -11,11 +11,10 @@ type CommentType={ } function UnderComment({commentStartPoint="☞", commentArray=[], divHeight="14"} :CommentType) { - const height = "mt-"+divHeight; if(commentArray && commentArray.length > 0){ return ( -
+
{commentArray.map((item, index) => ( diff --git a/apps/fo/app/store/dashboard/index.tsx b/apps/fo/app/store/dashboard/index.tsx index f07e8a933..460365ff3 100644 --- a/apps/fo/app/store/dashboard/index.tsx +++ b/apps/fo/app/store/dashboard/index.tsx @@ -404,7 +404,7 @@ const upHeadListDrainageEquipment : TableUpperProps[] = [ { id: "etc", title: "비고", row:0, upName:"upChangeRe7", upSequnce:1 }, ] -let operationalStatusList : OperationalStatusListProps[] = [ +const operationalStatusListOrg : OperationalStatusListProps[] = [ { flowRate : '유량\n(㎥/일)', waterQlty : '유입', @@ -1084,7 +1084,7 @@ export const dashBoardInitState:DashBoardType = { OperationStatus : { isInit : false, upHeadListOperationStatus : upHeadListOperationStatus, - operationalStatusList : operationalStatusList, + operationalStatusList : operationalStatusListOrg, isLoadingOperationStatus : false, }, @@ -1395,8 +1395,10 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType) let winterChungchunEfflMax = 1 ; let winterChungchunEfflMin = 1 ; - let rdiPercent = 0; + const clone = (arr: any[]) => arr?.map(v => ({ ...v })) ?? []; + let rdiPercent = 0; + let operationalStatusList = clone(operationalStatusListOrg); if(data && operationalStatusList){ // 유량 - 유입 if (operationalStatusList?.[0]) { @@ -1512,7 +1514,6 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType) } }); - const clone = (arr: any[]) => arr?.map(v => ({ ...v })) ?? []; const calData = CalcRainEffect(clone(res2.data), 'SUNNY'); const calRainData = CalcRainEffect(clone(res2.data), 'RAIN'); @@ -1712,10 +1713,15 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType) winterCnt += 1; }); - const winterBodAvg = winterBodSunny / winterCnt; + const roundMinSummerBodInfl = Number(roundNumber(minSummerBodInfl, 0).toString().replaceAll(',','')); + const roundMinSummerBod = Number(roundNumber(minSummerBod, 1).toString().replaceAll(',','')); + const roundWinterBodSunny = Number(roundNumber(winterBodSunny, 1).toString().replaceAll(',','')); + + const winterBodAvg = Number(roundNumber((roundWinterBodSunny / winterCnt), 1).toString().replaceAll(',','')); // 하절기(6~8월) 중 최저 유입 BOD일때 유입유량 x ((동절기 청천시 유입BOD - 하절기(6~8월) 중 최저 유입BOD) / (동절기 청천시 유입BOD)) - const winMinusSum = winterBodAvg - minSummerBod; - const rdiValue = winMinusSum===0 ? 0 : minSummerBodInfl * ((winMinusSum / winterBodAvg )); + const winMinusSum = winterBodAvg - roundMinSummerBod; + + const rdiValue = winMinusSum===0 ? 0 : roundMinSummerBodInfl * (winMinusSum / winterBodAvg ); rdiPercent = (rdiValue / minSummerBodInfl) * 100; @@ -1838,13 +1844,15 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType) } const rtnData = await calcWaterQltyData(operationalStatusList, searchYear, fcltyCd); - operationalStatusList = rtnData; // 총인설비가 없을 경우 제외 console.log('총인시설 여부 : ', data.yearData.TP_FCT_YN); + console.log('rtnData : ', rtnData); if(data.yearData.TP_FCT_YN !== 'Y') { - operationalStatusList = operationalStatusList.slice(0, 11); + operationalStatusList = rtnData.slice(0, 11); + }else{ + operationalStatusList = rtnData; } set((state: DashBoardType) => ({ ...state, diff --git a/apps/fo/app/store/rdi/index.tsx b/apps/fo/app/store/rdi/index.tsx index 601a925a0..4b344df12 100644 --- a/apps/fo/app/store/rdi/index.tsx +++ b/apps/fo/app/store/rdi/index.tsx @@ -336,11 +336,20 @@ export const rdiReducer:(set:SetStateFunction)=>RdiActions=(set: SetStateFunctio minSummerBod = minSummerBod === 99999999 ? 0 : minSummerBod; minSummerBodInfl = minSummerBodInfl === 99999999 ? 0 : minSummerBodInfl; - const winterBodAvg = winterBodSunny / winterCnt; + const roundMinSummerBodInfl = Number(roundNumber(minSummerBodInfl, 0).toString().replaceAll(',','')); + const roundMinSummerBod = Number(roundNumber(minSummerBod, 1).toString().replaceAll(',','')); + const roundWinterBodSunny = Number(roundNumber(winterBodSunny, 1).toString().replaceAll(',','')); + + console.log('bsccd : ', item.bscFctCd); + console.log('roundMinSummerBodInfl : ',roundMinSummerBodInfl); + console.log('roundMinSummerBod : ',roundMinSummerBod); + console.log('roundWinterBodSunny : ',roundWinterBodSunny); + + const winterBodAvg = Number(roundNumber((roundWinterBodSunny / winterCnt), 1).toString().replaceAll(',','')); // 하절기(6~8월) 중 최저 유입 BOD일때 유입유량 x ((동절기 청천시 유입BOD - 하절기(6~8월) 중 최저 유입BOD) / (동절기 청천시 유입BOD)) - const winMinusSum = winterBodAvg - minSummerBod; - console.log(item.bscFctCd+' '+minSummerBodInfl+' '+winMinusSum+' ('+winterBodSunny+' '+winterCnt+') '+' '+winterBodSunny) - const rdiValue = winMinusSum===0 ? 0 : minSummerBodInfl * ((winMinusSum / winterBodAvg )); + const winMinusSum = winterBodAvg - roundMinSummerBod; + + const rdiValue = winMinusSum===0 ? 0 : roundMinSummerBodInfl * (winMinusSum / winterBodAvg ); rtnWinterInflBod = winterBodAvg; rtnSummerBodInfl = minSummerBodInfl;