From 314e6ed9ad00bafcc395d140036fa5109d3a2284 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 25 Jul 2025 09:57:47 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=B9=98=EC=A7=84=ED=96=89=EC=A4=91?= =?UTF-8?q?=20-=20=EA=B0=95=EC=9A=B0=EB=9F=89=20=EC=88=A8=EA=B9=80=20-=20?= =?UTF-8?q?=EC=88=98=EC=A7=88=EC=A1=B0=ED=9A=8C=202023=EB=85=84=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/app/pages/facilityWaterQlty/modal/page.tsx | 4 ++-- apps/fo/app/pages/facilityWaterQlty/page.tsx | 3 ++- apps/fo/app/pages/flowRate/modal/page.tsx | 2 +- apps/fo/app/store/facilityWaterQlty/index.tsx | 4 ++-- apps/fo/app/store/flowRate/index.tsx | 6 +++--- apps/fo/app/store/store.tsx | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/apps/fo/app/pages/facilityWaterQlty/modal/page.tsx b/apps/fo/app/pages/facilityWaterQlty/modal/page.tsx index 0cfb42998..eadfa9ba8 100644 --- a/apps/fo/app/pages/facilityWaterQlty/modal/page.tsx +++ b/apps/fo/app/pages/facilityWaterQlty/modal/page.tsx @@ -303,12 +303,12 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe "유출SS(mg/L)": item.efflWqltSs, "유출TN(mg/L)": item.efflWqltTn, "유출TP(mg/L)": item.efflWqltTp, - "강우량(mm/일)": item.infoRnDay?item.infoRnDay.toString():"0.0", +/* "강우량(mm/일)": item.infoRnDay?item.infoRnDay.toString():"0.0", */ }); }); } if (excelDownList && excelDownList.length > 0) { - downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: searchYear+'년 '+fcltyName + ' 수질현황', sheetNameArray: [fcltyName + ' 수질현황'], headerRange: 'A1:L1' }); + downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: searchYear+'년 '+fcltyName + ' 수질현황', sheetNameArray: [fcltyName + ' 수질현황'], headerRange: 'A1:K1' }); } else if (prevExcelListRef.current && prevExcelListRef.current.length > 0) { alert('다운받을 데이터가 없습니다.'); } diff --git a/apps/fo/app/pages/facilityWaterQlty/page.tsx b/apps/fo/app/pages/facilityWaterQlty/page.tsx index 6a9ad4f69..7d571a69f 100644 --- a/apps/fo/app/pages/facilityWaterQlty/page.tsx +++ b/apps/fo/app/pages/facilityWaterQlty/page.tsx @@ -48,7 +48,8 @@ export default function ProcessFacilitySearch() { const [upheadList, setUpheadList] = useState(upHeadList1); const [fcltyName, setFcltyName] = useState(""); const [operationValue, setOperationValue] = useState("0"); - const [searchYearValue, setSearchYearValue] = useState(selectSearchYear[0]?.val || "0"); + //const [searchYearValue, setSearchYearValue] = useState(selectSearchYear[0]?.val || "0"); + const [searchYearValue, setSearchYearValue] = useState("2023"); const [fcltCpct, setFcltCpct] = useState("0"); // 모달 상태 추가 diff --git a/apps/fo/app/pages/flowRate/modal/page.tsx b/apps/fo/app/pages/flowRate/modal/page.tsx index 33b255b6c..409dab7eb 100644 --- a/apps/fo/app/pages/flowRate/modal/page.tsx +++ b/apps/fo/app/pages/flowRate/modal/page.tsx @@ -167,7 +167,7 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st "연계처리량(m³/일)": item.sumFlow, "총인반류수량(m³/일)": item.returnAmnt, "방류량(m³/일)": item.efflAmnt, - "강우량(mm/일)": item.infoRnDay, + /* "강우량(mm/일)": item.infoRnDay, */ }); }); } diff --git a/apps/fo/app/store/facilityWaterQlty/index.tsx b/apps/fo/app/store/facilityWaterQlty/index.tsx index 2e8d1cfd6..565c251d2 100644 --- a/apps/fo/app/store/facilityWaterQlty/index.tsx +++ b/apps/fo/app/store/facilityWaterQlty/index.tsx @@ -104,7 +104,7 @@ export type modalExcelType = { "유출SS(mg/L)": string; "유출TN(mg/L)": string; "유출TP(mg/L)": string; - "강우량(mm/일)": string; + /* "강우량(mm/일)": string; */ } /**==================================== @@ -207,7 +207,7 @@ const upHeadListModalYear: TableUpperProps[] = [ { id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe2", upSequnce: 3, align: "right" }, { id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe2", upSequnce: 2, align: "right" }, { id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe2", upSequnce: 3, align: "right" }, - { id: "infoRnDay", title: "강우량(mm/일)", align: "right" }, + /* { id: "infoRnDay", title: "강우량(mm/일)", align: "right" }, */ ]; // 처리시설 수질현황 헤더(모달-수질TMS) diff --git a/apps/fo/app/store/flowRate/index.tsx b/apps/fo/app/store/flowRate/index.tsx index c4c773115..38cb4e2e6 100644 --- a/apps/fo/app/store/flowRate/index.tsx +++ b/apps/fo/app/store/flowRate/index.tsx @@ -50,13 +50,13 @@ export interface ExcelType { } export type modalExcelType = { - 날짜: string, + "날짜": string, "총유입량(m³/일)": number | '', "하수유입량(m³/일)": number | '', "연계처리량(m³/일)": number | '', "총인반류수량(m³/일)": number | '', "방류량(m³/일)": number | '', - "강우량(mm/일)": number | string | '', + /* "강우량(mm/일)": number | string | '', */ } /** * (2) 모달 @@ -157,7 +157,7 @@ const upHeadListFlowRateModal:TableUpperProps[] = [ { id: "sumFlow", title: "연계처리량(m³/일)", align:"right"}, { id: "returnAmnt", title: "총인 반류수량(m³/일)", align:"right"}, { id: "efflAmnt", title: "방류량(m³/일)", align:"right"}, - { id: "infoRnDay", title: "강우량(mm/일)", align:"right"} + /* { id: "infoRnDay", title: "강우량(mm/일)", align:"right"} */ ] const modalFlowRateListYear:FlowRateModalProps[] = [ diff --git a/apps/fo/app/store/store.tsx b/apps/fo/app/store/store.tsx index cba4b9976..512458c90 100644 --- a/apps/fo/app/store/store.tsx +++ b/apps/fo/app/store/store.tsx @@ -59,7 +59,7 @@ export const StoreZus = } ) => { return createStore()((set) => { - LoginApi.login({userId: "tuser10003", password: "test1234!"}) + LoginApi.login({userId: "admin1gmail", password: "test1234!"}) return { ...initState, ...CommonReducer(set),