diff --git a/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx index dd689f2fa..e65fe3cc8 100644 --- a/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx +++ b/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx @@ -271,7 +271,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}: (head.id === 'flowRate' && index === 0)?{el[head.id]}: (head.id === 'flowRate' && index === 5)?{el[head.id]}: (head.id === 'flowRate' && index === 11)?{el[head.id]}: - (head.id === 'groundWaterAvg'||head.id === 'groundWaterSummer'||head.id === 'groundWaterWinter')&&(index === 0)?{el[head.id]}: + (head.id === 'groundWaterAvg'||head.id === 'groundWaterSummer'||head.id === 'groundWaterWinter')&&(index === 0)?{Number.isNaN(el[head.id]) ? "" : el[head.id]}: (head.id === 'groundWaterAvg'||head.id === 'groundWaterSummer'||head.id === 'groundWaterWinter')&&(index === 7)?{el[head.id]}: (head.id === 'rdi'&&index === 0)?{el[head.id]}: (head.id === 'rdi'&&index === 7)?{el[head.id]}: diff --git a/apps/fo/app/store/dashboard/index.tsx b/apps/fo/app/store/dashboard/index.tsx index 8f3b4dd8a..398f82c0e 100644 --- a/apps/fo/app/store/dashboard/index.tsx +++ b/apps/fo/app/store/dashboard/index.tsx @@ -1712,7 +1712,7 @@ export const dashBoardReducer = ( // RDII 추정 = 하절기(6~8월) 중 최저 유입 BOD일때 유입유량 x ((동절기 청천시 유입BOD - 하절기(6~8월) 중 최저 유입BOD) / (동절기 청천시 유입BOD)) // const resp = await fetchMainGraph(searchYear, fcltyCd); const resp = mainGraphData; - if (resp && resp.data && resp.data.wqltObjs) { + if (resp && resp.data && resp.data.wqltObjs && resp.data.wqltObjs.length > 0) { const wqltData = resp.data.wqltObjs; const wqltDataTot = CalcRainEffect(clone(wqltData)); const wqltDataSunny = CalcRainEffect(clone(wqltData), 'SUNNY'); @@ -1800,10 +1800,11 @@ export const dashBoardReducer = ( const rtnData = await calcWaterQltyData(operationalStatusList, searchYear, fcltyCd, mainGraphData); // 수질 데이터 청천시, 강우시 재계산 + let tpFctYn = 'N'; + if (mainGraphData.data.wqltObjs && mainGraphData.data.wqltObjs.length > 0) + tpFctYn = mainGraphData.data.wqltObjs?.[0].tpFctYn; // 총인설비가 없을 경우 제외 - console.log('총인시설 여부 : ', mainGraphData.data.wqltObjs?.[0].tpFctYn); - - const tpFctYn = mainGraphData.data.wqltObjs?.[0].tpFctYn; + console.log('총인시설 여부 : ', tpFctYn); // console.log('rtnData : ', rtnData); if (tpFctYn !== 'Y') {