diff --git a/app/pages/flowRate/modal/page.tsx b/app/pages/flowRate/modal/page.tsx new file mode 100644 index 000000000..e69de29bb diff --git a/apps/fo/app/pages/flowRate/modal/page.tsx b/apps/fo/app/pages/flowRate/modal/page.tsx index 8d78ab804..c3815911a 100644 --- a/apps/fo/app/pages/flowRate/modal/page.tsx +++ b/apps/fo/app/pages/flowRate/modal/page.tsx @@ -36,7 +36,8 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st const filterData = useCallback((returnType: ReturnType) => { if (!returnType.filteredList) return; - const filteredData = setFilterAfterData(returnType.filteredList); + // 타입을 FlowRateModalInterface[]로 강제 변환하여 타입 오류 해결 + const filteredData = setFilterAfterData(returnType.filteredList as FlowRateModalInterface[]); setCopyYearList(filteredData); }, []); @@ -110,7 +111,8 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st sumFlow: Math.round(avgsumFlow / filteredData.length * 10) / 10, returnAmnt: Math.round(avgreturnAmnt / filteredData.length * 10) / 10, efflAmnt: Math.round(avgefflAmnt / filteredData.length * 10) / 10, - infoRnDay: avginfoRnDay > 0 ? (Math.round(avginfoRnDay / filteredData.length * 10) / 10).toFixed(1) : '0.0', + infoRnDay: avginfoRnDay > 0 ? Math.round(avginfoRnDay / filteredData.length * 10) / 10 : 0, + rainEffectDay: 0, }, { msrDt: '최대', @@ -120,6 +122,7 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st returnAmnt: Math.round(maxreturnAmnt * 10) / 10, efflAmnt: Math.round(maxefflAmnt * 10) / 10, infoRnDay: maxinfoRnDay > 0 ? (Math.round(maxinfoRnDay * 10) / 10).toFixed(1) : '0.0', + rainEffectDay: 0, }, { msrDt: '최소', @@ -129,6 +132,7 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st returnAmnt: Math.round(minreturnAmnt * 10) / 10, efflAmnt: Math.round(minefflAmnt * 10) / 10, infoRnDay: mininfoRnDay > 0 ? (Math.round(mininfoRnDay * 10) / 10).toFixed(1) : '0.0', + rainEffectDay: 0, }, ...filteredData ]; diff --git a/apps/fo/app/store/flowRate/index.tsx b/apps/fo/app/store/flowRate/index.tsx index cd847b628..a619ddf85 100644 --- a/apps/fo/app/store/flowRate/index.tsx +++ b/apps/fo/app/store/flowRate/index.tsx @@ -56,7 +56,7 @@ export type modalExcelType = { "연계처리량(m³/일)": number | '', "총인반류수량(m³/일)": number | '', "방류량(m³/일)": number | '', - "강우량": number | '', + "강우량": number | string | '', } /** * (2) 모달 @@ -68,7 +68,8 @@ export interface FlowRateModalInterface { sumFlow : number | '', returnAmnt : number | '', efflAmnt : number | '', - infoRnDay : number | '', + infoRnDay : number | string | '', + rainEffectDay : number | string | '' , } export type FlowRateModalProps = { msrDt : string, @@ -77,8 +78,8 @@ export type FlowRateModalProps = { sumFlow : number, returnAmnt : number, efflAmnt : number, - infoRnDay : number | '', - rainEffectDay : number | '', + infoRnDay : number | string | '', + rainEffectDay : number | string | '', } /**====================================