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

-주석 style적용 방식 수정

Browse Source 
-대시보드, rdii조회 rdi계산 원본값에서 반올림한 후 계산되도록 수정
This commit is contained in:
mind-one003
2025-09-09 14:46:11 +09:00
parent 6df0f45fa3
commit 8b2efad803
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/fo/app/components/common/UnderComment.tsx
+1 -2
View File
@@ -11,11 +11,10 @@ type CommentType={
}
function UnderComment({commentStartPoint="☞", commentArray=[], divHeight="14"} :CommentType) {
const height = "mt-"+divHeight;
if(commentArray && commentArray.length > 0){
return (
<div className={height}>
<div className={"mt-"+divHeight}>
{commentArray.map((item, index) => (
<React.Fragment key={"comment" + index}>
<span className="text-2xl font-bold text-gray-500">
apps/fo/app/store/dashboard/index.tsx
+17 -9
View File
@@ -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,
apps/fo/app/store/rdi/index.tsx
+13 -4
View File
@@ -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;