From 35f765d870fca72b07583daa5bd12b4ce5d4d873 Mon Sep 17 00:00:00 2001 From: ljpark Date: Mon, 1 Jun 2026 16:31:49 +0900 Subject: [PATCH] =?UTF-8?q?wr:=20=ED=95=98=EC=88=98=EC=9E=AC=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=EC=8B=9C=EC=84=A4=20=ED=98=84=ED=99=A9=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/fcltSttn/pbnstSttn/page.tsx | 3 +- .../ruseFcltMng/fcltSttn/pbnstSttn/index.tsx | 18 ++++--- .../src/ui/search_form_left/index.tsx | 48 +++++++++++++------ 3 files changed, 44 insertions(+), 25 deletions(-) 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 9d581e0bb..a481f66a1 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx @@ -77,7 +77,8 @@ export default function PbnstSttn() { // 유역(R) 탭 선택 시, 이전 행정구역 탭에서 선택된 시군구 값이 남아있어 // 검색 결과가 시군구로 필터링되는 현상을 방지하기 위해 sigunValue를 '0'으로 초기화합니다. - if (cleanedValue.partValue === "R"|| cleanedValue.partValue === "G") { + // if (cleanedValue.partValue === "R"|| cleanedValue.partValue === "G") { + if (cleanedValue.partValue === "R") { cleanedValue.sigunValue = "0"; cleanedValue.sigunText = ""; } diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx index 0b52be5a5..35a3fb3d7 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx @@ -134,12 +134,11 @@ export const hasuListFetch = async ( if(reurnValue.sidoValue && reurnValue.sidoValue !== '0') nameCd = reurnValue.sidoValue; if(reurnValue.sigunValue &&reurnValue.sigunValue !== '0') nameCd = reurnValue.sigunValue; sidogunValue = nameCd; - partStr = reurnValue.envPartValue !== '0' ? reurnValue.envPartValue:reurnValue.partValue; + partStr = reurnValue.envPartValue !== '0' ? reurnValue.envPartValue:'A'; break; } if (sidogunValue && sidogunValue !== "0") { // 시도, 시군구 조회 조건이 있다면 - console.log("sidogunValue : --", sidogunValue, "--"); filteredFclt = flcts.filter((fclt: string) => { return sidogunValue.length == 2 ? fclt.slice(0, 2) === sidogunValue @@ -152,32 +151,31 @@ export const hasuListFetch = async ( if (searchNm && searchNm?.length > 0) { url += "/" + searchNm; } + // console.log(url); // 시설 코드가 없으면 FO 조회를 호출하지 않고 빈 결과 반환 if (filteredFclt.length === 0) { return { data: [], count: 0 }; } + // fo의 하수처리시설을 조회 const pbnList = await postFectch( `/prcsFclt/ruseInfo/1/${filteredFclt.length}/` + url, filteredFclt, fetchType.COMMON // FO ); - const checkRuseFcltList = - searchNm && searchNm?.length > 0 - ? pbnList.data.map((item) => item.bscFctCd) - : filteredFclt; - console.log("checkRuseFcltList"); - console.log(checkRuseFcltList); + const checkRuseFcltList = pbnList.data.map((item) => item.bscFctCd); + // console.log(checkRuseFcltList); + const getRuseList = await postFectch( `/reuseFc/pubDetailList/${year}/${sidogunValue}/${page}/${total}`, checkRuseFcltList, fetchType.WR ); const checkWrRegListRes = getRuseList.data; - console.log(checkWrRegListRes); + // console.log(getRuseList); const data: WaterReuseFacility[] = checkWrRegListRes .map((item: FcPrfType) => { @@ -285,7 +283,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( fclts: string[] ) => { try { - console.log(reurnValue); + // console.log(reurnValue); const pbnstSttnRes = await hasuListFetch( page, total, diff --git a/packages/common/business_components/src/ui/search_form_left/index.tsx b/packages/common/business_components/src/ui/search_form_left/index.tsx index 664a3cb5c..451b313b9 100644 --- a/packages/common/business_components/src/ui/search_form_left/index.tsx +++ b/packages/common/business_components/src/ui/search_form_left/index.tsx @@ -201,31 +201,51 @@ function SearchFormLeft({ isShowPart = false, children, selectSidoData = [], sel let selectedEnvPartSido; let selectedEnvPartSigun; + const resetSelectStateByPartChange = () => { + setSidoValue('0'); + setSigunValue('0'); + setSidoText(''); + setSigunText(''); + setRegionValue('0'); + setUnitWaterShedValue('0'); + setMiddleRegionValue('0'); + setEnvPartValue('0'); + + setFilteredSigunData([{ text: "전체", val: '0' }]); + setFilteredUnitWaterShedData([{ text: "전체", val: '0' }]); + setFilteredMiddleRegionData([{ text: "전체", val: '0' }]); + setFilteredEnvPartData([{ text: "전체", val: '0', adstDliStrCd:'' }]); + setFilteredEnvPartSidoData([{ text: "전체", val: '0', adstDliStrCd:'' }]); + setFilteredEnvPartSigunData([{ text: "전체", val: '0' }]); + setFilteredEnvPartSigunDataSelected([]); + + if (setRtnSidoValue) setRtnSidoValue('0'); + if (setRtnSigunValue) setRtnSigunValue('0'); + if (setRtnSidoText) setRtnSidoText(''); + if (setRtnSigunText) setRtnSigunText(''); + if (setRtnRegionValue) setRtnRegionValue('0'); + if (setRtnUnitWaterShedValue) setRtnUnitWaterShedValue('0'); + if (setRtnMiddleRegionValue) setRtnMiddleRegionValue('0'); + if (setRtnEnvPartValue) setRtnEnvPartValue('0'); + if (setRtnEnvPartSidoValue) setRtnEnvPartSidoValue('0'); + if (setRtnEnvPartSigunValue) setRtnEnvPartSigunValue('0'); + }; + switch(type) { case 'part': setPartValue(val); if (setRtnPartValue) { setRtnPartValue(val); } - // 구분 - if(val == 'R') { - initializeMiddleRegionData('0'); - initializeUnitWaterShedData('0'); - } else if(val == 'G') { + + resetSelectStateByPartChange(); + + if (val == 'G') { setFilteredEnvPartData([ { text: "전체", val: '0', adstDliStrCd:'' }, ...selectEnvPartData.filter((item: EnvPartSelectDataType) => item.val !== null && item.adstDliStrCd !== '') ]); - setEnvPartValue('0'); - initializeCityDataByEnvPartSido('0'); - } else { - initializeSigunData('0'); - //onSelectValue(selectSigunData[0]?.val || '0', 'sigun'); } - - // 다른 selectbox 전체로 초기화 - //onSelectValue(selectSidoData[0]?.val || '0', 'sido'); - //onSelectValue(selectSigunData[0]?.val || '0', 'sigun'); break; case 'sido': setSidoValue(val);