diff --git a/apps/fo/app/pages/dashboard/page.tsx b/apps/fo/app/pages/dashboard/page.tsx index 754021374..09c452da4 100644 --- a/apps/fo/app/pages/dashboard/page.tsx +++ b/apps/fo/app/pages/dashboard/page.tsx @@ -58,7 +58,7 @@ export default function DashBoard() { /******************선택된 데이터******************/ // 연도 //const [searchYear, setSearchYear] = useState(selectSearchYear[0]?.val || '0'); - const [searchYear, setSearchYear] = useState('2021'); + const [searchYear, setSearchYear] = useState('2023'); // 시설명 const [fcltyList, setFcltyList] = useState<{bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | ''}>({ bscFctCd: '26260PB001R', @@ -280,7 +280,7 @@ export default function DashBoard() { trtFrfNm: '표준활성슬러지법, MLE, MBR', efflWqltStndrdNm: '500톤 이상(Ⅳ지역)' }); - + setSearchYear('2023'); searchFcltyList.bscFctNm = '수영'; } diff --git a/apps/fo/app/store/dashboard/index.tsx b/apps/fo/app/store/dashboard/index.tsx index b12c24d39..b4118dfc7 100644 --- a/apps/fo/app/store/dashboard/index.tsx +++ b/apps/fo/app/store/dashboard/index.tsx @@ -694,7 +694,7 @@ const fetchFacilityPlan = async (targetYear : string | undefined, fcltyCd : stri const queryParams = new URLSearchParams(); if (fcltyCd) queryParams.append('swtrmtFcltCd', fcltyCd); - if (targetYear) queryParams.append('targetYear',targetYear); + //if (targetYear) queryParams.append('targetYear',targetYear); const queryString = queryParams.toString(); const url = queryString ? `${baseUrl}?${queryString}` : baseUrl; const res = await getFetchAreaList(url); @@ -955,41 +955,55 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType) /** 시설정보 및 운영현황 - 계획정보 */ searchPlanInfo : async (targetYear: string, fcltyCd: string) => { const res = await fetchFacilityPlan(targetYear, fcltyCd); + console.log(res); + let tmpArray:number[] = []; + let minDiff=9999999; + let minIndex; + res.forEach((el:any, idx) => { + if(minDiff>Math.abs(Number(targetYear) - Number(el.yr))){ + minDiff=Math.abs(Number(targetYear) - Number(el.yr)); + minIndex=idx; + } + }); + + console.log('minIndex : ', minIndex); + let rtnPlanData = res[minIndex]; + console.log('minData : ', res[minIndex]); planFcltyList.map((el, index) => { planYearList = []; - planYearList.push(res[0]?res[0].yrDt4.toString():""); - planYearList.push(res[0]?res[0].yrDc1.toString():""); - planYearList.push(res[0]?res[0].yrDc2.toString():""); - planYearList.push(res[0]?res[0].yrDc3.toString():""); - planYearList.push(res[0]?res[0].yrDc4.toString():""); + planYearList.push(rtnPlanData?rtnPlanData.yrDt4.toString():""); + planYearList.push(rtnPlanData?rtnPlanData.yrDc1.toString():""); + planYearList.push(rtnPlanData?rtnPlanData.yrDc2.toString():""); + planYearList.push(rtnPlanData?rtnPlanData.yrDc3.toString():""); + planYearList.push(rtnPlanData?rtnPlanData.yrDc4.toString():""); if(index === 0){ - el.provisionalApproval = res&&res.length>0?res[0].planSwageQntSumDt4:''; - el.now = res&&res.length>0?res[0].planSwageQntSum:''; - el.stepOne = res&&res.length>0?res[0].planSwageQntSumDc1:''; - el.stepTwo = res&&res.length>0?res[0].planSwageQntSumDc2:''; - el.stepThree = res&&res.length>0?res[0].planSwageQntSumDc3:''; - el.stepFour = res&&res.length>0?res[0].planSwageQntSumDc4:''; + el.provisionalApproval = rtnPlanData?rtnPlanData.planSwageQntSumDt4:''; + el.now = rtnPlanData?rtnPlanData.planSwageQntSum:''; + el.stepOne = rtnPlanData?rtnPlanData.planSwageQntSumDc1:''; + el.stepTwo = rtnPlanData?rtnPlanData.planSwageQntSumDc2:''; + el.stepThree = rtnPlanData?rtnPlanData.planSwageQntSumDc3:''; + el.stepFour = rtnPlanData?rtnPlanData.planSwageQntSumDc4:''; } if(index === 1){ - el.provisionalApproval = res&&res.length>0?res[0].swtrmtPpltnCntDt4:''; - el.now = res&&res.length>0?res[0].swtrmtPpltnCnt:''; - el.stepOne = res&&res.length>0?res[0].swtrmtPpltnCntDc1:''; - el.stepTwo = res&&res.length>0?res[0].swtrmtPpltnCntDc2:''; - el.stepThree = res&&res.length>0?res[0].swtrmtPpltnCntDc3:''; - el.stepFour = res&&res.length>0?res[0].swtrmtPpltnCntDc4:''; + el.provisionalApproval = rtnPlanData?rtnPlanData.swtrmtPpltnCntDt4:''; + el.now = rtnPlanData?rtnPlanData.swtrmtPpltnCnt:''; + el.stepOne = rtnPlanData?rtnPlanData.swtrmtPpltnCntDc1:''; + el.stepTwo = rtnPlanData?rtnPlanData.swtrmtPpltnCntDc2:''; + el.stepThree = rtnPlanData?rtnPlanData.swtrmtPpltnCntDc3:''; + el.stepFour = rtnPlanData?rtnPlanData.swtrmtPpltnCntDc4:''; } if(index === 2){ - el.provisionalApproval = res&&res.length>0?res[0].swtrmtZoneAreaDt4:''; - el.now = res&&res.length>0?res[0].swtrmtZoneArea:''; - el.stepOne = res&&res.length>0?res[0].swtrmtZoneAreaDc1:''; - el.stepTwo = res&&res.length>0?res[0].swtrmtZoneAreaDc2:''; - el.stepThree = res&&res.length>0?res[0].swtrmtZoneAreaDc3:''; - el.stepFour = res&&res.length>0?res[0].swtrmtZoneAreaDc4:''; + el.provisionalApproval = rtnPlanData?rtnPlanData.swtrmtZoneAreaDt4:''; + el.now = rtnPlanData?rtnPlanData.swtrmtZoneArea:''; + el.stepOne = rtnPlanData?rtnPlanData.swtrmtZoneAreaDc1:''; + el.stepTwo = rtnPlanData?rtnPlanData.swtrmtZoneAreaDc2:''; + el.stepThree = rtnPlanData?rtnPlanData.swtrmtZoneAreaDc3:''; + el.stepFour = rtnPlanData?rtnPlanData.swtrmtZoneAreaDc4:''; } if(index === 4){ - el.provisionalApproval = res&&res.length>0?res[0].ugwtUseSum:''; + el.provisionalApproval = rtnPlanData?rtnPlanData.ugwtUseSum:''; } // 임시시