From 16abacf292cbac545d48cc4b568bbf154380f561 Mon Sep 17 00:00:00 2001 From: JIeunhuh Date: Fri, 11 Jul 2025 10:40:39 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/app/map/newWindowPopup.tsx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/apps/wr/app/map/newWindowPopup.tsx b/apps/wr/app/map/newWindowPopup.tsx index 90b9a140c..e8641ca6c 100644 --- a/apps/wr/app/map/newWindowPopup.tsx +++ b/apps/wr/app/map/newWindowPopup.tsx @@ -77,7 +77,7 @@ const NewWindowPopup: React.FC = ({ const { rainSttn, rainSttnSearch, rainSttnInit } = useWrStore( (state) => state ); - let { rainSttnRes } = rainSttn; + let { rainSttnRes, rainSttnResCount } = rainSttn; const [rainTable, setRainTable] = useState(); const [rainBdstChgProps, setRainBdstChgProps] = useState<{ isOpen: boolean; @@ -90,7 +90,7 @@ const NewWindowPopup: React.FC = ({ const { rswtSttn, rswtSttnSearch, rswtSttnInit } = useWrStore( (state) => state ); - let { rswtSttnRes } = rswtSttn; + let { rswtSttnRes, rswtSttnResCount } = rswtSttn; const [rswtrTable, setRswtrTable] = useState(); const [rswtrDetailModal, setRswtrDetailModal] = useState<{ isOpen: boolean, data: customRswtBdst | undefined }>({ data: undefined, isOpen: false }); const [rswtrBdstChgProps, setRswtrBdstChgProps] = useState<{ @@ -101,24 +101,23 @@ const NewWindowPopup: React.FC = ({ // 온배수시설 변수 const { htdflSttn, htdflSttnSearch, initHtdfl } = useWrStore((state) => state); - let { htdflSttnRes } = htdflSttn; + let { htdflSttnRes,htdflSttnResCount } = htdflSttn; const [htdflTable, setHtdflTable] = useState(); const [htdflDetailModal, setHtdflDetailModal] = useState<{ isOpen: boolean, data: customHtdflBdst | undefined }>({ data: undefined, isOpen: false }); - const [bdstChgProps, setBdstChgProps] = useState<{ isOpen: boolean, chBuilding: chgBuilding[] }>({ isOpen: false, chBuilding: [] }); const [htdflPage, setHtdflPage] = useState(1) - const [htdflResetPage, isHtdflResetPage] = useState(false); //하수처리시설 변수 const { pbnst, pubHasuInit, } = useWrStore((state) => state); - let { pubFacHeadList, pbnstHasuRes, pbnstRes } = pbnst; + let { pubFacHeadList, pbnstHasuRes } = pbnst; const [isRuseReg, setIsRuseReg] = useState<{ data: any | undefined; }>({ data: undefined }); const [hasuTable, setHasuTable] = useState(); const [hasuPage, setHasuPage] = useState(1); + const [hasuRes,setHasuRes] = useState() if (!featureData) return; ///////////////////////////////////////////// 피쳐데이터 선택 시 각 시설별 데이터 처리 /////////////////////////////////////////////// const getSelectedLayers = () => { @@ -488,7 +487,7 @@ const NewWindowPopup: React.FC = ({ tableData={hasuTable || []} headlist={pubFacHeadList} pageSize={10} - total={100000} + total={5000} headName={""} cellClick={hasuCellClick} onPageChange={setHasuPage} @@ -570,7 +569,7 @@ const NewWindowPopup: React.FC = ({ children={} headlist={pbnstSttn.pbnstSttHeadList} pageSize={20} - total={100000} + total={pbnstSttnResCount || 0} cellClick={(index: number | undefined, headId: string) => { pbnstCellClick(index); }} @@ -605,7 +604,7 @@ const NewWindowPopup: React.FC = ({ children={} headlist={rainSttn.rainSttHeadList} pageSize={20} - total={100000} + total={rainSttnResCount} cellClick={(index: number | undefined, headId: string) => { rainCellClick(index ?? undefined, headId); }} @@ -640,7 +639,7 @@ const NewWindowPopup: React.FC = ({ children={} headlist={rswtSttn.rswtSttHeadList} pageSize={20} - total={100000} + total={rswtSttnResCount} cellClick={(index: number | undefined, headId: string) => { rswtCellClick(index, headId); }} @@ -675,7 +674,7 @@ const NewWindowPopup: React.FC = ({ children={} headlist={htdflSttn.htdflSttHeadList} pageSize={20} - total={100000} + total={htdflSttnResCount || 0} cellClick={(index: number | undefined, headId: string) => { htdflCellClick(index ?? undefined, headId); }}