From fbd9575df79199e4fc7dfef367b6c740b36689b8 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Mon, 21 Jul 2025 11:07:51 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=9E=A0=EC=9E=AC=EC=88=98=EC=9A=94?= =?UTF-8?q?=EC=B2=98=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wr/app/matMng/coMng/ldrmntCoSttn/page.tsx | 54 ++++++------ .../app/store/matDmd/ldrmntCoSttn/index.tsx | 85 ++++++++++++------- .../coReg/coRegExcel/coRegExcelModal.tsx | 2 +- 3 files changed, 79 insertions(+), 62 deletions(-) diff --git a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx index 910923499..36a8b7151 100644 --- a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx +++ b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx @@ -43,8 +43,9 @@ export default function LdrmntCoSttn() { const [objSearch, setObjSearch] = useState({ sgg: "", city: "" }); const [bdstTable, setBdstTable] = useState(); const [searchTxt, setSearchTxt] = useState(); - const [excelData, setExcelData] = useState(); + const [excelData, setExcelData] = useState() const [resetPage, isResetPage] = useState(false); + const [isDownloadClicked, setIsDownloadClicked] = useState(false); const { t } = useTranslation('base'); const excelClick = useCallback(() => { @@ -79,10 +80,31 @@ export default function LdrmntCoSttn() { const excelDownloadClick = useCallback(() => { const cityNm = computeCityNm(); + setExcelData(undefined); + setIsDownloadClicked(true); ldrmntSearch(true, 1, String(ldrmntResCount), cityNm, searchTxt || ""); }, [objSearch, searchTxt, code, ldrmntSearch, computeCityNm, ldrmntResCount]); useEffect(() => { + const transData = Array.isArray(excelList) ? excelList : [excelList]; + const exData = tableData(transData, { code }); + const data = Array.isArray(exData) + ? exData.map((item: customLdrmnt) => { + return { + "시도": item.fctryAddr?.split(" ")[0] || "", + "시군구": item.fctryAddr?.split(" ")[1] || "", + "회사명": item.dmdCoNm, + "공장주소": item.fctryAddr, + "공장관리번호": item.fctryMngNo, + "전화번호": item.telno + } + }) : []; + setExcelData(data) + }, [excelList]) + + useEffect(() => { + if (!isDownloadClicked) return; + if (excelData === undefined) return; if (excelData && excelData.length > 0) { downloadExcel({ data: excelData, @@ -93,7 +115,8 @@ export default function LdrmntCoSttn() { } else { toast.error(t('excelDownErrMsg')); } - }, [excelData]); + setIsDownloadClicked(false); + }, [excelData, isDownloadClicked]); const [isExcelOpen, setIsExcelOpen] = useState<{ isModal: boolean; @@ -125,7 +148,7 @@ export default function LdrmntCoSttn() { useEffect(() => { if (!ldrmnt.isInit) { - ldrmntInit("0"); + ldrmntInit(false, "0"); } }, [ldrmnt.isInit, ldrmntInit]); @@ -144,23 +167,6 @@ export default function LdrmntCoSttn() { setBdstTable(tbData); }, [ldrmntRes, code]); - useEffect(() => { - const transData = Array.isArray(excelList) ? excelList : [excelList]; - const exData = tableData(transData, { code }); - const data = Array.isArray(exData) - ? exData.map((item: customLdrmnt) => { - return { - "시도": item.fctryAddr?.split(" ")[0] || "", - "시군구": item.fctryAddr?.split(" ")[1] || "", - "회사명": item.dmdCoNm, - "공장주소": item.fctryAddr, - "공장관리번호": item.fctryMngNo, - "전화번호": item.telno - } - }) : []; - setExcelData(data) - }, [excelList]) - useEffect(() => { ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || ""); isResetPage(false) @@ -264,10 +270,6 @@ export default function LdrmntCoSttn() { }} bodyClass={"w-[40vw] max-w-none max-h-[calc(100%-70px)]"} body={ { - // confirmToast(t('isUpdateMsg'), await ldrmntUpdate(value)) - // // await ldrmntUpdate(value) - // setDetailModal({ ...detailModal, isOpen: false }) - // ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || ""); const handleConfirm = async () => { await ldrmntUpdate(value); setDetailModal({ ...detailModal, isOpen: false }); @@ -286,12 +288,8 @@ export default function LdrmntCoSttn() { body={ setIsExcelOpen({ isModal: isOpen })} />} /> - - - ) - } \ No newline at end of file diff --git a/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx b/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx index c268ca1e6..fed013417 100644 --- a/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx +++ b/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx @@ -29,11 +29,11 @@ type ExcelType = { [key: string]: string | number | undefined; }; -const excelDownList: ExcelType[] = []; +// const excelDownList: ExcelType[] = []; type ldrmntActions = { ldrmntRegData: (data: any[]) => void, - ldrmntInit: (con: string) => void + ldrmntInit: (isExcel: boolean, con: string) => void ldrmntSearch: (isExcel: boolean, page: number, sggCd: string, total: string, coNm: string) => void; ldrmntUpdate: (ldrmntRes: customLdrmnt) => void; ldrmntDelete: () => void; @@ -58,25 +58,47 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = ( set: any ) => { return { - ldrmntInit: async (con: string) => { + ldrmntInit: async (isExcel: boolean,con: string) => { try { const ldrmntRes = await getFetchWithCount( fetchType.WR, `/reuseFc/request/temp/1/20/${con}` ); - - set((state: ldrmntState) => { - return { - ...state, - ldrmnt: { - ...state.ldrmnt, - ldrmntRes: ldrmntRes.data, - ldrmntResCount: ldrmntRes.count, - isInit: false, - excelList: excelDownList, - }, - } - }); + if (isExcel) { + const excelDownList: ExcelType[] = []; + ldrmntRes.data.forEach((item: customLdrmnt) => { + excelDownList.push({ + ctpvCd: item.ctpvCd, + sggCd: item.sggCd, + dmdCoNm: item.dmdCoNm, + fctryAddr: item.fctryAddr, + fctryMngNo: item.fctryMngNo, + telno: item.telno, + }) + }) + set((state: ldrmntState) => { + return { + ...state, + ldrmnt: { + ...state.ldrmnt, + excelList: excelDownList, + ldrmntResCount: ldrmntRes.count, + }, + }; + }); + } else { + set((state: ldrmntState) => { + return { + ...state, + ldrmnt: { + ...state.ldrmnt, + ldrmntRes: ldrmntRes.data, + ldrmntResCount: ldrmntRes.count, + isInit: false, + }, + } + }); + } } catch (e) { console.log(e) } @@ -96,6 +118,7 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = ( await deleteFectch( `/reuseFc/request/temp`, ); + console.log("deleteFectch", deleteFectch) const response = await postFectch( "/reuseFc/request/temp", @@ -121,7 +144,6 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = ( fetchType.WR, searchUrl ); - console.log("알이에스", ldrmntRes) if (isExcel) { const excelDownList: ExcelType[] = []; ldrmntRes.data.forEach((item: customLdrmnt) => { @@ -144,7 +166,6 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = ( }, }; }); - return excelDownList; } else set((state: ldrmntState) => { return { @@ -157,27 +178,26 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = ( }, }; }); - return ldrmntRes; } catch (e) { console.log(e) } }, ldrmntUpdate: async (ldrmntRes: customLdrmnt) => { - if(ldrmntRes) - try { - ldrmntRes.rgtr = TEST_UUID; - const res = await putFectch( - `/reuseFc/request/temp`, - ldrmntRes - ); + if (ldrmntRes) + try { + ldrmntRes.rgtr = TEST_UUID; + const res = await putFectch( + `/reuseFc/request/temp`, + ldrmntRes + ); - if (res.ok) { - toast.success("잠재수요처 상세정보가 수정되었습니다.",) + if (res.ok) { + toast.success("잠재수요처 상세정보가 수정되었습니다.",) + } + } catch (error) { + console.error("Error ldrmntUpdate:", error); + toast.error("잠재수요처 상세정보 수정에 실패하였습니다.") } - } catch (error) { - console.error("Error ldrmntUpdate:", error); - toast.error("잠재수요처 상세정보 수정에 실패하였습니다.") - } }, ldrmntDelete: async () => { try { @@ -193,7 +213,6 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = ( await deleteFectch( `/reuseFc/request/temp`, ); - } catch (error) { console.log("error", error) set((state: ldrmntState) => { diff --git a/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx b/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx index 66fdf91d0..1e51fb11c 100644 --- a/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx +++ b/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx @@ -89,7 +89,7 @@ export default function CoRegExcel({

{"잠재수요처 파일"}

- From be7efb2ad0be74dd02b62ad18dbda84e55b7c52b Mon Sep 17 00:00:00 2001 From: jyha00 Date: Mon, 21 Jul 2025 15:27:18 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EA=B2=B0=ED=95=A8=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/app/matMng/coMat/coMatRvw/page.tsx | 2 +- apps/wr/app/matMng/coMng/coSttn/page.tsx | 4 ++- .../wr/app/store/matDmd/coMatRvw/headList.tsx | 2 +- .../store/matDmd/ruseRvwHstry/headList.tsx | 4 +-- .../ruseFcltMng/fcltReg/pbnstReg/headList.tsx | 2 +- .../fcltSttn/pbnstSttn/headList.tsx | 26 +++++++------- .../fcltSttn/rainSttn/headList.tsx | 22 ++++++------ .../ui/form/coMat/conCostForm/conCostForm.tsx | 8 ++--- .../ui/form/fcltReg/htdflReg/htdflRegForm.tsx | 6 ++-- .../fcltReg/pbnstReg/mngReg/mngRegForm.tsx | 2 +- .../ui/form/fcltReg/rainReg/rainRegForm.tsx | 4 +-- .../ui/modal/coMat/constCostFeeTable.tsx | 35 ++++++++----------- .../ui/modal/coMat/rateFeeModal.tsx | 2 +- apps/wr/public/locales/ko/message.json | 2 +- 14 files changed, 58 insertions(+), 63 deletions(-) diff --git a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx index a1f484b83..d33611128 100644 --- a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx +++ b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx @@ -316,7 +316,7 @@ export default function CoMatRvw() { control={form.control} name="dmndQty" render={({ field }) => ( - + item !== undefined); setBdstTable(chData); } else if (coSttnRes?.length == 0) { diff --git a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx index e7363b0c1..16d2107c6 100644 --- a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx +++ b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx @@ -20,7 +20,7 @@ export const coRvwHeadListExport: CommonTableProps[]= [ }, { id: "daddr", - title: "공장주소", + title: "주소", visible: true, }, { diff --git a/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx b/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx index a90f5831b..d80747264 100644 --- a/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx +++ b/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx @@ -19,7 +19,7 @@ export const ruseHstryHeadListExport:TableUpperProps[]= [ }, { id: "daddr", - title: "공장주소", + title: "주소", visible: true, }, { @@ -49,7 +49,7 @@ export const ruseHstryHeadListExport:TableUpperProps[]= [ }, { id: "dmndQty", //바꾸기 - title: "요구수량(M3/d)", + title: "요구수량(m³/일)", visible: true, }, { diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx index 905334d42..5d77c64ca 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx @@ -53,7 +53,7 @@ export const pbnstDemandHeadListExport: TableUpperProps[] = [ export const pbnstOrgwtHeadListRxport: TableUpperProps[] = [ { id: "ruseUtztnFcltNm", title: "하수처리장명" }, - { id: "orgwtWtritQnt", title: "원수취수량", type: "number" }, + { id: "orgwtWtritQnt", title: "원수취수량(m³/일)", type: "number" }, { id: "tmsYn", title: "하수처리량TMS 전후" }, { id: "dschgFmYn", title: "하수처리장 방류 유량계 전·후​" }, { id: "dtlPstnExpln", title: "상세위치", edit: true }, diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx index 075b91261..cdac90a77 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx @@ -141,7 +141,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [ }, { id: "fctCpc", - title: "시설용량(톤/일)", + title: "시설용량(m³/일)", visible: true, row: 1, rowSpan: 2, @@ -157,7 +157,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [ }, { id: "rusSup", - title: "재이용수공급가능량", + title: "재이용수공급가능량(m³/일)", visible: true, row: 1, rowSpan: 1, @@ -226,7 +226,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [ }, { id: "fcltCpct", - title: "시설용량(m³/일)", + title: "시설용량", upName: "rusSup", visible: true, row: 2, @@ -235,7 +235,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [ }, { id: "splyExtraCpct", - title: "하수처리량(m³/일)", + title: "하수처리량", upName: "rusSup", visible: true, row: 2, @@ -244,7 +244,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [ }, { id: "ruseCpct", - title: "재이용량(m³/일)", + title: "재이용량", upName: "rusSup", visible: true, row: 2, @@ -337,7 +337,7 @@ export const ruseFcltNodeListExport: TableUpperProps[] = [ }, { id: "mainSplyPumpCpct", - title: "메인공급펌프용량", + title: "메인공급펌프용량(m³/일)", visible: true, row: 1, rowSpan: 3, @@ -345,7 +345,7 @@ export const ruseFcltNodeListExport: TableUpperProps[] = [ }, { id: "buziFee", - title: "사업비(백만원)", + title: "사업비(원)", visible: true, row: 2, rowSpan: 1, @@ -418,7 +418,7 @@ export const ruseFcltNodeListExport: TableUpperProps[] = [ }, { id: "cusrAlotm", - title: "민간투자비", + title: "민간투자비", visible: true, row: 3, rowSpan: 1, @@ -438,7 +438,7 @@ export const ruseFcltNodeListExport: TableUpperProps[] = [ export const ruseSplyHeadListExport: TableUpperProps[] = [ { id: "cycl", title: "차수", visible: true }, - { id: "orgwtWtritQnt", title: "원수취수량", visible: true }, + { id: "orgwtWtritQnt", title: "원수취수량(m³/일)", visible: true }, { id: "tmsYn", title: "하수처리량TMS 전후", visible: true }, { id: "dschgFmYn", title: "하수처리장 방류 유량계 전·후​", visible: true }, { id: "dtlPstnExpln", title: "상세위치 설명", visible: true }, @@ -447,8 +447,8 @@ export const ruseSplyHeadListExport: TableUpperProps[] = [ export const rusePplHeadListExport: TableUpperProps[] = [ { id: "cycl", title: "차수", visible: true }, { id: "ppMqlt", title: "관재질", type: "select", visible: true }, - { id: "pdmt", title: "관경", type: "select", visible: true }, - { id: "cpct", title: "연장", edit: true, visible: true }, + { id: "pdmt", title: "관경(mm)", type: "select", visible: true }, + { id: "cpct", title: "연장(m)", edit: true, visible: true }, ]; export const ruseGuranteeHeadListExport: TableUpperProps[] = [ @@ -458,10 +458,10 @@ export const ruseGuranteeHeadListExport: TableUpperProps[] = [ { id: "combResdch", title: "결합잔류염소(mh/L)", visible: true }, { id: "trbt", title: "탁도(NTU)", visible: true }, { id: "smll", title: "냄새", visible: true }, - { id: "crmty", title: "색도", visible: true }, + { id: "crmty", title: "색도(도)", visible: true }, { id: "tn", title: "총질소(mg/L)", visible: true }, { id: "tph", title: "총인(mg/L)", visible: true }, - { id: "ph", title: "수소이온농도", visible: true }, + { id: "ph", title: "수소이온농도(PH)", visible: true }, { id: "clIonQnt", title: "염화물(mg/L)", visible: true }, { id: "cdtnv", title: "전기전도도(μs/cm)​", visible: true }, ]; diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx index fd8c2173e..58f2d491a 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx @@ -228,7 +228,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ }, { id: "archArea", - title: "건축면적", + title: "건축면적(m³)", upName: "bdnstInfo", visible: true, row: 2, @@ -265,7 +265,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ { id: "instlCst", - title: "설치비용", + title: "설치비용(원)", upName: "rainFcltInfo", visible: true, row: 2, @@ -285,7 +285,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ { id: "pntfColKnd", - title: "집수지점종류", + title: "종류", upName: "pntfCol", visible: true, row: 3, @@ -294,7 +294,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ }, { id: "pntfColArea", - title: "집수지점면적", + title: "면적(m²)", upName: "pntfCol", visible: true, row: 3, @@ -304,7 +304,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ { id: "dtfcltCpct", - title: "저류조용량", + title: "저류조용량(m³)", upName: "rainFcltInfo", visible: true, row: 2, @@ -322,7 +322,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ }, { id: "filtrTrtmfctCpct", - title: "여과처리시설용량", + title: "여과처리시설용량(m³)", upName: "filtrTrtmfct", visible: true, row: 3, @@ -359,7 +359,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ }, { id: "instlCstSprtAmt", - title: "설치지원비용", + title: "설치지원비용(원)", upName: "instlCstSprt", visible: true, row: 3, @@ -379,7 +379,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ { id: "grntchBdstCertYn", - title: "녹색건축물인증여부", + title: "인증여부", upName: "grntchBdstCert", visible: true, row: 3, @@ -388,7 +388,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ }, { id: "grntchBdstCertYr", - title: "녹색건축물인증년도", + title: "인증년도", upName: "grntchBdstCert", visible: true, row: 3, @@ -397,7 +397,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ }, { id: "grntchBdstCertNo", - title: "녹색건축물인증번호", + title: "인증번호", upName: "grntchBdstCert", visible: true, row: 3, @@ -406,7 +406,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [ }, { id: "grntchBdstCertGrd", - title: "녹색건축물인증등급", + title: "인증등급", upName: "grntchBdstCert", visible: true, row: 3, diff --git a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx index 922598bc1..9184f702f 100644 --- a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx +++ b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx @@ -85,7 +85,7 @@ export default function ConCostForm({ const calculateConstCost = useCallback(() => { const usgPrcsProcs = usgPrcsProcsWatch; if (!dmndQtyWatch) { - toast.error("요구수량(M3/d)을 확인해주세요 계산할수 없습니다. "); + toast.error("요구수량(m³/일)을 확인해주세요 계산할수 없습니다. "); return; } if (usgPrcsProcs === null || usgPrcsProcs === undefined) { @@ -278,7 +278,7 @@ export default function ConCostForm({ control={form.control} name="dmndQty" render={({ field }) => ( - + {}} + cellClick={undefined} onPageChange={() => {}} /> @@ -344,7 +344,7 @@ export default function ConCostForm({ control={form.control} name="dmndQty" render={({ field }) => ( - + */}

- {readonly && `(${htdflForm?.bdstNm})`} + {readonly && `(시설명 : ${htdflForm?.bdstNm})`}

@@ -346,7 +346,7 @@ export default function HtdflRegForm({ control={form.control} name="reuseBuilding.0.htdflObj.amtgnr" render={({ field }) => ( - + ( - + ( { diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx index 85c27227e..ef1b16c28 100644 --- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx @@ -159,7 +159,7 @@ export default function RainRegForm({

- {readonly && `(${rainForm?.bdstNm})`} + {readonly && `(시설명 : ${rainForm?.bdstNm})`}

@@ -316,7 +316,7 @@ export default function RainRegForm({ const isUnknown = value === null || value === -1; // 또는 Number(value) === -1 return (
- + state); @@ -19,7 +19,7 @@ export function ConstCostFeeTable() { const [constCostData, setConstCostData] = useState([]); - const getFctDescription = (fctCd: string) => { + const getFctDescription = (fctCd: string) => { const fctMap: { [key: string]: string } = { "001": "총인처리시설", "002": "염소소독", @@ -73,26 +73,19 @@ export function ConstCostFeeTable() { 공사비 산정표 보기

-
- - setYear(String(val))} - /> +
+ + {new Date().getFullYear() || ""}
- {}} - onPageChange={() => {}} - /> + { }} + /> ); diff --git a/apps/wr/components/ui/modal/coMat/rateFeeModal.tsx b/apps/wr/components/ui/modal/coMat/rateFeeModal.tsx index cc7de726a..f67a70b1a 100644 --- a/apps/wr/components/ui/modal/coMat/rateFeeModal.tsx +++ b/apps/wr/components/ui/modal/coMat/rateFeeModal.tsx @@ -80,7 +80,7 @@ export function RateFeeTableModal() {
- + {new Date().getFullYear() || ""}
diff --git a/apps/wr/public/locales/ko/message.json b/apps/wr/public/locales/ko/message.json index 96931ee72..2258d80d6 100644 --- a/apps/wr/public/locales/ko/message.json +++ b/apps/wr/public/locales/ko/message.json @@ -19,7 +19,7 @@ "saveRowErrMsg": "수정을 원하는 행을 선택하고 저장버튼을 눌러주세요.", "costCalcErrMsg":"공사비 계산 진행 후 저장을 눌러주세요", "maxYearErrMsg": "최대 {{year}}년까지 선택가능합니다.", - "checkQtyMsg": "요구수량(M3/d)을 확인해주세요 계산할 수 없습니다." + "checkQtyMsg": "요구수량(m³/일)을 확인해주세요 계산할 수 없습니다." } From 0bb16f97953a156b2a30ce309b342bc134a31003 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Mon, 21 Jul 2025 15:28:42 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EB=8F=84=EB=84=9B=EC=B0=A8=ED=8A=B8=20?= =?UTF-8?q?=EB=B2=94=EB=A1=80=20=EB=86=92=EC=9D=B4=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/business_components/src/ui/chart/DoughnutChart.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/business_components/src/ui/chart/DoughnutChart.tsx b/packages/common/business_components/src/ui/chart/DoughnutChart.tsx index 6f113bee3..ec8fc2fd9 100644 --- a/packages/common/business_components/src/ui/chart/DoughnutChart.tsx +++ b/packages/common/business_components/src/ui/chart/DoughnutChart.tsx @@ -50,7 +50,7 @@ const customStyles = { fontWeight: "normal", marginTop: "16px", marginBottom: "8px", - minHeight: "32px", // 범례 영역 높이 통일 + minHeight: "60px", // 범례 영역 높이 통일 } as CSSProperties, }; const renderCustomizedLabel = ({ From b4140d645739737c8f6f1f7bffc273794405c12f Mon Sep 17 00:00:00 2001 From: jyha00 Date: Mon, 21 Jul 2025 17:50:47 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EA=B2=B0=ED=95=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/fcltSttn/htdflSttn/page.tsx | 4 +- .../ruseFcltMng/fcltSttn/rainSttn/page.tsx | 6 +- .../ruseFcltMng/fcltSttn/rswtSttn/page.tsx | 4 +- apps/wr/components/lib/func/TableData.tsx | 13 +++- .../ui/form/fcltReg/bdstReg/bdstReg.tsx | 75 +++++++++---------- .../ui/form/fcltReg/htdflReg/htdflRegForm.tsx | 23 +++--- .../ui/form/fcltReg/rainReg/rainRegForm.tsx | 8 +- .../ui/modal/coMat/constCostFeeTable.tsx | 6 +- 8 files changed, 71 insertions(+), 68 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx index 147b9a674..46528bcf7 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx @@ -166,8 +166,8 @@ export default function HtdflSttn() { value={objSearch.sgg} // value props 추가 onSelectValue={getSgg} /> -
-