From 7ca09a60d866ae81265ca98d7ec94dd1072909c5 Mon Sep 17 00:00:00 2001 From: jsyang Date: Thu, 21 Aug 2025 11:25:11 +0900 Subject: [PATCH] =?UTF-8?q?-CalcRainEffect=20=EA=B0=95=EC=9A=B0=EB=9F=89?= =?UTF-8?q?=20=EC=9E=90=EB=A6=BF=EC=88=98=20=EC=86=8C=EC=88=98=EC=A0=90=20?= =?UTF-8?q?=EC=B2=AB=EC=A7=B8=EC=9E=90=EB=A6=AC=20=ED=91=9C=EC=8B=9C=20-?= =?UTF-8?q?=20=EC=88=98=EC=A7=88=ED=98=84=ED=99=A9=20=EC=B5=9C=EB=8C=80=20?= =?UTF-8?q?=EC=B5=9C=EC=86=8C=20BOD,=20COD=20=EC=88=98=EC=B9=98=20?= =?UTF-8?q?=EC=9D=B4=EC=83=81=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/app/components/common/CalcRainEffect.tsx | 2 ++ .../pages/(with-layout)/facilityWaterQlty/modal/page.tsx | 9 ++++----- .../app/pages/(with-layout)/facilityWaterQlty/page.tsx | 1 - apps/fo/app/store/facilityWaterQlty/index.tsx | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/fo/app/components/common/CalcRainEffect.tsx b/apps/fo/app/components/common/CalcRainEffect.tsx index 7df07c71b..b31470850 100644 --- a/apps/fo/app/components/common/CalcRainEffect.tsx +++ b/apps/fo/app/components/common/CalcRainEffect.tsx @@ -24,6 +24,8 @@ export default function CalcRainEffect(data : any, weather='ALL') { if(item.infoRnDay == 'x'){ item.infoRnDay = '0.0'; + }else{ + item.infoRnDay = Number(item.infoRnDay).toFixed(1); } } } diff --git a/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx index 0362b1ec3..48a94aa89 100644 --- a/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx +++ b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx @@ -117,7 +117,6 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe const efflWqltTp = parseNumber(item.efflWqltTp); const efflWqltToc = parseNumber(item.efflWqltToc); const efflWqltSs = parseNumber(item.efflWqltSs); - const inflAssctBfrWqltBod = parseNumber(item.inflAssctBfrWqltBod); const inflAssctBfrWqltTn = parseNumber(item.inflAssctBfrWqltTn); const inflAssctBfrWqltTp = parseNumber(item.inflAssctBfrWqltTp); @@ -225,14 +224,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe sggNm: "", addr: "", fctCpc: 0, - infoRnDay: 0, + infoRnDay: Math.round(maxInfoRnDay * 10) / 10?(Math.round(maxInfoRnDay * 10) / 10).toFixed(1):'0.0', tpInflWqltBod: Math.round(maxTpInflWqltBod * 10) / 10?(Math.round(maxTpInflWqltBod * 10) / 10).toFixed(1):'0.0', tpInflWqltTp: Math.round(maxTpInflWqltTp * 1000) / 1000?(Math.round(maxTpInflWqltTp * 1000) / 1000).toFixed(3):'0.000' }, { msrDt : '최소', - efflWqltBod : Math.round(minEfflWqltBod * 10) / 10?(Math.round(minEfflWqltBod?minEfflWqltBod:0 * 10) / 10).toFixed(1) : '0.0', - efflWqltToc : Math.round(minefflWqltToc * 10) / 10?(Math.round(minefflWqltToc?minefflWqltToc:0 * 10) / 10).toFixed(1) : '0.0', + efflWqltBod : Math.round(minEfflWqltBod * 10) / 10?(Math.round(minEfflWqltBod * 10) / 10).toFixed(1) : '0.0', + efflWqltToc : Math.round(minefflWqltToc * 10) / 10?(Math.round(minefflWqltToc * 10) / 10).toFixed(1) : '0.0', efflWqltSs : Math.round(minEfflWqltSs * 10) / 10?(Math.round(minEfflWqltSs * 10) / 10).toFixed(1) : '0.0', efflWqltTn : Math.round(minEfflWqltTn * 1000) / 1000?(Math.round(minEfflWqltTn * 1000) / 1000).toFixed(3) : '0.000', efflWqltTp : Math.round(minEfflWqltTp * 1000) / 1000?(Math.round(minEfflWqltTp * 1000) / 1000).toFixed(3) : '0.000', @@ -248,7 +247,7 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe sggNm: "", addr: "", fctCpc: 0, - infoRnDay: 0, + infoRnDay: Math.round(minInfoRnDay * 10) / 10?'0.0':(Math.round(minInfoRnDay * 10) / 10).toFixed(1), tpInflWqltBod: Math.round(minTpInflWqltBod * 10) / 10?'0.0':(Math.round(minTpInflWqltBod * 10) / 10).toFixed(1), tpInflWqltTp: Math.round(minTpInflWqltTp * 1000) / 1000?'0.000':(Math.round(minTpInflWqltTp * 1000) / 1000).toFixed(3) }, diff --git a/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx index 0e215f565..be4902bf0 100644 --- a/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx +++ b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx @@ -163,7 +163,6 @@ export default function ProcessFacilitySearch() { }, [searchFcltyQltyList]); const total = facilityWaterQltyCount || 1; - console.log('total : ', total); return ( diff --git a/apps/fo/app/store/facilityWaterQlty/index.tsx b/apps/fo/app/store/facilityWaterQlty/index.tsx index 0eedb00a3..c63d3f284 100644 --- a/apps/fo/app/store/facilityWaterQlty/index.tsx +++ b/apps/fo/app/store/facilityWaterQlty/index.tsx @@ -43,7 +43,7 @@ export interface FacilityWaterQltyProps { mdmbsn:string|'', inflAmnt: number | '', lclgvrnmntNm: string, - infoRnDay: number | '', + infoRnDay: number | string | '', rainEffectDay: number | '', tpInflWqltTmprtr: number | '', tpInflWqltPh: string | '', @@ -376,6 +376,7 @@ export type FacilityWaterQltyActions = { */ const dataFormSetting = (item: FacilityWaterQltyProps) => { DataForm({ type: 'date', column: 'msrDt', item: item as unknown as Record<string, unknown> }); + DataForm({ type: 'float1', column: 'infoRnDay', item: item as unknown as Record<string, unknown> }); } export type FacilityWaterQltyStore = FacilityWaterQltyType & FacilityWaterQltyActions; @@ -625,6 +626,7 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType }else{ item.tpInflWqltTp = ''; } + return item; }) set((state: FacilityWaterQltyType) => ({