fo: 2021년도 조회시 오류 수정
This commit is contained in:
@@ -210,7 +210,7 @@ export default function DashBoard() {
|
||||
}
|
||||
];
|
||||
// 버퍼에 있는 엑셀데이터 전달 후 json으로 변환
|
||||
await filePickedBlobArray(blobRet, '시설정보및운영현황황', sheetParameter);
|
||||
await filePickedBlobArray(blobRet, '시설정보및운영현황', sheetParameter);
|
||||
});
|
||||
};
|
||||
break;
|
||||
|
||||
@@ -1343,15 +1343,15 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
|
||||
planYearList.push(rtnPlanData?rtnPlanData.planYrDc3.toString():"");
|
||||
planYearList.push(rtnPlanData?rtnPlanData.planYrDc4.toString():"");
|
||||
|
||||
if(index === 0){
|
||||
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 === 0){ // 증설계획(㎥/일)
|
||||
el.provisionalApproval = rtnPlanData?rtnPlanData.planSwageQntSumDt4:''; // 기승인4단계
|
||||
el.now = rtnPlanData?rtnPlanData.planSwageQntSum:''; // 현재
|
||||
el.stepOne = rtnPlanData?rtnPlanData.planSwageQntSumDc1:''; // 1단계
|
||||
el.stepTwo = rtnPlanData?rtnPlanData.planSwageQntSumDc2:''; // 2단계
|
||||
el.stepThree = rtnPlanData?rtnPlanData.planSwageQntSumDc3:''; // 3단계
|
||||
el.stepFour = rtnPlanData?rtnPlanData.planSwageQntSumDc4:''; // 4단계
|
||||
}
|
||||
if(index === 1){
|
||||
if(index === 1){ // 처리인구(인)
|
||||
el.provisionalApproval = rtnPlanData?rtnPlanData.swtrmtPpltnCntDt4:'';
|
||||
el.now = rtnPlanData?rtnPlanData.swtrmtPpltnCnt:'';
|
||||
el.stepOne = rtnPlanData?rtnPlanData.swtrmtPpltnCntDc1:'';
|
||||
@@ -1359,7 +1359,7 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
|
||||
el.stepThree = rtnPlanData?rtnPlanData.swtrmtPpltnCntDc3:'';
|
||||
el.stepFour = rtnPlanData?rtnPlanData.swtrmtPpltnCntDc4:'';
|
||||
}
|
||||
if(index === 2){
|
||||
if(index === 2){ // 처리구역(km²)
|
||||
el.provisionalApproval = rtnPlanData?rtnPlanData.swtrmtZoneAreaDt4:'';
|
||||
el.now = rtnPlanData?rtnPlanData.swtrmtZoneArea:'';
|
||||
el.stepOne = rtnPlanData?rtnPlanData.swtrmtZoneAreaDc1:'';
|
||||
@@ -1367,13 +1367,13 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
|
||||
el.stepThree = rtnPlanData?rtnPlanData.swtrmtZoneAreaDc3:'';
|
||||
el.stepFour = rtnPlanData?rtnPlanData.swtrmtZoneAreaDc4:'';
|
||||
}
|
||||
if(index === 4){
|
||||
if(index === 4){ // 물사용량
|
||||
el.provisionalApproval = rtnPlanData?rtnPlanData.ugwtUseSum:'';
|
||||
}
|
||||
|
||||
if(index === 2){
|
||||
if(index === 2){ // 처리구역(km²)
|
||||
dataFormSettingPlan(el, 1);
|
||||
}else if(index == 4){
|
||||
}else if(index == 4){ // 물사용량
|
||||
}else{
|
||||
dataFormSettingPlan(el, 0);
|
||||
}
|
||||
@@ -1885,10 +1885,10 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
|
||||
const rtnData = await calcWaterQltyData(operationalStatusList, searchYear, fcltyCd);
|
||||
|
||||
// 총인설비가 없을 경우 제외
|
||||
console.log('총인시설 여부 : ', data.yearData.TP_FCT_YN);
|
||||
console.log('총인시설 여부 : ', data.yearData?.TP_FCT_YN);
|
||||
|
||||
console.log('rtnData : ', rtnData);
|
||||
if(data.yearData.TP_FCT_YN !== 'Y') {
|
||||
if(data.yearData?.TP_FCT_YN !== 'Y') {
|
||||
operationalStatusList = rtnData.slice(0, 11);
|
||||
}else{
|
||||
operationalStatusList = rtnData;
|
||||
|
||||
Reference in New Issue
Block a user