From f425a303e540f3e9e6a83263bb7ac9e88ef2f76b Mon Sep 17 00:00:00 2001 From: jsyang Date: Thu, 21 Aug 2025 11:00:02 +0900 Subject: [PATCH] =?UTF-8?q?-=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=20?= =?UTF-8?q?=EC=82=B0=EC=8B=9D=20=EC=B6=94=EA=B0=80=20-=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=EC=88=98=EC=A0=95=20-=20CalcRainEffect=EC=97=90=20?= =?UTF-8?q?=EA=B0=95=EC=9A=B0=EB=9F=89=20x=EC=8B=9C=200.0=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/app/components/common/CalcRainEffect.tsx | 4 ++++ apps/fo/app/pages/(with-layout)/rdi/page.tsx | 2 +- .../pages/(with-layout)/underWaterInput/page.tsx | 1 + apps/fo/app/store/flowRate/index.tsx | 2 +- apps/fo/app/store/underWaterInput/index.tsx | 13 ++++++++++--- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/apps/fo/app/components/common/CalcRainEffect.tsx b/apps/fo/app/components/common/CalcRainEffect.tsx index faa3a5a38..7df07c71b 100644 --- a/apps/fo/app/components/common/CalcRainEffect.tsx +++ b/apps/fo/app/components/common/CalcRainEffect.tsx @@ -21,6 +21,10 @@ export default function CalcRainEffect(data : any, weather='ALL') { } else { item.rainEffectDay = 0; } + + if(item.infoRnDay == 'x'){ + item.infoRnDay = '0.0'; + } } } diff --git a/apps/fo/app/pages/(with-layout)/rdi/page.tsx b/apps/fo/app/pages/(with-layout)/rdi/page.tsx index 72b1f16a2..9f0fef1b3 100644 --- a/apps/fo/app/pages/(with-layout)/rdi/page.tsx +++ b/apps/fo/app/pages/(with-layout)/rdi/page.tsx @@ -197,7 +197,7 @@ export default function Rdi() {
- ※ 강우시 총 추정유입량 = 청천시 유입하수량 + RDII 추정값 + ※ 강우시 총 추정유입량 = 청천시 유입하수량 + RDII 추정값

※ 주) 처리장 유입부에서 측정된 유량 및 수질조사 자료를 기준으로 산정된 결과임 diff --git a/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx index e731fb7a3..458e2c656 100644 --- a/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx +++ b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx @@ -223,6 +223,7 @@ export default function UnderWaterInput() { index !== undefined && cellClick(index)} headName={"지하수유입량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} /> + ※연평균 유입하수량 = 연간 지하수유입량/연평균 유입하수량*100

※지하수 유입량 = 하수처리장 청천시 실제유입량 - (물사용량 × 오수전환율) diff --git a/apps/fo/app/store/flowRate/index.tsx b/apps/fo/app/store/flowRate/index.tsx index 011c08163..35e67815f 100644 --- a/apps/fo/app/store/flowRate/index.tsx +++ b/apps/fo/app/store/flowRate/index.tsx @@ -320,7 +320,7 @@ export const flowRateSearchReducer:(set:(fn: (state: FlowRateSearchType) => Flow searchFlowRateModalList: async (bscFctCd: string, searchYear: string) => { const res = await fetchFlowRateModalList(bscFctCd, searchYear); const data = CalcRainEffect(res.data); - + const rtnData = data.map((item: FlowRateModalProps) => { item.totInflAmnt = Number(item.inflAmnt || 0) + Number(item.sumFlow || 0) + Number(item.returnAmnt || 0) dataFormSetting(item); diff --git a/apps/fo/app/store/underWaterInput/index.tsx b/apps/fo/app/store/underWaterInput/index.tsx index fb064deef..1587d6933 100644 --- a/apps/fo/app/store/underWaterInput/index.tsx +++ b/apps/fo/app/store/underWaterInput/index.tsx @@ -39,7 +39,7 @@ const upHeadList1:TableUpperProps[] = [ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 }, { id: "daddr", title: "주소", row:0, rowSpan:2 }, { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 }, - { id: "inflAmnt", title: "평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 }, + { id: "inflAmnt", title: "연 평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 }, { id: "C", title: "지하수 유입량 추정", align:"right", row:0, colSpan:3 }, { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1 }, { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1 }, @@ -55,7 +55,7 @@ const upHeadList2:TableUpperProps[] = [ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 }, { id: "daddr", title: "주소", row:0, rowSpan:2 }, { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 }, - { id: "inflAmnt", title: "평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 }, + { id: "inflAmnt", title: "연 평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 }, { id: "C", title: "지하수 유입량 추정", align:"right", row:0, colSpan:3 }, { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1 }, { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1 }, @@ -75,7 +75,7 @@ const upHeadList3:TableUpperProps[] = [ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 }, { id: "daddr", title: "주소", row:0, rowSpan:2 }, { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 }, - { id: "inflAmnt", title: "평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 }, + { id: "inflAmnt", title: "연 평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 }, { id: "C", title: "지하수 유입량 추정", align:"right", row:0, colSpan:3 }, { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1 }, { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1 }, @@ -418,6 +418,13 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy } }); + + if(monthData.length == 0){ + maxWaterUsage = 0; + avgWaterUsage = 0; + minWaterUsage = 0; + } + console.log('tot', tot, 'calData.length', calData.length); avgWaterUsage = tot/cnt; console.log(avgWaterUsage);