diff --git a/apps/fo/app/pages/(with-layout)/processFacility/modal/page.tsx b/apps/fo/app/pages/(with-layout)/processFacility/modal/page.tsx index 512b0be19..20c885797 100644 --- a/apps/fo/app/pages/(with-layout)/processFacility/modal/page.tsx +++ b/apps/fo/app/pages/(with-layout)/processFacility/modal/page.tsx @@ -153,11 +153,19 @@ export default function ProcessFacilityInfoModal(props: ModalType) { "시운전완료일": item.trlrnCmplDt, "가동개시일": item.rnDt, "시설용량(m³/일)": item.fctCpc&&item.fctCpc.toString().trim()!=''?Number(item.fctCpc.toString().replaceAll(',','')):'', + "공법구분": item.trtSrsHanNm, + "공법계열": item.trtMocHanNm, + "방법": item.trtFrfHanNm, }); }); } if (excelDownList && excelDownList.length > 0) { - downloadExcelFormat({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: props.fcltyName + ' 시설이력관리', sheetNameArray: [props.fcltyName + ' 시설이력관리'], headerRange: 'A1:I1' }); + downloadExcelFormat({ + data: JSON.parse(JSON.stringify(excelDownList)), + fileName: props.fcltyName + ' 시설이력관리', + sheetNameArray: [props.fcltyName + ' 시설이력관리'], + decimalArray0: [8], + headerRange: 'A1:L1' }); } else if (gridListFcltyHistInfo.length == 0) { alert('다운받을 데이터가 없습니다.'); } diff --git a/apps/fo/app/pages/(with-layout)/processFacility/page.tsx b/apps/fo/app/pages/(with-layout)/processFacility/page.tsx index 75bd371e0..def1ca0e8 100644 --- a/apps/fo/app/pages/(with-layout)/processFacility/page.tsx +++ b/apps/fo/app/pages/(with-layout)/processFacility/page.tsx @@ -327,7 +327,7 @@ export default function ProcessFacilitySearch() { {selectedRow !== null && ( } - bodyClass="sm:max-w-[100vw] w-[1100px] h-[100dvh] max-h-[800px]" + bodyClass="sm:max-w-[100vw] w-[1300px] h-[100dvh] max-h-[800px]" open={selectedRow !== null} onOpenChange={(open) => !open && closeModal()} /> diff --git a/apps/fo/app/store/processFacility/index.tsx b/apps/fo/app/store/processFacility/index.tsx index 240ad2d4d..006185e6d 100644 --- a/apps/fo/app/store/processFacility/index.tsx +++ b/apps/fo/app/store/processFacility/index.tsx @@ -113,7 +113,10 @@ export type fcltyHistInfoProps = { sitArea: number, trtDstrArea: number, swrTrtPopl: number, - fctCpc: number | '' + fctCpc: number | '', + trtSrsHanNm?: string, // 공법구분 + trtMocHanNm?: string, // 공법계열 + trtFrfHanNm?: string, // 방법 } // 시설 수질정보 @@ -328,6 +331,9 @@ const upHeadListFcltyHistInfo: TableUpperProps[] = [ { id: "trlrnCmplDt", title: "시운전완료일" }, { id: "rnDt", title: "가동개시일" }, { id: "fctCpc", title: "시설용량(m³/일)", align: 'right' }, + { id: "trtSrsHanNm", title: "공법구분" }, + { id: "trtMocHanNm", title: "공법계열" }, + { id: "trtFrfHanNm", title: "방법" }, ]; // 시설 이력관리 (리스트) @@ -344,7 +350,10 @@ const gridListFcltyHistInfo: fcltyHistInfoProps[] = [ sitArea: 0, trtDstrArea: 0, swrTrtPopl: 0, - fctCpc: 860000 + fctCpc: 860000, + trtFrfHanNm: "", + trtMocHanNm: "", + trtSrsHanNm: "", } ]; @@ -902,4 +911,4 @@ export const processFacilityReducer: (set: SetStateFunction) => ProcessFacilityA } } } -} \ No newline at end of file +}