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

fo: dashboard 주석2

Browse Source
This commit is contained in:
mind-one005
2026-01-05 15:55:45 +09:00
parent 955c969fc5
commit 69c068e823
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/fo/app/store/dashboard/index.tsx
+16 -16
View File
@@ -1420,17 +1420,17 @@ export const dashBoardReducer = (
// 연간
const yearAvg = data.yearData === null ? '' : (
(data.yearData.AVG_INFL_AMNT ? data.yearData.AVG_INFL_AMNT : 0) + // 실제유입량(반류수제거)(m³/일) 평균
(data.yearData.AVG_SUM_FLOW ? data.yearData.AVG_SUM_FLOW : 0) + // api 주석처리되어 있음.
(data.yearData.AVG_SUM_FLOW ? data.yearData.AVG_SUM_FLOW : 0) + // 연계처리량 api 주석처리되어 있음.
(data.yearData.AVG_RETURN_AMNT ? data.yearData.AVG_RETURN_AMNT : 0) // 반류수유량(m³/일) 평균
);
const yearMax = data.yearData === null ? '' : (
(data.yearData.MAX_INFL_AMNT ? data.yearData.MAX_INFL_AMNT : 0) + // 실제유입량(반류수제거)(m³/일) 최대
(data.yearData.MAX_SUM_FLOW ? data.yearData.MAX_SUM_FLOW : 0) + // api 주석처리되어 있음.
(data.yearData.MAX_SUM_FLOW ? data.yearData.MAX_SUM_FLOW : 0) + // 연계처리량 api 주석처리되어 있음.
(data.yearData.MAX_RETURN_AMNT ? data.yearData.MAX_RETURN_AMNT : 0) // 반류수유량(m³/일) 최대
);
const yearMin = data.yearData === null ? '' : (
(data.yearData.MIN_INFL_AMNT ? data.yearData.MIN_INFL_AMNT : 0) + // 실제유입량(반류수제거)(m³/일) 최소
(data.yearData.MIN_SUM_FLOW ? data.yearData.MIN_SUM_FLOW : 0) + // api 주석처리되어 있음.
(data.yearData.MIN_SUM_FLOW ? data.yearData.MIN_SUM_FLOW : 0) + // 연계처리량 api 주석처리되어 있음.
(data.yearData.MIN_RETURN_AMNT ? data.yearData.MIN_RETURN_AMNT : 0) // 반류수유량(m³/일) 최소
);
operationalStatusList[0].yearAvg = yearAvg; // 연간유입평균
@@ -1484,7 +1484,7 @@ export const dashBoardReducer = (
// 연계처리수,지하수유입량
const bscFctCd = fcltyCd;
const res2 = await fetchFlowRateModalList(bscFctCd, searchYear); // /fclt/flow/
const res2 = await fetchFlowRateModalList(bscFctCd, searchYear); // /fclt/flow/ - 일별 유량 조회
//const calData = CalcRainEffect(clone(res2.data), 'SUNNY');
//const calRainData = CalcRainEffect(clone(res2.data), 'RAIN');
@@ -1506,7 +1506,7 @@ export const dashBoardReducer = (
let rainEffectDay = 0;
yearDay = res2.data ? res2.data.length : 1;
res2.data.forEach((item: any) => {
res2.data.forEach((item: any) => { //fetchFlowRateModalList
const month = item.msrDt.substring(4, 6); // 월 추출
const sumFlow = item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0;
@@ -1545,7 +1545,7 @@ export const dashBoardReducer = (
} else if (month === '01' || month === '02') { // 동절기
winterChungchuDay += 1;
winterChungchunSumFlow += sumFlow;
winterChungchunSumFlow += sumFlow; // 연계처리수
sumWinterChungcunFlow += inflAmnt;
winterChungchunDayReturnAvg += returnAmnt;
winterChungchunDayEfflAvg += efflAmnt;
@@ -1632,16 +1632,16 @@ export const dashBoardReducer = (
// 방류량 (청천시) 최소
winterChungchunEfflMin = winterChungchunDayEfflMin
operationalStatusList[0].yearAvg = roundUp(Number(operationalStatusList[0].yearAvg), 0) + roundUp(yearAvgSumFlow, 0);
operationalStatusList[0].yearMax = roundUp(totFlowMax, 0); // + roundUp(yearMaxSumFlow, 0);
operationalStatusList[0].yearMin = roundUp(totFlowMin, 0);
operationalStatusList[0].summerAll = roundUp(Number(operationalStatusList[0].summerAll), 0) + roundUp(summerAll, 0);
operationalStatusList[0].summerThree = roundUp(Number(operationalStatusList[0].summerThree), 0) + roundUp(summerThree, 0);
operationalStatusList[0].summerRain = roundUp(Number(operationalStatusList[0].summerRain), 0) + roundUp(summerRain, 0);
operationalStatusList[0].winterAll = roundUp(Number(operationalStatusList[0].winterAll), 0) + roundUp(winterAll, 0);
operationalStatusList[0].winterSunnyMin = roundUp(winterChungchunTotalInflAmntMin, 0);
operationalStatusList[0].winterSunnyMax = roundUp(winterChungchunTotalInflAmntMax, 0);
operationalStatusList[0].winterSunnyAvg = roundUp(Number(operationalStatusList[0].winterSunnyAvg), 0) + roundUp(winterSunnyAvg, 0);
operationalStatusList[0].yearAvg = roundUp(Number(operationalStatusList[0].yearAvg), 0) + roundUp(yearAvgSumFlow, 0); // 연간 유입 평균 = 하수유입량(순수하수유입량) + 연계처리량 + 반류수유량(m³/일)
operationalStatusList[0].yearMax = roundUp(totFlowMax, 0); // 연간 유입 최대
operationalStatusList[0].yearMin = roundUp(totFlowMin, 0); // 연간 유입 최소
operationalStatusList[0].summerAll = roundUp(Number(operationalStatusList[0].summerAll), 0) + roundUp(summerAll, 0); // 하절기 유입 전기간
operationalStatusList[0].summerThree = roundUp(Number(operationalStatusList[0].summerThree), 0) + roundUp(summerThree, 0); // 하절기 유입 강우시(강우영향일)
operationalStatusList[0].summerRain = roundUp(Number(operationalStatusList[0].summerRain), 0) + roundUp(summerRain, 0); // 하절기 유입 청천시
operationalStatusList[0].winterAll = roundUp(Number(operationalStatusList[0].winterAll), 0) + roundUp(winterAll, 0); // 동절기 유입 전기간
operationalStatusList[0].winterSunnyMin = roundUp(winterChungchunTotalInflAmntMin, 0); // 동절기 유입 최소
operationalStatusList[0].winterSunnyMax = roundUp(winterChungchunTotalInflAmntMax, 0); // 동절기 유입 최대
operationalStatusList[0].winterSunnyAvg = roundUp(Number(operationalStatusList[0].winterSunnyAvg), 0) + roundUp(winterSunnyAvg, 0); // 동절기 유입 평균
// 지하수유입량
const usage = chungcunSumFlow / cntSunnyDay; //calData.length;
apps/fo/app/store/flowRate/index.tsx
+1 -1
View File
@@ -283,7 +283,7 @@ export const flowRateSearchReducer:(set:(fn: (state: FlowRateSearchType) => Flow
const excelDownList: ExcelType[] = [];
const rtnData = data.map((item: flowRateListProps) => {
item.fctCpc = parseFloat(item.fctCpc.toString().replace(/,/g, ''));
item.totInflAmnt = Number(item.inflAmnt || 0) + Number(item.sumFlow || 0) + Number(item.returnAmnt || 0)
item.totInflAmnt = Number(item.inflAmnt || 0) + Number(item.sumFlow || 0) + Number(item.returnAmnt || 0); // 하수유입량 + 연계처리량 + 반류수유량(m³/일)
dataFormSetting(item);
return item;
});