diff --git a/apps/fo/app/pages/(with-layout)/dashboard/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/page.tsx index 0903c9229..167df2a7b 100644 --- a/apps/fo/app/pages/(with-layout)/dashboard/page.tsx +++ b/apps/fo/app/pages/(with-layout)/dashboard/page.tsx @@ -60,11 +60,11 @@ export default function DashBoard() { const [searchYear, setSearchYear] = useState(selectSearchYear[0]?.val || '0'); // 시설명 const [fcltyList, setFcltyList] = useState<{bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | ''}>({ - bscFctCd: '26260PB001R', - bscFctNm: '수영', - fcltyCpc: 452000, - trtFrfNm: '표준활성슬러지법, MLE, MBR', - efflWqltStndrdNm: '500톤 이상(Ⅳ지역)' + bscFctCd: '11000SW001R', + bscFctNm: '난지', + fcltyCpc: 860000, + trtFrfNm: '표준활성슬러지법, MLE, A2O', + efflWqltStndrdNm: '500톤 이상(Ⅲ지역)' }); const [searchFcltyList, setSearchFcltyList] = useState<{bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | ''}>({ @@ -79,11 +79,11 @@ export default function DashBoard() { if (!isInit) { initializeCommonData(); setSearchFcltyList({ - bscFctCd: '26260PB001R', - bscFctNm: '수영', - fcltyCpc: 452000, - trtFrfNm: '표준활성슬러지법, MLE, MBR', - efflWqltStndrdNm: '500톤 이상(Ⅳ지역)' + bscFctCd: '11000SW001R', + bscFctNm: '난지', + fcltyCpc: 860000, + trtFrfNm: '표준활성슬러지법, MLE, A2O', + efflWqltStndrdNm: '500톤 이상(Ⅲ지역)' }); } }, [isInit, initializeCommonData]); @@ -265,22 +265,22 @@ export default function DashBoard() { const initVal = () => { setFcltyList({ - bscFctCd: '26260PB001R', - bscFctNm: '수영', - fcltyCpc: 452000, - trtFrfNm: '표준활성슬러지법, MLE, MBR', - efflWqltStndrdNm: '500톤 이상(Ⅳ지역)' + bscFctCd: '11000SW001R', + bscFctNm: '난지', + fcltyCpc: 860000, + trtFrfNm: '표준활성슬러지법, MLE, A2O', + efflWqltStndrdNm: '500톤 이상(Ⅲ지역)' }); setSearchFcltyList({ - bscFctCd: '26260PB001R', - bscFctNm: '수영', - fcltyCpc: 452000, - trtFrfNm: '표준활성슬러지법, MLE, MBR', - efflWqltStndrdNm: '500톤 이상(Ⅳ지역)' + bscFctCd: '11000SW001R', + bscFctNm: '난지', + fcltyCpc: 860000, + trtFrfNm: '표준활성슬러지법, MLE, A2O', + efflWqltStndrdNm: '500톤 이상(Ⅲ지역)' }); setSearchYear(selectSearchYear[0]?.val || '0'); - searchFcltyList.bscFctNm = '수영'; + searchFcltyList.bscFctNm = '난지'; setSidoValue('0'); setSigunValue('0'); diff --git a/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx b/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx index 71372672a..12bf0763c 100644 --- a/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx +++ b/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx @@ -12,7 +12,7 @@ export default function DashBoardFclty({ onFacilityChange, sidoSigun, facilityNm } = Common; // 시설명 - const [bscFctNm, setFcltyName] = useState(facilityNm || '수영'); + const [bscFctNm, setFcltyName] = useState(facilityNm || '난지'); const [bscFctCd, setbscFctCd] = useState('11000SW001R'); const [fcltyCpc, setFcltyCpc] = useState(860000); const [trtFrfNm, setTrtFrfNm] = useState('표준활성슬러지법, MLE, A2O'); diff --git a/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx b/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx index 904db73e2..980be5865 100644 --- a/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx +++ b/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx @@ -126,10 +126,9 @@ export default function PrecipitationModal(props: PrecipitationModalProps) { setFilteredDetailList(calcData); setCopyDetailList(calcData); - if (calcData.length > 0) { const firstDateStr = calcData[0]?.rainDt; - const lastDateStr = calcData[filteredList.length - 1]?.rainDt; + const lastDateStr = calcData[calcData.length - 1]?.rainDt; if (firstDateStr) { const firstDate = new Date(firstDateStr); @@ -137,7 +136,6 @@ export default function PrecipitationModal(props: PrecipitationModalProps) { setStartDate(firstDate); } } - if (lastDateStr) { const lastDate = new Date(lastDateStr); if (!isNaN(lastDate.getTime())) { @@ -148,10 +146,6 @@ export default function PrecipitationModal(props: PrecipitationModalProps) { } }, [props.detailList, props.facilityCd]); - if (!startDate || !endDate) { - return
로딩 중...
; - } - return ( <> diff --git a/apps/fo/app/store/dashboard/index.tsx b/apps/fo/app/store/dashboard/index.tsx index 38cd9db4e..4440b1dca 100644 --- a/apps/fo/app/store/dashboard/index.tsx +++ b/apps/fo/app/store/dashboard/index.tsx @@ -6,7 +6,7 @@ import { getFetch } from "@/app/components/api"; import DataForm from "@/app/components/common/DataForm"; import { fetchPlanInfo, roundUp } from "../common"; import type { FacilityWaterQltyProps } from "../facilityWaterQlty"; -import { calRainEffectDay, type ApiResponse, type FlowDataItem } from "../underWaterInput"; +import { type ApiResponse, type FlowDataItem } from "../underWaterInput"; import CalcRainEffect from "@/app/components/common/CalcRainEffect"; // selectBox @@ -1214,8 +1214,8 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType) } }); - const calData = calRainEffectDay(res2.data, 'SUNNY'); - const calRainDate = calRainEffectDay(res2.data, 'RAIN'); + const calData = CalcRainEffect(res2.data, 'SUNNY'); + const calRainDate = CalcRainEffect(res2.data, 'RAIN'); // 지하수유입량 - 청천시 기준 let chungcunSumFlow = 0;