From 58a03678e46ad97435ff846c201b4c6688401958 Mon Sep 17 00:00:00 2001 From: ljpark Date: Tue, 16 Jun 2026 18:16:14 +0900 Subject: [PATCH] =?UTF-8?q?wr:=20=EC=8B=9C=EC=84=A4=EB=AA=85=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=EA=B2=80=EC=83=89=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/fcltSttn/rainSttn/page.tsx | 72 +++++++++++++------ .../ruseFcltMng/fcltSttn/rswtSttn/page.tsx | 58 +++++++++++---- apps/wr/app/store/common/auth/index.tsx | 8 +-- .../ruseFcltMng/fcltSttn/rainSttn/index.tsx | 2 + .../src/ui/map/searchBar/searchBar.tsx | 4 +- 5 files changed, 103 insertions(+), 41 deletions(-) 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 c1e9fb141..3d87dbbbf 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rainSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rainSttn/page.tsx @@ -60,6 +60,11 @@ export default function RainSttn() { }>({ data: undefined, isOpen: false }); const [fcltNm, setFcltNm] = useState(""); + const [appliedSearch, setAppliedSearch] = useState({ + conValue: "0", + fcltNm: "", + }); + const [searchTrigger, setSearchTrigger] = useState(0); const { t } = useTranslation("base"); const alert = useAlertStore((state) => state.setMessage); const skipNextSearchRef = useRef(true); @@ -142,16 +147,27 @@ export default function RainSttn() { return; } + const initialConValue = + laeSeCd === undefined || laeSeCd === "0" + ? "0" + : laeSeCd.length === 5 + ? laeSeCd + : laeSeCd.slice(0, 2); + skipNextSearchRef.current = true; + setAppliedSearch({ + conValue: initialConValue, + fcltNm: "", + }); rainSttnInit( false, 1, rainSttnSize, - getFixedConValue(), - fcltNm, + initialConValue, + "", code as unknown as Record ); - }, [rainSttn.isInit, rainSttnInit, fcltNm, code, getFixedConValue, isLaeSeCdReady]); + }, [rainSttn.isInit, rainSttnInit, code, isLaeSeCdReady, laeSeCd]); useEffect(() => { if (!isLaeSeCdReady) { @@ -163,16 +179,28 @@ export default function RainSttn() { return; } + if (searchTrigger === 0) { + return; + } + rainSttnSearch( false, pageNation, rainSttnSize, - String(getFixedConValue()), - fcltNm, + appliedSearch.conValue, + appliedSearch.fcltNm, code as unknown as Record ); isResetPage(false); - }, [pageNation, rainSttnSearch, fcltNm, code, getFixedConValue, isLaeSeCdReady]); + }, [ + pageNation, + searchTrigger, + rainSttnSearch, + code, + appliedSearch.conValue, + appliedSearch.fcltNm, + isLaeSeCdReady, + ]); useEffect(() => { if (!isLaeSeCdReady) { @@ -212,19 +240,31 @@ export default function RainSttn() { true, 1, rainSttnResCount, - String(getFixedConValue()), - fcltNm, + appliedSearch.conValue, + appliedSearch.fcltNm, code as unknown as Record ); }, [ rainSttnSearch, - fcltNm, rainSttnResCount, code, - getFixedConValue, + appliedSearch.conValue, + appliedSearch.fcltNm, isLaeSeCdReady, ]); + const handleSearch = useCallback(() => { + const nextSearch = { + conValue: String(getFixedConValue()), + fcltNm, + }; + + setAppliedSearch(nextSearch); + isResetPage(true); + setPageNation(1); + setSearchTrigger((prev) => prev + 1); + }, [fcltNm, getFixedConValue]); + useEffect(() => { const data = tableData(rainSttnRes, { code }); const chData = data @@ -318,17 +358,7 @@ export default function RainSttn() {
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 da953bb43..4e76336c5 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx @@ -55,6 +55,11 @@ export default function RswtSttn() { const [objSearch, setObjSearch] = useState({ sgg: "", city: "" }); const [detailModal, setDetailModal] = useState<{ isOpen: boolean, data: customRswtBdst | undefined }>({ data: undefined, isOpen: false }) const [fcltNm, setFcltNm] = useState(""); + const [appliedSearch, setAppliedSearch] = useState({ + conValue: "0", + fcltNm: "", + }); + const [searchTrigger, setSearchTrigger] = useState(0); const { t } = useTranslation('base'); const alert = useAlertStore((state) => state.setMessage); const isAllAreaUser = laeSeCd === "0"; @@ -137,16 +142,27 @@ export default function RswtSttn() { return; } + const initialConValue = + laeSeCd === undefined || laeSeCd === "0" + ? "0" + : laeSeCd.length === 5 + ? laeSeCd + : laeSeCd.slice(0, 2); + skipNextSearchRef.current = true; + setAppliedSearch({ + conValue: initialConValue, + fcltNm: "", + }); rswtSttnInit( false, 1, rswtSttnSize, - getFixedConValue(), - fcltNm, + initialConValue, + "", code as unknown as Record ); - }, [rswtSttn.isInit, rswtSttnInit, fcltNm, code, getFixedConValue, isLaeSeCdReady]); + }, [rswtSttn.isInit, rswtSttnInit, code, isLaeSeCdReady, laeSeCd]); useEffect(() => { const data = tableData(rswtSttnRes, { code }); @@ -208,8 +224,8 @@ export default function RswtSttn() { } isDownloadTriggered.current = true; - rswtSttnSearch(true, 1, rswtSttnResCount, String(getFixedConValue()), fcltNm, code as unknown as Record); - }, [rswtSttnSearch, fcltNm, rswtSttnResCount, code, getFixedConValue, isLaeSeCdReady]); + rswtSttnSearch(true, 1, rswtSttnResCount, appliedSearch.conValue, appliedSearch.fcltNm, code as unknown as Record); + }, [rswtSttnSearch, rswtSttnResCount, code, appliedSearch.conValue, appliedSearch.fcltNm, isLaeSeCdReady]); useEffect(() => { if (!isLaeSeCdReady) { @@ -221,9 +237,29 @@ export default function RswtSttn() { return; } - rswtSttnSearch(false, pageNation, rswtSttnSize, String(getFixedConValue()), fcltNm, code as unknown as Record); + if (searchTrigger === 0) { + return; + } + + rswtSttnSearch(false, pageNation, rswtSttnSize, appliedSearch.conValue, appliedSearch.fcltNm, code as unknown as Record); isResetPage(false) - }, [pageNation, rswtSttnSearch, fcltNm, code, getFixedConValue, isLaeSeCdReady]); + }, [pageNation, searchTrigger, rswtSttnSearch, code, appliedSearch.conValue, appliedSearch.fcltNm, isLaeSeCdReady]); + + const handleSearch = useCallback(() => { + if (!isLaeSeCdReady) { + return; + } + + const nextSearch = { + conValue: String(getFixedConValue()), + fcltNm, + }; + + setAppliedSearch(nextSearch); + isResetPage(true); + setPageNation(1); + setSearchTrigger((prev) => prev + 1); + }, [fcltNm, getFixedConValue, isLaeSeCdReady]); return ( <> @@ -279,13 +315,7 @@ export default function RswtSttn() {
diff --git a/apps/wr/app/store/common/auth/index.tsx b/apps/wr/app/store/common/auth/index.tsx index 6e9396e6e..fe99a02ae 100644 --- a/apps/wr/app/store/common/auth/index.tsx +++ b/apps/wr/app/store/common/auth/index.tsx @@ -52,10 +52,10 @@ export const authActionsExport: (set: any, get: any) => authActions = ( auth: { ...state.auth, mngAuthrtYn: response[0].mngAuthrtYn, - inqAuthrtYn: response[0].mngAuthrtYn, - regAuthrtYn: response[0].mngAuthrtYn, - mdfcnAuthrtYn: response[0].mngAuthrtYn, - delAuthrtYn: response[0].mngAuthrtYn, + inqAuthrtYn: response[0].inqAuthrtYn, + regAuthrtYn: response[0].regAuthrtYn, + mdfcnAuthrtYn: response[0].mdfcnAuthrtYn, + delAuthrtYn: response[0].delAuthrtYn, }, }; }); diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx index b278a9a22..67de7f687 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx @@ -149,6 +149,7 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = ( rainSttn: { ...state.rainSttn, excelList: rainExcel, + rainSttnResCount: rainSttnRes.count, }, }; }); @@ -159,6 +160,7 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = ( rainSttn: { ...state.rainSttn, rainSttnRes: rainSttnRes.data, + rainSttnResCount: rainSttnRes.count, isInit: false, }, }; diff --git a/packages/common/business_components/src/ui/map/searchBar/searchBar.tsx b/packages/common/business_components/src/ui/map/searchBar/searchBar.tsx index e117b86e0..e13965768 100644 --- a/packages/common/business_components/src/ui/map/searchBar/searchBar.tsx +++ b/packages/common/business_components/src/ui/map/searchBar/searchBar.tsx @@ -168,8 +168,8 @@ export const SearchBar = ({ const selectedSido = sidoData.find((item) => item.val === sidoValue); if (!selectedSido?.center) return; - console.log("시도 : " +sidoValue); - console.log("시군구 : " + sigunValue); + // console.log("시도 : " +sidoValue); + // console.log("시군구 : " + sigunValue); if (sigunValue !== "0") { console.log(sigunData.filter((item) => item.val == sigunValue)); const selectedSigun =