diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/htdflSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/htdflSttn/page.tsx index ec7781b49..c17b7dca8 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/htdflSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/htdflSttn/page.tsx @@ -228,20 +228,24 @@ export default function HtdflSttn() {
- { - cellClick(index ?? undefined, headId); - }} - onPageChange={setPageNation} - resetPageNo={resetPage} - > - - +
+
+ { + cellClick(index ?? undefined, headId); + }} + onPageChange={setPageNation} + resetPageNo={resetPage} + > + + +
+
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx index 476ad8796..ecedeb426 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx @@ -202,31 +202,35 @@ export default function PbnstSttn() {
- { - cellCLick(index); - }} - onPageChange={(page: number) => { - pbnstSttnSearch( - false, - String(page), - String(prfRegPageSize), - ref.current, - pbnRuseNm, - searchYear, - fclts - ); - setIsReset(false); - }} - resetPageNo={isReset} - > - - +
+
+ { + cellCLick(index); + }} + onPageChange={(page: number) => { + pbnstSttnSearch( + false, + String(page), + String(prfRegPageSize), + ref.current, + pbnRuseNm, + searchYear, + fclts + ); + setIsReset(false); + }} + resetPageNo={isReset} + > + + +
+
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rainSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rainSttn/page.tsx index 2e0a84bd0..750491f8d 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rainSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rainSttn/page.tsx @@ -273,20 +273,24 @@ export default function RainSttn() {
- { - cellClick(index ?? undefined); - }} - onPageChange={setPageNation} - resetPageNo={resetPage} - > - - +
+
+ { + cellClick(index ?? undefined); + }} + onPageChange={setPageNation} + resetPageNo={resetPage} + > + + +
+
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx index 8ff899a28..0392c8f3f 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx @@ -232,18 +232,22 @@ export default function RswtSttn() {
- { cellClick(index ?? undefined) }} - onPageChange={setPageNation} - resetPageNo={resetPage} - > - - +
+
+ { cellClick(index ?? undefined) }} + onPageChange={setPageNation} + resetPageNo={resetPage} + > + + +
+
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx index d45a646a4..b5ba8cfff 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx @@ -261,29 +261,33 @@ export default function Page() {
- {selFcltDiv === "RNB" ? ( - {}} - detailUp={() => {}} - handleClick={handleClick} - rainChkData={rainChkSttn.rainChkRes} - pageNation={rainPageNation} - onPageChange={rainPageChange} - pageCount={rainChkSttn.rainChkCount} - readonly={true} - /> - ) : ( - {}} - deleteRswtData={() => {}} - handleRswtClick={handleClick} - rswtChkData={rswtChkSttn.rswtChkRes} - pageNation={rswtPageNation} - onPageChange={rswtPageChange} - pageCount={rswtChkSttn.rswtChkCount} - readonly={true} - /> - )} +
+
+ {selFcltDiv === "RNB" ? ( + {}} + detailUp={() => {}} + handleClick={handleClick} + rainChkData={rainChkSttn.rainChkRes} + pageNation={rainPageNation} + onPageChange={rainPageChange} + pageCount={rainChkSttn.rainChkCount} + readonly={true} + /> + ) : ( + {}} + deleteRswtData={() => {}} + handleRswtClick={handleClick} + rswtChkData={rswtChkSttn.rswtChkRes} + pageNation={rswtPageNation} + onPageChange={rswtPageChange} + pageCount={rswtChkSttn.rswtChkCount} + readonly={true} + /> + )} +
+
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx index a1d1193b2..ac766b0b3 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx @@ -7,27 +7,11 @@ import { z } from "zod"; export const pbnSttHeadListExport: z.infer = [ { id: "rvbsn", title: "권역", visible: true }, - { - id: "lgbsn", - title: "단위유역", - visible: true, - }, - { - id: "mdmbsn", - title: "중권역", - visible: true, - }, + { id: "lgbsn", title: "단위유역", visible: true, }, + { id: "mdmbsn", title: "중권역", visible: true, }, { id: "rgnNm", title: "환경청", visible: true }, - { - id: "sido", - title: "시도", - visible: true, - }, - { - id: "gugun", - title: "시군구", - visible: true, - }, + { id: "sido", title: "시도", visible: true, }, + { id: "gugun", title: "시군구", visible: true, }, { id: "bscFctNm", title: "시설명", visible: true }, { id: "efflWqltStndrdNm", title: "지역구분", visible: true }, @@ -35,405 +19,69 @@ export const pbnSttHeadListExport: z.infer = [ { id: "fctCpc", title: "시설용량(톤/일)", visible: true }, { id: "ruseUtztnFcltNm", title: "재이용시설명", visible: true }, - { - id: "fcltCpct", - title: "시설용량(m³/일)", - visible: true, - }, - { - id: "splyExtraCpct", - title: "하수처리량(m³/일)", - visible: true, - }, - { - id: "ruseCpct", - title: "재이용량(m³/일)", - visible: true, - }, + { id: "fcltCpct", title: "시설용량(m³/일)", visible: true, }, + { id: "splyExtraCpct", title: "하수처리량(m³/일)", visible: true, }, + { id: "ruseCpct", title: "재이용량(m³/일)", visible: true, }, - { - id: "usageTotal", - title: "합계", - visible: true, - }, - { - id: "inUsage", - title: "장내용수", - visible: true, - }, - { - id: "outUsage", - title: "장외용수", - visible: true, - }, + { id: "usageTotal", title: "합계", visible: true, }, + { id: "inUsage", title: "장내용수", visible: true, }, + { id: "outUsage", title: "장외용수", visible: true, }, - { - id: "operMthd", - title: "운영방식", - visible: true, - }, - { - id: "rprtvBzenty", - title: "대행업체", - visible: true, - }, - { - id: "bgngDt", - title: "시작일", - visible: true, - }, - { - id: "endDt", - title: "종료일", - visible: true, - }, + { id: "operMthd", title: "운영방식", visible: true, }, + { id: "rprtvBzenty", title: "대행업체", visible: true, }, + { id: "bgngDt", title: "시작일", visible: true, }, + { id: "endDt", title: "종료일", visible: true, }, ]; // id는 다확인해야함 export const pbnstSttNodeListExport: CommonTableProps[] = [ - { - id: "catchment", - title: "유역", - visible: true, - row: 1, - rowSpan: 1, - colSpan: 3, - }, - { - id: "rgnNm", - title: "환경청", - visible: true, - row: 1, - rowSpan: 2, - colSpan: 1, - }, - { - id: "adminDiv", - title: "행정구역", - visible: true, - row: 1, - rowSpan: 1, - colSpan: 2, - }, - { - id: "bscFctNm", - title: "시설명", - visible: true, - row: 1, - rowSpan: 2, - colSpan: 1, - }, - { - id: "efflWqltStndrdNm", - title: "지역구분", - visible: true, - row: 1, - rowSpan: 2, - colSpan: 1, - }, - { - id: "tel", - title: "전화번호", - visible: true, - row: 1, - rowSpan: 2, - colSpan: 1, - }, - { - id: "fctCpc", - title: "시설용량(m³/일)", - visible: true, - row: 1, - rowSpan: 2, - colSpan: 1, - }, - { - id: "ruseUtztnFcltNm", - title: "재이용시설명", - visible: true, - row: 1, - rowSpan: 2, - colSpan: 1, - }, - { - id: "rusSup", - title: "재이용수공급가능량(m³/일)", - visible: true, - row: 1, - rowSpan: 1, - colSpan: 3, - }, - { - id: "yearResult", - title: "연간실적정보(m³)", - visible: true, - row: 1, - rowSpan: 1, - colSpan: 3, - }, - { - id: "mngInfo", - title: "운영정보", - visible: true, - row: 1, - rowSpan: 1, - colSpan: 4, - }, - { - id: "rvbsn", - title: "권역", - upName: "catchment", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "lgbsn", - title: "단위유역", - upName: "catchment", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "mdmbsn", - title: "중권역", - upName: "catchment", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "sido", - title: "시도", - upName: "adminDiv", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "gugun", - title: "시군구", - upName: "adminDiv", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "fcltCpct", - title: "시설용량", - upName: "rusSup", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "splyExtraCpct", - title: "하수처리량", - upName: "rusSup", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "ruseCpct", - title: "재이용량", - upName: "rusSup", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "usageTotal", - title: "합계", - upName: "yearResult", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "inUsage", - title: "장내용수", - upName: "yearResult", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "outUsage", - title: "장외용수", - upName: "yearResult", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "operMthd", - title: "운영방식", - upName: "mngInfo", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "rprtvBzenty", - title: "대행업체", - upName: "mngInfo", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "bgngDt", - title: "시작일", - upName: "mngInfo", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, - { - id: "endDt", - title: "종료일", - upName: "mngInfo", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 1, - }, + { id: "catchment", title: "유역", visible: true, row: 1, rowSpan: 1, colSpan: 3, }, + { id: "rgnNm", title: "환경청", visible: true, row: 1, rowSpan: 2, colSpan: 1, }, + { id: "adminDiv", title: "행정구역", visible: true, row: 1, rowSpan: 1, colSpan: 2, }, + { id: "bscFctNm", title: "시설명", visible: true, row: 1, rowSpan: 2, colSpan: 1, }, + { id: "efflWqltStndrdNm", title: "지역구분", visible: true, row: 1, rowSpan: 2, colSpan: 1, }, + { id: "tel", title: "전화번호", visible: true, row: 1, rowSpan: 2, colSpan: 1, }, + { id: "fctCpc", title: "시설용량(m³/일)", visible: true, row: 1, rowSpan: 2, colSpan: 1, }, + { id: "ruseUtztnFcltNm", title: "재이용시설명", visible: true, row: 1, rowSpan: 2, colSpan: 1, }, + { id: "rusSup", title: "재이용수공급가능량(m³/일)", visible: true, row: 1, rowSpan: 1, colSpan: 3, }, + { id: "yearResult", title: "연간실적정보(m³)", visible: true, row: 1, rowSpan: 1, colSpan: 3, }, + { id: "mngInfo", title: "운영정보", visible: true, row: 1, rowSpan: 1, colSpan: 4, }, + { id: "rvbsn", title: "권역", upName: "catchment", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "lgbsn", title: "단위유역", upName: "catchment", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "mdmbsn", title: "중권역", upName: "catchment", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "sido", title: "시도", upName: "adminDiv", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "gugun", title: "시군구", upName: "adminDiv", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "fcltCpct", title: "시설용량", upName: "rusSup", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "splyExtraCpct", title: "하수처리량", upName: "rusSup", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "ruseCpct", title: "재이용량", upName: "rusSup", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "usageTotal", title: "합계", upName: "yearResult", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "inUsage", title: "장내용수", upName: "yearResult", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "outUsage", title: "장외용수", upName: "yearResult", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "operMthd", title: "운영방식", upName: "mngInfo", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "rprtvBzenty", title: "대행업체", upName: "mngInfo", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "bgngDt", title: "시작일", upName: "mngInfo", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, + { id: "endDt", title: "종료일", upName: "mngInfo", visible: true, row: 2, rowSpan: 1, colSpan: 1, }, ]; export const ruseFcltNodeListExport: TableUpperProps[] = [ { id: "cycl", title: "차수", visible: true, row: 1, rowSpan: 3, colSpan: 1 }, { id: "seCd", title: "구분", visible: true, row: 1, rowSpan: 3, colSpan: 1 }, - { - id: "busiTotal", - title: "사업개요", - visible: true, - row: 1, - rowSpan: 1, - colSpan: 9, - }, - { - id: "ruseFclt", - title: "재처리시설", - visible: true, - row: 1, - rowSpan: 1, - colSpan: 3, - }, - { - id: "mainSplyPumpCpct", - title: "메인공급펌프용량(m³/일)", - visible: true, - row: 1, - rowSpan: 3, - colSpan: 1, - }, - { - id: "buziFee", - title: "사업비(원)", - visible: true, - row: 2, - rowSpan: 1, - colSpan: 5, - }, - { - id: "instlAprvSncnDt", - title: "설치승인・인가일", - visible: true, - row: 2, - rowSpan: 2, - colSpan: 1, - }, - { - id: "bizCmcnDay", - title: "사업준공일", - visible: true, - row: 2, - rowSpan: 2, - colSpan: 1, - }, - { - id: "rprcsFcltCpct", - title: "시설용량(m³/일)", - visible: true, - row: 2, - rowSpan: 2, - colSpan: 1, - }, - { - id: "rprcsMthdCd", - title: "재처리방식", - visible: true, - row: 2, - rowSpan: 2, - colSpan: 1, - }, - { - id: "majorPrcsMsrcCd", - title: "주처리공법", - visible: true, - row: 2, - rowSpan: 2, - colSpan: 1, - }, - { - id: "inoutYn", - title: "위치처리장(내・외)", - visible: true, - row: 2, - rowSpan: 2, - colSpan: 1, - }, - { - id: "addr", - title: "위치(주소)", - visible: true, - row: 2, - rowSpan: 2, - colSpan: 1, - }, + { id: "busiTotal", title: "사업개요", visible: true, row: 1, rowSpan: 1, colSpan: 9 }, + { id: "ruseFclt", title: "재처리시설", visible: true, row: 1, rowSpan: 1, colSpan: 3 }, + { id: "mainSplyPumpCpct", title: "메인공급펌프용량(m³/일)", visible: true, row: 1, rowSpan: 3, colSpan: 1 }, + { id: "buziFee", title: "사업비(원)", visible: true, row: 2, rowSpan: 1, colSpan: 5 }, + { id: "instlAprvSncnDt", title: "설치승인・인가일", visible: true, row: 2, rowSpan: 2, colSpan: 1 }, + { id: "bizCmcnDay", title: "사업준공일", visible: true, row: 2, rowSpan: 2, colSpan: 1 }, + { id: "rprcsFcltCpct", title: "시설용량(m³/일)", visible: true, row: 2, rowSpan: 2, colSpan: 1 }, + { id: "rprcsMthdCd", title: "재처리방식", visible: true, row: 2, rowSpan: 2, colSpan: 1 }, + { id: "majorPrcsMsrcCd", title: "주처리공법", visible: true, row: 2, rowSpan: 2, colSpan: 1 }, + { id: "inoutYn", title: "위치처리장(내・외)", visible: true, row: 2, rowSpan: 2, colSpan: 1 }, + { id: "addr", title: "위치(주소)", visible: true, row: 2, rowSpan: 2, colSpan: 1 }, { id: "gvsbs", title: "국고", visible: true, row: 3, rowSpan: 1, colSpan: 1 }, - { - id: "lcep", - title: "지방비", - visible: true, - row: 3, - rowSpan: 1, - colSpan: 1, - }, - { - id: "cusrAlotm", - title: "민간투자비", - visible: true, - row: 3, - rowSpan: 1, - colSpan: 1, - }, - + { id: "lcep", title: "지방비", visible: true, row: 3, rowSpan: 1, colSpan: 1 }, + { id: "cusrAlotm", title: "민간투자비", visible: true, row: 3, rowSpan: 1, colSpan: 1 }, { id: "etc", title: "기타", visible: true, row: 3, rowSpan: 1, colSpan: 1 }, - { - id: "totalMoney", - title: "합계", - visible: true, - row: 3, - rowSpan: 1, - colSpan: 1, - }, + { id: "totalMoney", title: "합계", visible: true, row: 3, rowSpan: 1, colSpan: 1 }, ]; export const ruseSplyHeadListExport: TableUpperProps[] = [ @@ -481,61 +129,16 @@ export const ruseFcltHeadListExport: CommonTableProps[] = [ { id: "cycl", title: "차수", visible: true}, { id: "seCd", title: "구분", visible: true}, { id: "gvsbs", title: "국고", visible: true }, - { - id: "lcep", - title: "지방비", - visible: true, - }, - { - id: "cusrAlotm", - title: "민간투자비", - visible: true, - }, - + { id: "lcep", title: "지방비", visible: true }, + { id: "cusrAlotm", title: "민간투자비", visible: true }, { id: "etc", title: "기타", visible: true }, - { - id: "totalMoney", - title: "합계", - visible: true, - }, - { - id: "instlAprvSncnDt", - title: "설치승인・인가일", - visible: true, - }, - { - id: "bizCmcnDay", - title: "사업준공일", - visible: true, - }, - { - id: "rprcsFcltCpct", - title: "시설용량(m³/일)", - visible: true, - }, - { - id: "rprcsMthdCd", - title: "재처리방식", - visible: true, - }, - { - id: "majorPrcsMsrcCd", - title: "주처리공법", - visible: true, - }, - { - id: "inoutYn", - title: "위치처리장(내・외)", - visible: true, - }, - { - id: "addr", - title: "위치(주소)", - visible: true, - }, - { - id: "mainSplyPumpCpct", - title: "메인공급펌프용량", - visible: true, - }, + { id: "totalMoney", title: "합계", visible: true }, + { id: "instlAprvSncnDt", title: "설치승인・인가일", visible: true }, + { id: "bizCmcnDay", title: "사업준공일", visible: true }, + { id: "rprcsFcltCpct", title: "시설용량(m³/일)", visible: true }, + { id: "rprcsMthdCd", title: "재처리방식", visible: true }, + { id: "majorPrcsMsrcCd", title: "주처리공법", visible: true }, + { id: "inoutYn", title: "위치처리장(내・외)", visible: true }, + { id: "addr", title: "위치(주소)", visible: true }, + { id: "mainSplyPumpCpct", title: "메인공급펌프용량", visible: true }, ]; diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx index 28743ab26..9e2c47a04 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx @@ -166,13 +166,14 @@ export const hasuListFetch = async ( const pbnList = await postFectch( `/prcsFclt/ruseInfo/1/${filteredFclt.length}/` + url, filteredFclt, - fetchType.COMMON + fetchType.COMMON // FO ); const checkRuseFcltList = searchNm && searchNm?.length > 0 ? pbnList.data.map((item) => item.bscFctCd) : filteredFclt; + const getRuseList = await postFectch( `/reuseFc/pubDetailList/${year}/${filterData}/${page}/${total}`, checkRuseFcltList,