From 95007191ea44e7e630cf4fd67989d77bd32f6820 Mon Sep 17 00:00:00 2001 From: jsyang Date: Mon, 18 Aug 2025 15:56:10 +0900 Subject: [PATCH] =?UTF-8?q?-=202021=EB=85=84=20=EC=9D=B4=EC=A0=84=EC=9D=80?= =?UTF-8?q?=20()=EB=A1=9C=20cod=EC=95=88=EB=82=B4=20-=20=EC=98=A4=EC=88=98?= =?UTF-8?q?=EC=A0=84=ED=99=98=EC=9C=A8=2090%=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/app/store/facilityWaterQlty/index.tsx | 6 +++-- apps/fo/app/store/sewageOccur/index.tsx | 18 +++++++-------- apps/fo/app/store/underWaterInput/index.tsx | 22 +++++++++---------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/apps/fo/app/store/facilityWaterQlty/index.tsx b/apps/fo/app/store/facilityWaterQlty/index.tsx index dc3eb015a..cb8bf84e1 100644 --- a/apps/fo/app/store/facilityWaterQlty/index.tsx +++ b/apps/fo/app/store/facilityWaterQlty/index.tsx @@ -449,6 +449,8 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType item.fctCpc = parseFloat(item.fctCpc.toString().replace(/,/g, '')); item.sidoNm = item.lclgvrnmntNm.split(' ')[0]?.toString() || ''; item.sggNm = item.lclgvrnmntNm.split(' ')[1]?.toString() || ''; + item.inflAssctAftWqltToc = Number(searchYear)<2021? "("+item.inflAssctAftWqltToc+")" : item.inflAssctAftWqltToc; + item.inflAssctBfrWqltToc = Number(searchYear)<2021? "("+item.inflAssctBfrWqltToc+")" : item.inflAssctBfrWqltToc; excelDownList.push({ 시설코드: item.bscFctCd, 권역: item.rvbsn, @@ -478,6 +480,8 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType item.fctCpc = parseFloat(item.fctCpc.toString().replace(/,/g, '')); item.sidoNm = item.lclgvrnmntNm.split(' ')[0]?.toString() || ''; item.sggNm = item.lclgvrnmntNm.split(' ')[1]?.toString() || ''; + item.inflAssctAftWqltToc = Number(searchYear)<2021? "("+item.inflAssctAftWqltToc+")" : item.inflAssctAftWqltToc; + item.inflAssctBfrWqltToc = Number(searchYear)<2021? "("+item.inflAssctBfrWqltToc+")" : item.inflAssctBfrWqltToc; }); } set((state: FacilityWaterQltyType) => ({ @@ -620,7 +624,6 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType if(item.efflWqltTn){ item.efflWqltTn = Number(Math.round(Number(item.efflWqltTn) * 1000)/1000).toFixed(3); } - if(item.inflAssctBfrWqltTp){ item.inflAssctBfrWqltTp = Number(Math.round(Number(item.inflAssctBfrWqltTp) * 1000)/1000).toFixed(3); } @@ -657,7 +660,6 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType }else{ item.tpInflWqltBod = ''; } - if(item.tpInflWqltTp){ item.tpInflWqltTp = item.tpInflWqltTp?Number(Math.round(Number(item.tpInflWqltTp) * 1000)/1000).toFixed(3): Number(item.tpInflWqltTp)===0?'0.000':''; }else{ diff --git a/apps/fo/app/store/sewageOccur/index.tsx b/apps/fo/app/store/sewageOccur/index.tsx index c89bf6bfe..ecab9587f 100644 --- a/apps/fo/app/store/sewageOccur/index.tsx +++ b/apps/fo/app/store/sewageOccur/index.tsx @@ -225,7 +225,7 @@ export const sewageOccurReducer:(set:any)=>SewageOccurActions=(set: any) => { item.sidoNm = item.lclgvrnmntNm.split(' ')[0]?.toString() || ''; item.sggNm = item.lclgvrnmntNm.split(' ')[1]?.toString() || ''; item.fctCpc = parseFloat(item.fctCpc.toString().replace(/,/g, '')); - item.swageChangePercent = 80; + item.swageChangePercent = 90; const bscFctCd = item.bscFctCd; const res2 = await getFetch('fo', '/fclt/flow/' + bscFctCd + '/' + searchYear) as FlowResponse; @@ -372,8 +372,8 @@ export const sewageOccurReducer:(set:any)=>SewageOccurActions=(set: any) => { tableData.push({ msrDt: item.yr+'-'+(index+1>=10?String(index+1):'0'+(index+1)), waterUsage: Math.round(item.usege*100) /100, - swageChangePercent: (Math.round((item.usege/item.usege*0.8) * 100) / 100) * 100, - estimationSewage: Math.round(item.usege*0.8 * 100) / 100 + swageChangePercent: (Math.round((item.usege/item.usege*0.9) * 100) / 100) * 100, + estimationSewage: Math.round(item.usege*0.9 * 100) / 100 }) if (item.usege > maxWaterUsage) { maxWaterUsage = item.usege; @@ -390,20 +390,20 @@ export const sewageOccurReducer:(set:any)=>SewageOccurActions=(set: any) => { { msrDt: '평균', waterUsage: Math.round(avgWaterUsage*100) /100, - swageChangePercent: 80, - estimationSewage: Math.round(avgWaterUsage*0.8*100) /100, + swageChangePercent: 90, + estimationSewage: Math.round(avgWaterUsage*0.9*100) /100, }, { msrDt: '최대', waterUsage: Math.round(maxWaterUsage*100) /100, - swageChangePercent: 80, - estimationSewage: Math.round(maxWaterUsage*0.8*100) /100, + swageChangePercent: 90, + estimationSewage: Math.round(maxWaterUsage*0.9*100) /100, }, { msrDt: '최소', waterUsage: Math.round(minWaterUsage*100) /100, - swageChangePercent: 80, - estimationSewage: Math.round(minWaterUsage*0.8*100) /100, + swageChangePercent: 90, + estimationSewage: Math.round(minWaterUsage*0.9*100) /100, }, ...tableData ] diff --git a/apps/fo/app/store/underWaterInput/index.tsx b/apps/fo/app/store/underWaterInput/index.tsx index 71ed753a9..986a0afe3 100644 --- a/apps/fo/app/store/underWaterInput/index.tsx +++ b/apps/fo/app/store/underWaterInput/index.tsx @@ -367,9 +367,9 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy console.log('usage : ', usage, 'summerUsage : ', summerUsage, 'winterUsage : ', winterUsage); } - item.underWaterInputYear = Math.round((usage-(usage*0.65*0.8)) * 100) / 100; - item.underWaterInputSummer = Math.round((summerUsage-(summerUsage*0.65*0.8)) * 100) / 100; - item.underWaterInputWinter = Math.round((winterUsage-(winterUsage*0.65*0.8)) * 100) / 100; + item.underWaterInputYear = Math.round((usage-(usage*0.65*0.9)) * 100) / 100; + item.underWaterInputSummer = Math.round((summerUsage-(summerUsage*0.65*0.9)) * 100) / 100; + item.underWaterInputWinter = Math.round((winterUsage-(winterUsage*0.65*0.9)) * 100) / 100; return item; })); @@ -456,8 +456,8 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy tableData.push({ msrDt: item.yr+'-'+(index+1>=10?String(index+1):'0'+(index+1)), realSewageInput:Math.round(item.usege*100) /100, - sewageOccur:Math.round(item.usege*0.65*0.8 * 100) / 100, - underWaterInput:Math.round((item.usege-(item.usege*0.65*0.8)) * 100) / 100, + sewageOccur:Math.round(item.usege*0.65*0.9 * 100) / 100, + underWaterInput:Math.round((item.usege-(item.usege*0.65*0.9)) * 100) / 100, }) if (item.usege > maxWaterUsage) { maxWaterUsage = item.usege; @@ -475,21 +475,21 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy { msrDt: '평균', realSewageInput:Math.round(avgWaterUsage*100) /100, - sewageOccur:Math.round(avgWaterUsage*0.65*0.8 * 100) / 100, - underWaterInput: Math.round((avgWaterUsage-(avgWaterUsage*0.65*0.8)) * 100) / 100 + sewageOccur:Math.round(avgWaterUsage*0.65*0.9 * 100) / 100, + underWaterInput: Math.round((avgWaterUsage-(avgWaterUsage*0.65*0.9)) * 100) / 100 //underWaterInput:Math.round((avgWaterUsage-(avgWaterUsage*0.65*0.8)) * 100) / 100, }, { msrDt: '최대', realSewageInput: Math.round(maxWaterUsage*100) /100, - sewageOccur: Math.round(maxWaterUsage*0.65*0.8 * 100) / 100, - underWaterInput: Math.round((maxWaterUsage-(maxWaterUsage*0.65*0.8)) * 100) / 100, + sewageOccur: Math.round(maxWaterUsage*0.65*0.9 * 100) / 100, + underWaterInput: Math.round((maxWaterUsage-(maxWaterUsage*0.65*0.9)) * 100) / 100, }, { msrDt: '최소', realSewageInput: Math.round(minWaterUsage*100) /100, - sewageOccur: Math.round(minWaterUsage*0.65*0.8 * 100) / 100, - underWaterInput: Math.round((minWaterUsage-(minWaterUsage*0.65*0.8)) * 100) / 100, + sewageOccur: Math.round(minWaterUsage*0.65*0.9 * 100) / 100, + underWaterInput: Math.round((minWaterUsage-(minWaterUsage*0.65*0.9)) * 100) / 100, }, ...tableData ]