From afce96b673af360554ed749c74f58c4d837229bb Mon Sep 17 00:00:00 2001 From: dongsilove Date: Wed, 3 Dec 2025 00:11:47 +0900 Subject: [PATCH] =?UTF-8?q?fo:=20=EB=B3=80=EC=88=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/app/store/dashboard/index.tsx | 136 ++++++++++++-------------- 1 file changed, 60 insertions(+), 76 deletions(-) diff --git a/apps/fo/app/store/dashboard/index.tsx b/apps/fo/app/store/dashboard/index.tsx index c1c930a99..e0dd2a5fd 100644 --- a/apps/fo/app/store/dashboard/index.tsx +++ b/apps/fo/app/store/dashboard/index.tsx @@ -811,23 +811,23 @@ const calcWaterQltyData = async (data: any[], searchYear : string|undefined, fcl } }); - orgData[5].winterAll = qltyDataSetting(totalInflBodAvgWinter, winterDay, 1); - orgData[6].winterAll = qltyDataSetting(totalEfflBodAvgWinter, winterDay, 1); - orgData[7].winterAll = qltyDataSetting(totalInflTnAvgWinter, winterDay, 3); - orgData[8].winterAll = qltyDataSetting(totalEfflTnAvgWinter, winterDay, 3); - orgData[9].winterAll = qltyDataSetting(totalInflTpAvgWinter, winterDay, 3); - orgData[10].winterAll = qltyDataSetting(totalEfflTpAvgWinter, winterDay, 3); + orgData[5].winterAll = qltyDataSetting(totalInflBodAvgWinter, winterDay, 1); // 동절기 유입BOD + orgData[6].winterAll = qltyDataSetting(totalEfflBodAvgWinter, winterDay, 1); // 동절기 방류BOD + orgData[7].winterAll = qltyDataSetting(totalInflTnAvgWinter, winterDay, 3); // 동절기 유입TN + orgData[8].winterAll = qltyDataSetting(totalEfflTnAvgWinter, winterDay, 3); // 동절기 방류TN + orgData[9].winterAll = qltyDataSetting(totalInflTpAvgWinter, winterDay, 3); // 동절기 유입TP + orgData[10].winterAll = qltyDataSetting(totalEfflTpAvgWinter, winterDay, 3); // 동절기 방류TP //총인설비 orgData[11].winterAll = qltyDataSetting(totalTpInflAvgWinter, noNullWinterDay, 3); orgData[12].winterAll = qltyDataSetting(totalEfflTpAvgWinter, winterDay, 3); - orgData[5].summerAll = qltyDataSetting(totalInflBodAvgSummer, summerDay, 1); - orgData[6].summerAll = qltyDataSetting(totalEfflBodAvgSummer, summerDay, 1); - orgData[7].summerAll = qltyDataSetting(totalInflTnAvgSummer, summerDay, 3); - orgData[8].summerAll = qltyDataSetting(totalEfflTnAvgSummer, summerDay, 3); - orgData[9].summerAll = qltyDataSetting(totalInflTpAvgSummer, summerDay, 3); - orgData[10].summerAll = qltyDataSetting(totalEfflTpAvgSummer, summerDay, 3); + orgData[5].summerAll = qltyDataSetting(totalInflBodAvgSummer, summerDay, 1); // 하절기 유입BOD + orgData[6].summerAll = qltyDataSetting(totalEfflBodAvgSummer, summerDay, 1); // 하절기 방류BOD + orgData[7].summerAll = qltyDataSetting(totalInflTnAvgSummer, summerDay, 3); // 하절기 유입TN + orgData[8].summerAll = qltyDataSetting(totalEfflTnAvgSummer, summerDay, 3); // 하절기 방류TN + orgData[9].summerAll = qltyDataSetting(totalInflTpAvgSummer, summerDay, 3); // 하절기 유입TP + orgData[10].summerAll = qltyDataSetting(totalEfflTpAvgSummer, summerDay, 3); // 하절기 방류TP //총인설비 orgData[11].summerAll = qltyDataSetting(totalTpInflAvgSummer, noNullSummerDay, 3); @@ -841,37 +841,37 @@ const calcWaterQltyData = async (data: any[], searchYear : string|undefined, fcl let noNullChungchunWinterDay = 0; // (1-2) 하절기 - let chungchunInflBodAvgSummer = 0; - let chungchunInflTnAvgSummer = 0; - let chungchunInflTpAvgSummer = 0; - let chungchunEfflBodAvgSummer = 0; - let chungchunEfflTnAvgSummer = 0; - let chungchunEfflTpAvgSummer = 0; - let chungchunTpInflAvgSummer = 0; + let chungchunInflBodAvgSummer = 0; // 하절기 청천시 유입BOD + let chungchunInflTnAvgSummer = 0; // 하절기 청천시 유입TN + let chungchunInflTpAvgSummer = 0; // 하절기 청천시 유입TP + let chungchunEfflBodAvgSummer = 0; // 하절기 청천시 방류BOD + let chungchunEfflTnAvgSummer = 0; // 하절기 청천시 방류TN + let chungchunEfflTpAvgSummer = 0; // 하절기 청천시 방류TP + let chungchunTpInflAvgSummer = 0; // 하절기 청천시 총인설비 유입TP // (1-3) 동절기 (최대, 최소, 평균 다 필요) let chungchunInflBodAvg = 0; - let chungchunInflTnAvg = 0; - let chungchunInflTpAvg = 0; - let chungchunTpInflAvg = 0; + let chungchunInflTnAvg = 0; + let chungchunInflTpAvg = 0; + let chungchunTpInflAvg = 0; let chungchunInflBodMax = 0; - let chungchunInflTnMax= 0; - let chungchunInflTpMax = 0; - let chungchunTpInflMax = 0; + let chungchunInflTnMax = 0; + let chungchunInflTpMax = 0; + let chungchunTpInflMax = 0; let chungchunInflBodMin = 99999999; - let chungchunInflTnMin = 99999999; - let chungchunInflTpMin = 99999999; - let chungchunTpInflMin = 99999999; + let chungchunInflTnMin = 99999999; + let chungchunInflTpMin = 99999999; + let chungchunTpInflMin = 99999999; let chungchunEfflBodAvg = 0; - let chungchunEfflTnAvg = 0; - let chungchunEfflTpAvg = 0; + let chungchunEfflTnAvg = 0; + let chungchunEfflTpAvg = 0; let chungchunEfflBodMax = 0; - let chungchunEfflTnMax= 0; - let chungchunEfflTpMax = 0; + let chungchunEfflTnMax = 0; + let chungchunEfflTpMax = 0; let chungchunEfflBodMin = 99999999; - let chungchunEfflTnMin = 99999999; - let chungchunEfflTpMin = 99999999; + let chungchunEfflTnMin = 99999999; + let chungchunEfflTpMin = 99999999; // 청천시 qltyChungchunData.forEach((item: any) => { @@ -899,41 +899,33 @@ const calcWaterQltyData = async (data: any[], searchYear : string|undefined, fcl chungchunTpInflAvg += tpInfl; if(chungchunInflBodMax < inflbod) chungchunInflBodMax = inflbod; - if(chungchunInflTnMax < infltn) chungchunInflTnMax = infltn; - if(chungchunInflTpMax < infltp) chungchunInflTpMax = infltp; - if(chungchunEfflBodMax < effbod) chungchunEfflBodMax = effbod; - if(chungchunEfflTnMax < efftn) chungchunEfflTnMax = efftn; - if(chungchunEfflTpMax < efftp) chungchunEfflTpMax = efftp; - if(chungchunTpInflMax < tpInfl) chungchunTpInflMax = tpInfl; + if(chungchunInflTnMax < infltn) chungchunInflTnMax = infltn; + if(chungchunInflTpMax < infltp) chungchunInflTpMax = infltp; + if(chungchunEfflBodMax < effbod) chungchunEfflBodMax = effbod; + if(chungchunEfflTnMax < efftn) chungchunEfflTnMax = efftn; + if(chungchunEfflTpMax < efftp) chungchunEfflTpMax = efftp; + if(chungchunTpInflMax < tpInfl) chungchunTpInflMax = tpInfl; if(chungchunInflBodMin > inflbod) chungchunInflBodMin = inflbod; - if(chungchunInflTnMin > infltn) chungchunInflTnMin = infltn; - if(chungchunInflTpMin > infltp) chungchunInflTpMin = infltp; - if(chungchunEfflBodMin > effbod) chungchunEfflBodMin = effbod; - if(chungchunEfflTnMin > efftn) chungchunEfflTnMin = efftn; - if(chungchunEfflTpMin > efftp) chungchunEfflTpMin = efftp; - if(chungchunTpInflMin > tpInfl) chungchunTpInflMin = tpInfl; + if(chungchunInflTnMin > infltn) chungchunInflTnMin = infltn; + if(chungchunInflTpMin > infltp) chungchunInflTpMin = infltp; + if(chungchunEfflBodMin > effbod) chungchunEfflBodMin = effbod; + if(chungchunEfflTnMin > efftn) chungchunEfflTnMin = efftn; + if(chungchunEfflTpMin > efftp) chungchunEfflTpMin = efftp; + if(chungchunTpInflMin > tpInfl) chungchunTpInflMin = tpInfl; }else if(month === '06' || month === '07' || month === '08'){ chungchunSummerDay += 1; if(item.tpInflWqltTp != null && item.tpInflWqltTp != 0){ noNullChungchunSummerDay+=1; } - const inflbod = nullToZero(item.inflAssctBfrWqltBod); - const infltn = nullToZero(item.inflAssctBfrWqltTn); - const infltp = nullToZero(item.inflAssctBfrWqltTp); - const effbod = nullToZero(item.efflWqltBod); - const efftn = nullToZero(item.efflWqltTn); - const efftp = nullToZero(item.efflWqltTp); - const tpInfl = nullToZero(item.tpInflWqltTp); - - chungchunInflBodAvgSummer += inflbod; - chungchunInflTnAvgSummer += infltn; - chungchunInflTpAvgSummer += infltp; - chungchunEfflBodAvgSummer += effbod; - chungchunEfflTnAvgSummer += efftn; - chungchunEfflTpAvgSummer += efftp; - chungchunTpInflAvgSummer += tpInfl; + chungchunInflBodAvgSummer += nullToZero(item.inflAssctBfrWqltBod); + chungchunInflTnAvgSummer += nullToZero(item.inflAssctBfrWqltTn); + chungchunInflTpAvgSummer += nullToZero(item.inflAssctBfrWqltTp); + chungchunEfflBodAvgSummer += nullToZero(item.efflWqltBod); + chungchunEfflTnAvgSummer += nullToZero(item.efflWqltTn); + chungchunEfflTpAvgSummer += nullToZero(item.efflWqltTp); + chungchunTpInflAvgSummer += nullToZero(item.tpInflWqltTp); } }); @@ -1001,21 +993,13 @@ const calcWaterQltyData = async (data: any[], searchYear : string|undefined, fcl noNullRainSummerDay+=1; } - const inflbod = nullToZero(item.inflAssctBfrWqltBod); - const infltn = nullToZero(item.inflAssctBfrWqltTn); - const infltp = nullToZero(item.inflAssctBfrWqltTp); - const effbod = nullToZero(item.efflWqltBod); - const efftn = nullToZero(item.efflWqltTn); - const efftp = nullToZero(item.efflWqltTp); - const tpInfl = nullToZero(item.tpInflWqltTp); - - rainInflBodAvg += inflbod; - rainInflTnAvg += infltn; - rainInflTpAvg += infltp; - rainEfflBodAvg += effbod; - rainEfflTnAvg += efftn; - rainEfflTpAvg += efftp; - rainTpInflAvg += tpInfl; + rainInflBodAvg += nullToZero(item.inflAssctBfrWqltBod); + rainInflTnAvg += nullToZero(item.inflAssctBfrWqltTn); + rainInflTpAvg += nullToZero(item.inflAssctBfrWqltTp); + rainEfflBodAvg += nullToZero(item.efflWqltBod); + rainEfflTnAvg += nullToZero(item.efflWqltTn); + rainEfflTpAvg += nullToZero(item.efflWqltTp); + rainTpInflAvg += nullToZero(item.tpInflWqltTp); } });