diff --git a/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx b/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx
index 30b97c945..42512f802 100644
--- a/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx
@@ -25,6 +25,8 @@ const tabList = [
{ value: 'tab_term_rain', label: '강우시' }
];
+const commentArray = "[미처리하수 추정량 산식 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD)]";
+
export default function FlowRateModal(props: { fcltyName: string; facilityCd: string; searchYear: string }) {
// 그리드 관련
const { Common, FlowRateModal, searchFlowRateModalList } = useFoStore((state) => state);
@@ -192,12 +194,13 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
"연계처리량(m³/일)": CommaToNumber(item.sumFlow),
"총인반류수량(m³/일)": CommaToNumber(item.returnAmnt),
"방류량(m³/일)": CommaToNumber(item.efflAmnt),
- /* "강우량(mm/일)": item.infoRnDay, */
+ "미처리하수 추정량(m³/일)": CommaToNumber(item.noProcessInflAmnt),
+ "강우량(mm/일)": CommaToNumber(item.infoRnDay),
});
});
}
if (excelDownList && excelDownList.length > 0) {
- downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: props.searchYear+'년 '+props.fcltyName + ' 유량현황', sheetNameArray: [props.fcltyName + ' 유량현황'], headerRange: 'A1:G1' });
+ downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: props.searchYear+'년 '+props.fcltyName + ' 유량현황', sheetNameArray: [props.fcltyName + ' 유량현황'], headerRange: 'A1:H1' });
} else if (prevExcelListRef.current && prevExcelListRef.current.length > 0) {
alert('다운받을 데이터가 없습니다.');
}
@@ -233,6 +236,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
+
+
+
@@ -257,6 +263,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
+
+
+
@@ -281,6 +290,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
+
+
+
@@ -305,6 +317,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
+
+
+
@@ -319,7 +334,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
{}} className="h-[370px]" boldArray={[0,1,2]}/>
-
+
+
+
>
diff --git a/apps/fo/app/pages/(with-layout)/rdi/page.tsx b/apps/fo/app/pages/(with-layout)/rdi/page.tsx
index c2109ad6a..72373f60f 100644
--- a/apps/fo/app/pages/(with-layout)/rdi/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/rdi/page.tsx
@@ -14,6 +14,7 @@ import LoadingOverlay from "@common/business_components/ui/loadingBar";
import UnderComment from "@/app/components/common/UnderComment";
const commentArray = [
+ "적정판단근거 = 하절기(6~8)월 강우일 중 BOD수질이 최저인 일자의 RDII추정량을 기준으로 판단",
"강우시 총 추정유입량 = 청천시 유입하수량 + RDII 추정값",
"주) 처리장 유입부에서 측정된 유량 및 수질조사 자료를 기준으로 산정된 결과임"
]
@@ -202,7 +203,7 @@ export default function Rdi() {
queryClick={chkVal}
excelClick={excelDownload}
initClick={resetVal}
- ref={ref} isAdmin={false} />
+ ref={ref} isAdmin={false} />
diff --git a/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx
index 442c9467f..8ac105698 100644
--- a/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx
@@ -15,6 +15,12 @@ import { useCallback, useEffect, useRef, useState } from "react";
import UnderWaterInputModal from "./modal/page";
import type { UnderWaterProps } from "@/app/store/underWaterInput/types";
import LoadingOverlay from "@common/business_components/ui/loadingBar";
+import UnderComment from "@/app/components/common/UnderComment";
+
+const commentArray = [
+ "적정여부(=연간 지하수유입량/연평균 유입하수량*100)가 20%이하면 “적정”으로 표출, 그 이상은 “초과유입”으로 표출",
+ "지하수 유입량 = 하수처리장 청천시 실제유입량 - (물사용량 × 오수전환율)"
+]
export default function UnderWaterInput() {
const {Common
@@ -238,9 +244,8 @@ export default function UnderWaterInput() {
index !== undefined && cellClick(index)} headName={"지하수유입량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true}/>
+
- ※적정여부 = 연간 지하수유입량/연평균 유입하수량*100
- ※지하수 유입량 = 하수처리장 청천시 실제유입량 - (물사용량 × 오수전환율)
{selectedRow !== null && (
diff --git a/apps/fo/app/store/flowRate/index.tsx b/apps/fo/app/store/flowRate/index.tsx
index 05a41e556..ff406f7d4 100644
--- a/apps/fo/app/store/flowRate/index.tsx
+++ b/apps/fo/app/store/flowRate/index.tsx
@@ -59,7 +59,8 @@ export type modalExcelType = {
"연계처리량(m³/일)": number | '',
"총인반류수량(m³/일)": number | '',
"방류량(m³/일)": number | '',
- /* "강우량(mm/일)": number | string | '', */
+ "미처리하수 추정량(m³/일)": number | '',
+ "강우량(mm/일)": number | string | '',
}
/**
* (2) 모달
@@ -159,7 +160,7 @@ const upHeadListFlowRateModal:TableUpperProps[] = [
{ id: "sumFlow", title: "연계처리량(m³/일)", align:"right"},
{ id: "returnAmnt", title: "총인 반류수량(m³/일)", align:"right"},
{ id: "efflAmnt", title: "방류량(m³/일)", align:"right"},
- { id: "noProcessInflAmnt", title: "미처리하수량(m³/일)", align:"right"},
+ { id: "noProcessInflAmnt", title: "미처리하수 추정량(m³/일)", align:"right"},
{ id: "infoRnDay", title: "강우량(mm/일)", align:"right"}
]