From 4891725f6878fec1b0d1725cb52b1cc983795411 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Tue, 15 Jul 2025 11:11:29 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=AC=BC=EC=9E=AC=EC=9D=B4=EC=9A=A9=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=8B=A8=EC=9C=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prfmncReg/pbnstPrfmncReg/page.tsx | 2 +- .../prfmncSttn/pbnstPrfmncSttn/page.tsx | 14 ++++++------- .../chkgdnReg/rainChkgdn/headList.tsx | 6 +++--- .../chkgdnReg/rswrtChkgdn/headList.tsx | 18 ++++++++--------- .../prfmncSttn/pbnstPrfmncSttn/headList.tsx | 6 +++--- .../ruseFcltMng/fcltReg/bdstReg/index.tsx | 4 ++-- .../ruseFcltMng/fcltReg/htdflReg/headList.tsx | 2 +- .../ruseFcltMng/fcltReg/pbnstReg/headList.tsx | 10 +++++----- .../ruseFcltMng/fcltReg/rainReg/index.tsx | 2 +- .../ui/form/fcltReg/bdstReg/bdstAdd.tsx | 2 +- .../ui/form/fcltReg/htdflReg/htdflRegForm.tsx | 20 +++++++++---------- .../ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx index 4e0a7b4d7..0572acce9 100644 --- a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx @@ -313,7 +313,7 @@ export default function PrfmncPrfmncReg() {

- {"하수처리수재이용 실적(m3) 등록결과"} + {"하수처리수재이용 실적(m³) 등록결과"}

diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx index 898f50601..b1fe27005 100644 --- a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx @@ -621,28 +621,28 @@ export default function PbnstPrfmncSttn() {
- +
- +
- +

장내·외 월별 하수재이용실적 현황

- +
- +
- +
-

하수재이용실적 현황

+

하수재이용실적 현황 (단위: m³)

{/* */} {/*
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx index e53c6b374..3be274c1b 100644 --- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx +++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx @@ -150,7 +150,7 @@ export const rainChkgdnHeadListExport: TableUpperProps[] = [ { id: "totalRuseFcltUtztnQnt", title: "연간빗물이용량(m³)" }, { id: "ph", - title: "PH", + title: "수소이온농도(PH)", upName: "useQuilty", upSequnce: 1, type: "number", @@ -158,7 +158,7 @@ export const rainChkgdnHeadListExport: TableUpperProps[] = [ }, { id: "trbt", - title: "탁도", + title: "탁도(NTU)", upName: "useQuilty", upSequnce: 2, type: "number", @@ -166,7 +166,7 @@ export const rainChkgdnHeadListExport: TableUpperProps[] = [ }, { id: "grssClfg", - title: "총대장균군수", + title: "총대장균군수(개/mg)", upName: "useQuilty", upSequnce: 3, type: "number", diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx index c9136f4a4..04914b236 100644 --- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx +++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx @@ -149,26 +149,26 @@ export const rswtChkHeadListExport: TableUpperProps[] = [ { id: "grssClfgUswtr", - title: "총대장균군수", + title: "총대장균군수(개/mg)", upName: "useQuilty", upSequnce: 1, type: "number" }, { id: "combResdch", - title: "결합잔류염소", + title: "결합잔류염소(mh/L)", upName: "useQuilty", upSequnce: 2, type: "number" }, - { id: "trbt", title: "탁도", upName: "useQuilty", upSequnce: 3 ,type: "number"}, - { id: "bod", title: "BOD", upName: "useQuilty", upSequnce: 4 ,type: "number"}, + { id: "trbt", title: "탁도(NTU)", upName: "useQuilty", upSequnce: 3 ,type: "number"}, + { id: "bod", title: "BOD(mg/L)", upName: "useQuilty", upSequnce: 4 ,type: "number"}, { id: "smll", title: "냄새", upName: "useQuilty", upSequnce: 5 ,type: "number"}, - { id: "crmty", title: "색도", upName: "useQuilty", upSequnce: 6 ,type: "number"}, - { id: "tn", title: "T-N", upName: "useQuilty", upSequnce: 7 ,type: "number"}, - { id: "tph", title: "T-P", upName: "useQuilty", upSequnce: 8 ,type: "number"}, - { id: "ph", title: "PH", upName: "useQuilty", upSequnce: 9,type: "number" }, - { id: "clIonQnt", title: "염화물", upName: "useQuilty", upSequnce: 10 ,type: "number"}, + { id: "crmty", title: "색도(도)", upName: "useQuilty", upSequnce: 6 ,type: "number"}, + { id: "tn", title: "총질소(T-N)(mg/L)", upName: "useQuilty", upSequnce: 7 ,type: "number"}, + { id: "tph", title: "총인(T-P)(mg/L)", upName: "useQuilty", upSequnce: 8 ,type: "number"}, + { id: "ph", title: "수소이온농도(PH)", upName: "useQuilty", upSequnce: 9,type: "number" }, + { id: "clIonQnt", title: "염화물(mg/L)", upName: "useQuilty", upSequnce: 10 ,type: "number"}, { id: "vltnDt", diff --git a/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/headList.tsx b/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/headList.tsx index 9095d96b9..b6641a796 100644 --- a/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/headList.tsx +++ b/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/headList.tsx @@ -43,17 +43,17 @@ export const pbnstYearHeadListExport: TableUpperProps[] = [ }, { id: "total", - title: "계", + title: "계(m³)", row: 1 }, { id: "inUsage", - title: "장내용수", + title: "장내용수(m³)", row: 1 }, { id: "outUsage", - title: "장외용수", + title: "장외용수(m³)", row: 1 }, ] diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/bdstReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/bdstReg/index.tsx index 418f4b45f..1d9a0f6af 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/bdstReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/bdstReg/index.tsx @@ -11,14 +11,14 @@ import type { TableUpperProps } from "@/app/store/common/type/header"; { id: "bdstNm", title: "시설명" }, { id: "daddr", title: "위치" }, { id: "frstArchPrmsnDt", title: "최초건축허가일" }, - { id: "archArea", title: "건축면적", }, + { id: "archArea", title: "건축면적(㎡)", }, ]; const bdstChgHeadList: TableUpperProps[] = [ { id: "bdstChgNm", title: "구분" }, { id: "archChgPrmsnDt", title: "허가일" }, - { id: "archChgArea", title: "변경면적" }, + { id: "archChgArea", title: "변경면적(㎡)" }, ]; diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/headList.tsx index 53c18f56d..4d0c228be 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/headList.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/headList.tsx @@ -6,5 +6,5 @@ export const htdTableHeadList: TableUpperProps[] = [ { id: "bdstNm", title: "시설명" }, { id: "daddr", title: "위치" }, { id: "frstArchPrmsnDt", title: "준공년도" }, - { id: "archArea", title: "건축면적" }, + { id: "archArea", title: "건축면적(㎡)" }, ]; diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx index 84413fbc2..430942322 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx @@ -93,7 +93,7 @@ export const ruseFcltinfo: formDetailType[] = [ { id: "addr", lable: "위치(주소)" }, { id: "rprcsMthdCd", lable: "재처리방식", type: "select", selectData: "rusePrcsMthdCd" }, { id: "inoutYn", lable: "위치(처리장 내외)" ,type: "select" , selectData: "yn"}, // 머가 내? 외?, - { id: "mainSplyPumpCpct", lable: "메인공급펌프 용량", type: "number" }, + { id: "mainSplyPumpCpct", lable: "메인공급펌프 용량(m³/일)", type: "number" }, ]; export const businessMoneyInfo: formDetailType[] = [ @@ -124,10 +124,10 @@ export const ruseWaterQulityList: formDetailType[] = [ { id: "combResdch", lable: "결합잔류염소(mh/L)", type: "text" }, { id: "trbt", lable: "탁도(NTU)", type: "text" }, { id: "smll", lable: "냄새", type: "text" }, - { id: "crmty", lable: "색도", type: "text" }, - { id: "tn", lable: "총질소(mg/L)", type: "text" }, - { id: "tph", lable: "총인(mg/L)", type: "text" }, - { id: "ph", lable: "수소이온농도", type: "text" }, + { id: "crmty", lable: "색도(도)", type: "text" }, + { id: "tn", lable: "총질소(T-N)(mg/L)", type: "text" }, + { id: "tph", lable: "총인(T-P)(mg/L)", type: "text" }, + { id: "ph", lable: "수소이온농도(PH)", type: "text" }, { id: "clIonQnt", lable: "염화물(mg/L)", type: "text" }, { id: "cdtnv", lable: "전기전도도(μs/cm)​", type: "text" }, ]; diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx index e3e9ef336..3a47adf9f 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx @@ -59,7 +59,7 @@ export const upHeadList: TableUpperProps[] = [ { id: "daddr", title: "위치" }, { id: "bdsgUsgText", title: "건축물용도" }, { id: "frstArchPrmsnDt", title: "최초건축허가일" }, - { id: "archArea", title: "건축면적" }, + { id: "archArea", title: "건축면적(㎡)" }, { id: "lawTrgtYn", title: "법적의무대상여부" }, { id: "bdstChgYn", title: "건축물변경여부" }, ]; diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstAdd.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstAdd.tsx index bafa7566d..dd2dddeab 100644 --- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstAdd.tsx +++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstAdd.tsx @@ -123,7 +123,7 @@ export default function BdstAdd({ form, readonly }: { form: any; readonly?: bool control={form.control} name={`chgBuilding.${index}.archChgArea`} render={({ field: f }) => ( - + ( - + ( - + ( - + ( - + ( - + ( - + ( - + ( - + ( - + ( - + + Date: Tue, 15 Jul 2025 13:54:30 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=A7=80=EB=8F=84=EC=A0=90=EA=B2=80=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=B0=8F=20=ED=98=84=ED=99=A9=20=EB=8B=A8?= =?UTF-8?q?=EC=9C=84=20=EC=B6=94=EA=B0=80,=20=EC=9A=A9=EC=88=98=EB=AA=85?= =?UTF-8?q?=20=EA=B0=80=EC=9A=B4=EB=8D=B0=20=EC=A0=95=EB=A0=AC=EB=A1=9C=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 --- .../app/ruseFcltMng/fcltReg/pbnstReg/page.tsx | 6 ++-- .../chkgdnSttn/rainChkgdnSttn/headList.tsx | 6 ++-- .../chkgdnSttn/rswtChkgdnSttn/headList.tsx | 18 +++++------ apps/wr/components/lib/func/TableData.tsx | 15 ++++++--- .../ui/modal/chkgd/chkgdModal/chkgdModal.tsx | 32 +++++++++---------- 5 files changed, 41 insertions(+), 36 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx index 64b90c1fb..c7f066189 100644 --- a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx @@ -316,8 +316,8 @@ export default function PublicReuseFaciltyInsert() {
-
-
+
+
{" "} @@ -335,7 +335,7 @@ export default function PublicReuseFaciltyInsert() {
- + {formWatch && formWatch[0]?.pbnstRuseFcltId ? ( diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/headList.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/headList.tsx index 8c90e0829..0f9d802ff 100644 --- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/headList.tsx +++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/headList.tsx @@ -15,21 +15,21 @@ export const rainChkgdnHeadSttnExport: TableUpperProps[] = [ { id: "totalRuseFcltUtztnQnt", title: "연간빗물이용량(m³)" }, { id: "ph", - title: "PH", + title: "수소이온농도(PH)", upName: "useQuilty", upSequnce: 1, type: "number", }, { id: "trbt", - title: "탁도", + title: "탁도(NTU)", upName: "useQuilty", upSequnce: 2, type: "number", }, { id: "grssClfg", - title: "총대장균군수", + title: "총대장균군수(개/mg)", upName: "useQuilty", upSequnce: 3, type: "number", diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx index 91f6bf718..e000c550a 100644 --- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx +++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx @@ -16,28 +16,28 @@ export const rswtChkSttnHeadListExport: TableUpperProps[] = [ { id: "grssClfgUswtr", - title: "총대장균군수", + title: "총대장균군수(개/mg)", upName: "useQuilty", upSequnce: 1, type: "number", }, { id: "combResdch", - title: "결합잔류염소", + title: "결합잔류염소(mh/L)", upName: "useQuilty", upSequnce: 2, type: "number", }, { id: "trbt", - title: "탁도", + title: "탁도(NTU)", upName: "useQuilty", upSequnce: 3, type: "number", }, { id: "bod", - title: "BOD", + title: "BOD(mg/L)", upName: "useQuilty", upSequnce: 4, type: "number", @@ -51,23 +51,23 @@ export const rswtChkSttnHeadListExport: TableUpperProps[] = [ }, { id: "crmty", - title: "색도", + title: "색도(도)", upName: "useQuilty", upSequnce: 6, type: "number", }, - { id: "tn", title: "T-N", upName: "useQuilty", upSequnce: 7, type: "number" }, + { id: "tn", title: "총질소(T-N)(mg/L)", upName: "useQuilty", upSequnce: 7, type: "number" }, { id: "tph", - title: "T-P", + title: "총인(T-P)(mg/L)", upName: "useQuilty", upSequnce: 8, type: "number", }, - { id: "ph", title: "PH", upName: "useQuilty", upSequnce: 9, type: "number" }, + { id: "ph", title: "수소이온농도(PH)", upName: "useQuilty", upSequnce: 9, type: "number" }, { id: "clIonQnt", - title: "염화물", + title: "염화물(mg/L)", upName: "useQuilty", upSequnce: 10, type: "number", diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx index 8fc3b7eef..739ceaa4d 100644 --- a/apps/wr/components/lib/func/TableData.tsx +++ b/apps/wr/components/lib/func/TableData.tsx @@ -265,6 +265,9 @@ export const InputTableBody = ( return ( {headList.map((head, headIndex) => { + const isTextColumn = head.id === '구분' || head.id === '용수명'; + const textAlignClass = isTextColumn ? 'text-center' : 'text-right'; + // 총합계 행이면 "구분"에서 colSpan=2로 병합 if ( data["구분"] === 0 && @@ -301,7 +304,8 @@ export const InputTableBody = ( return head.edit === true && data.edit !== false ? ( handleChange(dataIndex, head.id, e.target.value, setInputData) } @@ -312,10 +316,11 @@ export const InputTableBody = ( ) : (
{data[head.id as keyof any] ?? ""}
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx index 2b74cf8af..c287e68be 100644 --- a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx +++ b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx @@ -238,26 +238,26 @@ export default function ChkgdModal({ type, obj, setIsModal }: { type: string; ob <>
- -
-
+
+ + {!rainChkSttn.isSttn ? ( + + ) : ( + <> + )} +

{type === "RNB" ? `(${obj.bdstNm})` : `(${obj.building.bdstNm})`}

- {!rainChkSttn.isSttn ? ( - - ) : ( - <> - )}
From 4c30c2fa4729e5c5484981a22831d77ba6d7e980 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Tue, 15 Jul 2025 15:40:55 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=AC=BC=EC=9E=AC=EC=9D=B4=EC=9A=A9=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=B3=84=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/page.tsx | 5 -- .../prfmncSttn/pbnstPrfmncSttn/page.tsx | 61 ++++++++++--------- apps/wr/app/store/matDmd/drgtSttn/index.tsx | 15 +++-- apps/wr/components/lib/func/TableData.tsx | 13 +++- .../ui/form/fcltReg/bdstReg/bdstAdd.tsx | 5 ++ .../ui/form/fcltReg/bdstReg/bdstReg.tsx | 7 ++- .../ui/modal/coMat/drgtDetailModal.tsx | 28 ++++----- .../sttn/pbnstSttnModal/pbnstSttnModal.tsx | 2 +- 8 files changed, 74 insertions(+), 62 deletions(-) diff --git a/apps/wr/app/page.tsx b/apps/wr/app/page.tsx index c2be341cf..d1a9fc387 100644 --- a/apps/wr/app/page.tsx +++ b/apps/wr/app/page.tsx @@ -146,11 +146,6 @@ export default function Home() { 중수도시설통계
-
- -
diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx index b1fe27005..ff327b4d0 100644 --- a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx @@ -5,13 +5,15 @@ import { btnClass } from "@/app/store/common/code"; import { initValInUsage, initValOutUsage, subTotalObj, totalObj, type FcPrfType, type PrfType } from "@/app/store/prfmncReg/pbnstPrfmncReg/type"; import { excelPrfmncSttnParsing } from "@/app/store/prfmncSttn/pbnstPrfmncSttn/excel"; import { excelDownload, yearOptions } from "@/components/lib/func/commom"; +import { InputTableBody } from "@/components/lib/func/TableData"; import SearchInputText from "@/components/ui/searchInput/searchInput"; -import { CHART_FORM, ContentsDiv, MainChart, SearchBaseForm, SelectBox, Title, UiTable, type ChartConfig, type ReturnType } from "@common/business_components"; +import { CHART_FORM, ContentsDiv, MainChart, ScrollArea, SearchBaseForm, SelectBox, Title, UiTable, type ChartConfig, type ReturnType } from "@common/business_components"; import ListDiv from "@common/business_components/ui/list_div"; -import { Label } from "@common/components/ui"; +import { Label, Table, TableBody, TableHeader } from "@common/components/ui"; import { useCallback, useEffect, useRef, useState } from "react"; import toast, { Toaster } from "react-hot-toast"; import { useTranslation } from "react-i18next"; +import { headMakeprfmnc } from "../../prfmncReg/chkgdnReg/TableHead"; export default function PbnstPrfmncSttn() { const { @@ -88,11 +90,11 @@ export default function PbnstPrfmncSttn() { const prfTableData = (prfList: PrfType[], year: string) => { const inUsageData = structuredClone(initValInUsage).map(row => ({ ...row - // 구분: "장내용수", + // 구분: "장내용수", })); const outUsageData = structuredClone(initValOutUsage).map(row => ({ ...row - // 구분: "장외용수", + // 구분: "장외용수", })); const inSubtotal = { ...structuredClone(subTotalObj), 구분: "장내용수" }; const outSubtotal = { ...structuredClone(subTotalObj), 구분: "장외용수" }; @@ -505,7 +507,7 @@ export default function PbnstPrfmncSttn() { useEffect(() => { if (pbnRuseNm.length > 1) - pbnNmSearch("1", "23", ref.current, pbnRuseNm, searchYear,[]); + pbnNmSearch("1", "23", ref.current, pbnRuseNm, searchYear, []); }, [pbnRuseNm]); const cellClick = (index: number | undefined, headId: string) => { @@ -554,7 +556,7 @@ export default function PbnstPrfmncSttn() { setPbnRuseNm(searchNm || ""); }} setRtnData={/*function (rtnData: any[]): void {setbdstTable(rtnData);}*/ - ()=>{} + () => { } } searchList={pbnstSttn.pbnstSearchData || []} > @@ -643,15 +645,15 @@ export default function PbnstPrfmncSttn() {

하수재이용실적 현황 (단위: m³)

- - {/* */} - {/*
+ {/* */} + {/* */} + {/*

- {"하수처리수재이용 실적(m3) 등록결과"} + {"하수처리수재이용 실적(m³) 등록결과"}

*/} - {}}> - + */} - {/* - -
+ + 0 ? "h-[60vh]" : ""}> + {/*

- {"하수처리수재이용 실적(m3) 등록결과"} + {"하수재이용실적 현황 (단위: m³)"}

-
+
*/} -
- - {headMakeprfmnc(monthHeadList, [])} - - - {InputTableBody(prfData ?? [], monthHeadList, setPrfData)} - -
- - */} - {/* */} + + + {headMakeprfmnc(monthHeadList, [])} + + + {/* {InputTableBody(prfData ?? [], monthHeadList, setPrfData)} */} + {InputTableBody(prfData ?? [], monthHeadList, setPrfData, false)} + +
+ - + {/* */} + + {/* */} diff --git a/apps/wr/app/store/matDmd/drgtSttn/index.tsx b/apps/wr/app/store/matDmd/drgtSttn/index.tsx index ba71f8a7d..fa1d3f894 100644 --- a/apps/wr/app/store/matDmd/drgtSttn/index.tsx +++ b/apps/wr/app/store/matDmd/drgtSttn/index.tsx @@ -35,13 +35,12 @@ export const drgtStateExport: drgtState = { } } -const initFetch = async (fromDate: string, toDate: string, sido:string[]) => { -console.log("sido",sido) +const initFetch = async (fromDate: string, toDate: string, sido: string[]) => { const drgtData = await postFectch( - `/il/getDataCount/${fromDate}/${toDate}`, - sido, - fetchType.WR - ); + `/il/getDataCount/${fromDate}/${toDate}`, + sido, + fetchType.WR + ); //주의, 관심, 정상 추출 const statusData = Array.from( @@ -99,10 +98,10 @@ export const drgtActionsExport: (set: any) => drgtActions = ( const year = today.getFullYear(); const month = String(today.getMonth() + 1).padStart(2, '0'); const formatted = `${year}${month}`; + const fromDate = formatted; const toDate = formatted; - //FIXME: 페이지 처음 로딩될때 데이터 보려고 6월로 박아놓음 이거 fromDate로 고치기 - const drgtRes = await initFetch("202506", toDate, []); + const drgtRes = await initFetch(fromDate, toDate, []); set((state: drgtState) => { return { ...state, diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx index 739ceaa4d..c6ee9f49c 100644 --- a/apps/wr/components/lib/func/TableData.tsx +++ b/apps/wr/components/lib/func/TableData.tsx @@ -235,7 +235,8 @@ const handleChange = ( export const InputTableBody = ( chgRes: any[] | [], headList: TableUpperProps[], - setInputData: (data: any[]) => void + setInputData: (data: any[]) => void, + isEditable: boolean = true ) => { // mergeCell 처리용 const getRowSpan = (data: any[], key: string, rowIndex: number) => { @@ -301,7 +302,8 @@ export const InputTableBody = ( ); } // 기본 셀 - return head.edit === true && data.edit !== false ? ( + // return head.edit === true && data.edit !== false ? ( + return isEditable && head.edit === true && data.edit !== false ? ( ); })} + {chgRes.length === 0 && ( + + + 조회된 결과가 없습니다. + + + )} ); }; \ No newline at end of file diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstAdd.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstAdd.tsx index dd2dddeab..9647c2731 100644 --- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstAdd.tsx +++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstAdd.tsx @@ -1,6 +1,7 @@ "use client"; import { useWrStore } from "@/app/store"; +import { numSize } from "@/app/store/common/code/basicCode"; import { selectClass } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; import { formH1Class } from "@/components/lib/class/comClass"; import { safeDate } from "@/components/lib/func/commom"; @@ -94,6 +95,7 @@ export default function BdstAdd({ form, readonly }: { form: any; readonly?: bool value={f.value ?? code.chBuCd[0]?.val} className={""} label={""} + readOnly={readonly} /> )} @@ -113,6 +115,7 @@ export default function BdstAdd({ form, readonly }: { form: any; readonly?: bool onChange: (date) => f.onChange(date), }} selectClass="w-full" + readOnly={readonly} /> )} @@ -130,6 +133,8 @@ export default function BdstAdd({ form, readonly }: { form: any; readonly?: bool onChange={(e) => f.onChange(e.target.value)} value={f.value || ''} className={selectClass} + readOnly={readonly} + maxLength={numSize} /> )} diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx index 726f4e689..e19cf61ef 100644 --- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx +++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx @@ -1,6 +1,8 @@ import { useWrStore } from "@/app/store"; +import { numSize, txtSize } from "@/app/store/common/code/basicCode"; import { selectClass } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; import { formH1Class } from "@/components/lib/class/comClass"; +import { handleCommaNumberChange } from "@/components/lib/func/commom"; import { FormField, FormUi, @@ -134,6 +136,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) { field.onChange(e.target.value) }} value={field.value||''} + maxLength={txtSize} /> )} @@ -153,6 +156,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) { field.onChange(e.target.value) }} value={field.value||''} + maxLength={50} /> )} @@ -217,9 +221,10 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) { placeholder="면적을 입력하세요" type="text" onChange={(e) => { - field.onChange(e.target.value) + handleCommaNumberChange(e, field.onChange); }} value={field.value||''} + maxLength={numSize} /> )} diff --git a/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx b/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx index 500a0cf40..e36ce5589 100644 --- a/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx +++ b/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx @@ -14,12 +14,12 @@ export default function DrgtDetailModal({ data: customDrgt[]; }) { - // const [isSggNm, setIsSggNm] = useState('') - const [excelData, setExcelData] = useState(); + // const [isSggNm, setIsSggNm] = useState('') + const [excelData, setExcelData] = useState(); const excelClick = () => { downloadExcel({ data: excelData ?? [], - fileName: "우리동네가뭄 상세현황", + fileName: `우리동네가뭄 상세현황 - ${data[0]?.sggNm}`, sheetNameArray: ["Sheet1"], headerRange: "A1:C1" }) @@ -36,10 +36,10 @@ export default function DrgtDetailModal({ } }) : []; setExcelData(exData) - // if(data&&data[0].sggNm){ - ////TODO: data.sggNm [0[인지 data.sggNm 인지 사용하는지 확인필요 - // setIsSggNm(data[0].sggNm) - // } + // if(data&&data[0].sggNm){ + ////TODO: data.sggNm [0[인지 data.sggNm 인지 사용하는지 확인필요 + // setIsSggNm(data[0].sggNm) + // } }, [data]) return ( @@ -47,7 +47,7 @@ export default function DrgtDetailModal({
- + <Title title={`우리동네가뭄 상세내용 - ${data[0] && data[0].sggNm ? data[0].sggNm : ''}`} /> <div className="flex flex-row space-x-2"> <Button size={"sm"} @@ -65,15 +65,11 @@ export default function DrgtDetailModal({ <ScrollArea className="h-[63vh]"> <UiTable headName={undefined} - tableData={data } + tableData={data} headlist={drgtDetailHeadListExport} - pageSize={10} - total={10000} - cellClick={(index: number | undefined, headId: string) => { - console.log(' indx ' , index) - console.log(' headId ' , headId) - - }} + pageSize={0} + total={0} + cellClick={undefined} onPageChange={() => { }} ></UiTable> </ScrollArea> diff --git a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx index 1e87590b8..20a13dc31 100644 --- a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx +++ b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx @@ -326,7 +326,7 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl <ScrollArea className="h-[60vh]"> <div className="card-header"> <h3 className="text-2xl font-medium text-label"> - {"하수처리수재이용 실적(m3) 등록결과"} + {"하수처리수재이용 실적(m³) 등록결과"} </h3> </div> <Table variant="secondary"> From a92f567e5c624486d80984c5e4427543aafdfdde Mon Sep 17 00:00:00 2001 From: jyha00 <jyha@mind-one.co.kr> Date: Tue, 15 Jul 2025 20:23:02 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=9E=AC=EC=9D=B4=EC=9A=A9=EC=8B=A4?= =?UTF-8?q?=EC=A0=81=20=ED=98=84=ED=99=A9=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx | 8 ++++---- apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx index ff327b4d0..60f73a4c8 100644 --- a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx @@ -577,7 +577,7 @@ export default function PbnstPrfmncSttn() { if (fromNum > toNum) { toast.error("시작년도가 종료년도 이후로 설정할 수 없습니다."); } else { - if (toNum - fromNum > 5) { + if (toNum - fromNum > 4) { toast.error("최대 5년까지 선택 가능합니다."); } else { tableHeadMaker(fromNum, toNum); @@ -596,7 +596,7 @@ export default function PbnstPrfmncSttn() { <div className="col-span-6"> <ListDiv> <UiTable - headName={[]} + headName={undefined} tableData={bdstTable || []} headlist={pbnstPrfHeadList} pageSize={20} @@ -613,13 +613,13 @@ export default function PbnstPrfmncSttn() { <h3 className="mt-4 ml-2 text-2xl font-medium text-label">하수재이용실적 상세현황</h3> <SelectBox - className="h-full w-1/12 text-2xl" + className="h-full w-1/12 text-2xl mt-2" label="" selectClass={""} selectArray={selectYearList} value={year} onSelectValue={(val: string | number) => setYear(String(val))} /> - <h1 className="">장내·외 용도별 하수재이용실적 현황(계)</h1> + <h1 className="my-2">장내·외 용도별 하수재이용실적 현황(계)</h1> <div className="flex"> <div className="w-1/3"> diff --git a/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx b/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx index 92fcb9b76..b9c5c371c 100644 --- a/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx +++ b/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx @@ -79,6 +79,7 @@ export const pbnstPrfmncSttnActionsExport: (set: any) => pbnstPrfmncSttnActions if (yearHead) { yearHead.forEach((item: { id?: string; }) => { if (item.id) { + if(item.id === "year") {item.id = ""; return;} item.id = i + item.id; } }) @@ -202,7 +203,6 @@ export const pbnstPrfmncSttnActionsExport: (set: any) => pbnstPrfmncSttnActions resData.push({ ...acc, ...data }) } }) - console.log("resData", resData) return set((state: pbnstPrfmncSttnState) => ({ ...state, pbnstPrfmncSttn: {