ONAANDALL/frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 페이지에 산식 추가

Browse Source 
- 오타수정
- CalcRainEffect에 강우량 x시 0.0으로 표시
This commit is contained in:
mind-one003
2025-08-21 11:00:02 +09:00
parent fc70b9c4be
commit f425a303e5
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/fo/app/components/common/CalcRainEffect.tsx
+4
View File
@@ -21,6 +21,10 @@ export default function CalcRainEffect(data : any, weather='ALL') {
} else {
item.rainEffectDay = 0;
}
if(item.infoRnDay == 'x'){
item.infoRnDay = '0.0';
}
}
}
apps/fo/app/pages/(with-layout)/rdi/page.tsx
+1 -1
View File
@@ -197,7 +197,7 @@ export default function Rdi() {
<div className={widthSize}>
<UiTable cellClick={ undefined } headName={"RDII추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} />
</div>
<span className="text-2xl text-gray-500">※ 강우시 총 추정유입량 = 청천시 유입하수량 + RDII 추정값</span>
<span className="text-2xl text-gray-500">※ 강우시 총 추정유입량 = 청천시 유입하수량 + RDII 추정값</span><br></br>
<span className="text-2xl text-gray-500">※ 주) 처리장 유입부에서 측정된 유량 및 수질조사 자료를 기준으로 산정된 결과임</span>
</div>
</ListDiv>
apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx
+1
View File
@@ -223,6 +223,7 @@ export default function UnderWaterInput() {
<UiTable cellClick={(index: number | undefined) => index !== undefined && cellClick(index)} headName={"지하수유입량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} />
</div>
</div>
<span className="text-2xl text-gray-500">※연평균 유입하수량 = 연간 지하수유입량/연평균 유입하수량*100 </span><br></br>
<span className="text-2xl text-gray-500">※지하수 유입량 = 하수처리장 청천시 실제유입량 - (물사용량 × 오수전환율)</span>
</ListDiv>
</ContentsDiv>
apps/fo/app/store/flowRate/index.tsx
+1 -1
View File
@@ -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);
apps/fo/app/store/underWaterInput/index.tsx
+10 -3
View File
@@ -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);