diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx
index 9793a5116..2daef0074 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx
@@ -1,6 +1,11 @@
"use client";
import { useWrStore } from "@/app/store";
import { btnClass } from "@/app/store/common/code";
+import type { customPbnst } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type";
+import type { WaterReuseFacility } from "@/app/store/ruseFcltMng/fcltSttn/pbnstSttn/type";
+import { excelDownload, yearOptions } from "@/components/lib/func/commom";
+import HeadChModal from "@/components/ui/modal/sttn/headChModal/headChModal";
+import { PbnstSttnModal } from "@/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal";
import {
ContentsDiv,
SearchBaseForm,
@@ -12,14 +17,9 @@ import {
type ReturnType,
} from "@common/business_components/ui";
import ListDiv from "@common/business_components/ui/list_div";
-import { Button, Label } from "@common/components/ui";
-import HeadChModal from "@/components/ui/modal/sttn/headChModal/headChModal";
-import { useCallback, useEffect, useRef, useState } from "react";
import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan";
-import type { customPbnst } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type";
-import { excelDownload, yearOptions } from "@/components/lib/func/commom";
-import type { WaterReuseFacility } from "@/app/store/ruseFcltMng/fcltSttn/pbnstSttn/type";
-import { PbnstSttnModal } from "@/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal";
+import { Button, Label } from "@common/components/ui";
+import { useCallback, useEffect, useRef, useState } from "react";
export default function PbnstSttn() {
const {
@@ -29,6 +29,7 @@ export default function PbnstSttn() {
pbnSttnInit,
getPbnStnDetail,
getFlcts,
+ resetPbnstDetail
} = useWrStore((state) => state);
const { pbnstSttnRes, fclts, pbnstSttnResCount } = pbnstSttn;
@@ -103,9 +104,6 @@ export default function PbnstSttn() {
});
}, [pbnstSttn.pbnstDetail]);
- useEffect(() => {
- console.log("pbnDetaileData.isModal ", pbnDetaileData.isModal);
- }, [pbnDetaileData.isModal]);
return (
<>
@@ -233,8 +231,9 @@ export default function PbnstSttn() {
open={pbnDetaileData.isModal}
onOpenChange={(open) => {
//TODO:OPEN 상태 확인필요
- if(!open)
- setPbnDetaileData({ data: {} as customPbnst, isModal: open });
+ if (!open)
+ setPbnDetaileData({ data: {} as customPbnst, isModal: open });
+ resetPbnstDetail();
}}
/>
diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
index 9ca1d60d2..c4e62a861 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
@@ -351,7 +351,7 @@ export default function PrfmncPrfmncReg() {
}
open={isExcelOpen.isModal}
onOpenChange={() => {
- setIsExcelOPen({ isModal: false, data: {} as FcPrfType });
+ setIsExcelOPen({ ...isExcelOpen, isModal: false });
}}
>
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx
index e94c7a002..3c59c9e3b 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx
@@ -27,9 +27,9 @@ export type pbnstSttnState = {
ruseGuranteeHeadList: TableUpperProps[]
ruseDmdHeadList: TableUpperProps[]
ruseFcltHeadList: TableUpperProps[]
- pbnstSttnResCount:number;
+ pbnstSttnResCount: number;
excelList: [];
- fclts:string[]
+ fclts: string[]
isInit: boolean;
};
};
@@ -43,15 +43,15 @@ type pbnstSttnActions = {
reurnValue: ReturnType,
searchNm: string | undefined,
year: string,
- fclts:string[]
+ fclts: string[]
) => void;
- getFlcts:()=>void;
+ getFlcts: () => void;
pbnSttnInit: (
page: string,
total: string,
reurnValue: ReturnType,
year: string,
- flcts:string[]
+ flcts: string[]
) => void;
getPbnStnDetail: (pbnstRuseFcltId: string) => void;
pbnNmSearch: (
@@ -60,8 +60,9 @@ type pbnstSttnActions = {
reurnValue: ReturnType,
searchNm: string | undefined,
year: string,
- flcts:string[]
+ flcts: string[]
) => void;
+ resetPbnstDetail: () => void;
};
export type pbnstSttnType = pbnstSttnState & pbnstSttnActions;
@@ -77,11 +78,11 @@ export const pbnstSttnStateExport: pbnstSttnState = {
ruseDmdHeadList: ruseDmdHeadListExport,
ruseFcltHeadList: ruseFcltHeadListExport,
pbnstSttnRes: [],
- pbnstSttnResCount:1,
+ pbnstSttnResCount: 1,
pbnstDetail: {} as customPbnst,
pbnstSearchData: [],
excelList: [],
- fclts:[],
+ fclts: [],
isInit: false,
},
};
@@ -92,12 +93,12 @@ const hasuListFetch = async (
reurnValue: ReturnType,
searchNm: string | undefined,
year: string,
- flcts:string[]
+ flcts: string[]
) => {
let url = `/prcsFclt/ruseInfo/`;
if (reurnValue.partValue === "A") {
- url+=`${page}/${total}/${reurnValue.partValue}/${
+ url += `${page}/${total}/${reurnValue.partValue}/${
// reurnValue.sidoValue ? reurnValue.sidoValue : reurnValue.sigunValue
reurnValue.sigunValue !== '0' ? reurnValue.sigunValue : reurnValue.sidoValue
}/0/1/SW`
@@ -108,12 +109,12 @@ const hasuListFetch = async (
? reurnValue.unitWaterShedValue
: reurnValue.middleRegionValue
}/0/1/SW`
- } else if( reurnValue.partValue === 'G'){
+ } else if (reurnValue.partValue === 'G') {
url += `${page}/${total}/${reurnValue.envPartValue}/${reurnValue.sigunValue !== '0' ? reurnValue.sigunValue : reurnValue.sidoValue}/0/1/SW`
- }else{
+ } else {
url += `1/2/A/0/0/1/SW`
}
@@ -121,8 +122,7 @@ const hasuListFetch = async (
url += "/" + searchNm
}
- console.log(' flcts ' ,flcts)
- const pbnList = await postFectch(url, flcts,fetchType.COMMON);
+ const pbnList = await postFectch(url, flcts, fetchType.COMMON);
const getRuseList = await postFectch(
`/reuseFc/pubDetailList/${year}`,
flcts,
@@ -139,7 +139,7 @@ const hasuListFetch = async (
fclt.bscFctCd === item.pbnstRuseFcltId.substring(0, 11)
);
- if(findData){
+ if (findData) {
const usage = item.prfList.reduce(
(acc, cur) => {
@@ -161,48 +161,42 @@ const hasuListFetch = async (
cur.rvrKeepUswtr +
cur.indstUswtr;
acc.total = acc.inUsage + acc.outUsage;
-
+
return acc;
},
{ total: 0, inUsage: 0, outUsage: 0 }
);
- console.log('findData ', findData)
return {
- rvbsn: findData?.rvbsn ||'-',
- lgbsn: findData?.lgbsn||'-',
- mdmbsn: findData?.mdmbsn||'-',
- rgnNm: findData?.rgnNm||'-',
- sido: findData?.sido||'-',
- gugun: findData?.gugun||'-',
- bscFctNm: findData?.bscFctNm||'-',
- efflWqltStndrdNm: findData?.efflWqltStndrdNm||'-',
- fctCpc: Number(findData?.fctCpc)||0,
+ rvbsn: findData?.rvbsn || '-',
+ lgbsn: findData?.lgbsn || '-',
+ mdmbsn: findData?.mdmbsn || '-',
+ rgnNm: findData?.rgnNm || '-',
+ sido: findData?.sido || '-',
+ gugun: findData?.gugun || '-',
+ bscFctNm: findData?.bscFctNm || '-',
+ efflWqltStndrdNm: findData?.efflWqltStndrdNm || '-',
+ fctCpc: Number(findData?.fctCpc) || 0,
tel: findData?.tel ?? "-",
- ruseUtztnFcltNm: item?.ruseUtztnFcltNm||'-',
- fcltCpct: item?.fcltCpct||'-',
- splyExtraCpct: item?.splyExtraCpct||'-',
- ruseCpct: item?.ruseCpct||'-',
- pbnstRuseFcltId: item.pbnstRuseFcltId||'-',
+ ruseUtztnFcltNm: item?.ruseUtztnFcltNm || '-',
+ fcltCpct: item?.fcltCpct || '-',
+ splyExtraCpct: item?.splyExtraCpct || '-',
+ ruseCpct: item?.ruseCpct || '-',
+ pbnstRuseFcltId: item.pbnstRuseFcltId || '-',
usageTotal: usage?.total,
inUsage: usage?.inUsage,
outUsage: usage?.outUsage,
- operMthd: item.operList[0]?.operMthd||'-',
+ operMthd: item.operList[0]?.operMthd || '-',
rprtvBzenty: item.operList[0]?.rprtvBzenty,
bgngDt: moment(item.operList[0]?.bgngDt).format("YYYY-MM-DD") ?? "",
endDt: moment(item.operList[0]?.endDt).format("YYYY-MM-DD") ?? "",
- searchNm: findData?.bscFctNm||'-',
- searchPk: findData?.bscFctCd||'-',
+ searchNm: findData?.bscFctNm || '-',
+ searchPk: findData?.bscFctCd || '-',
prfList: item?.prfList ?? []
};
}
}
).filter(Boolean);
-
-
- console.log( ' checkWrRegListRes ', getRuseList.data)
- console.log( ' data ', data)
-
return data;
};
@@ -210,12 +204,12 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = (
set: any
) => {
return {
- getFlcts:async ()=>{
- const fclts= await getFetch(fetchType.WR,'/reuseFc/pubFc')
+ getFlcts: async () => {
+ const fclts = await getFetch(fetchType.WR, '/reuseFc/pubFc')
return set((state: pbnstSttnState) => ({
pbnstSttn: {
...state.pbnstSttn,
- fclts:fclts
+ fclts: fclts
},
}));
},
@@ -239,11 +233,11 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = (
reurnValue: ReturnType,
searchNm: string | undefined,
year: string,
- fclts:string[]
+ fclts: string[]
) => {
try {
-
-
+
+
const pbnstSttnRes = await hasuListFetch(
page,
total,
@@ -265,7 +259,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = (
},
};
});
- } else{
+ } else {
set((state: pbnstSttnState) => {
return {
@@ -273,8 +267,8 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = (
pbnstSttn: {
...state.pbnstSttn,
pbnstSttnRes: pbnstSttnRes,
- pbnstSttnResCount:pbnstSttnRes.length
- // isInit: false,
+ pbnstSttnResCount: pbnstSttnRes.length
+ // isInit: false,
},
};
});
@@ -283,31 +277,31 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = (
console.log("error", erTxt);
}
},
- pbnSttnInit: async(
+ pbnSttnInit: async (
page: string,
total: string,
reurnValue: ReturnType,
year: string,
- fclts:string[]
+ fclts: string[]
) => {
try {
const pbnstSttnRes = await hasuListFetch(
- page,
- total,
- reurnValue,
- undefined,
- year,
- fclts
- );
- console.log('pbnstSttnRes ' , pbnstSttnRes)
- set( (state: pbnstSttnState) => {
+ page,
+ total,
+ reurnValue,
+ undefined,
+ year,
+ fclts
+ );
+ set((state: pbnstSttnState) => {
return {
...state,
pbnstSttn: {
...state.pbnstSttn,
pbnstSttnRes: pbnstSttnRes,
- pbnstSttnResCount:pbnstSttnRes.length,
+ pbnstSttnResCount: pbnstSttnRes.length,
isInit: false,
+ pbnstDetail: {} as customPbnst
},
};
});
@@ -315,6 +309,17 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = (
console.log("error", erTxt);
}
},
+ resetPbnstDetail: async () => {
+ set((state: pbnstSttnState) => {
+ return {
+ ...state,
+ pbnstSttn: {
+ ...state.pbnstSttn,
+ pbnstDetail: {} as customPbnst
+ },
+ };
+ })
+ },
getPbnStnDetail: async (pbnstRuseFcltId: string) => {
try {
let pbnstDetail = await getFetch("wr", `/reuseFc/pubFc/${pbnstRuseFcltId}`);
@@ -340,7 +345,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = (
reurnValue: ReturnType,
searchNm: string | undefined,
year: string,
- flcts:string[]
+ flcts: string[]
) => {
try {
@@ -359,7 +364,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = (
pbnstSttn: {
...state.pbnstSttn,
pbnstSearchData: pbnstSttnRes,
- pbnstSttnResCount:pbnstSttnRes.length,
+ pbnstSttnResCount: pbnstSttnRes.length,
},
};
});
diff --git a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx
index b23a52056..1a16c1fef 100644
--- a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx
+++ b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx
@@ -138,7 +138,6 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl
});
});
}
- console.log(tableData);
if (tableData && tableData.length > 0) {
setRuseTableData(tableData as any[]);
}
@@ -216,9 +215,6 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl
(usageTotalObj as any)[key] = val;
}
const tableData = [...inUsageData, ...outUsageData, usageTotalObj];
- console.log("inusageData", inUsageData)
- console.log("outUsageData", outUsageData)
- console.log("tableData", tableData)
setPrfData({
inPrf: inUsageData,
outPrf: outUsageData,
@@ -248,10 +244,6 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl
}, [data, form])
-
- useEffect(() => {
- console.log("prfData", prfData);
- }, [prfData])
return (
<>