Merge commit '16abacf292cbac545d48cc4b568bbf154380f561' into iipbs/wr/dev

apps/wr/app/map/newWindowPopup.tsx

@@ -77,7 +77,7 @@ const NewWindowPopup: React.FC<NewWindowPopupProps> = ({
   const { rainSttn, rainSttnSearch, rainSttnInit } = useWrStore(
     (state) => state
   );
-  let { rainSttnRes } = rainSttn;
+  let { rainSttnRes, rainSttnResCount } = rainSttn;
   const [rainTable, setRainTable] = useState<customRainBdst[]>();
   const [rainBdstChgProps, setRainBdstChgProps] = useState<{
     isOpen: boolean;
@@ -90,7 +90,7 @@ const NewWindowPopup: React.FC<NewWindowPopupProps> = ({
   const { rswtSttn, rswtSttnSearch, rswtSttnInit } = useWrStore(
     (state) => state
   );
-  let { rswtSttnRes } = rswtSttn;
+  let { rswtSttnRes, rswtSttnResCount } = rswtSttn;
   const [rswtrTable, setRswtrTable] = useState<customRswtBdst[]>();
   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<NewWindowPopupProps> = ({
 
   // 온배수시설 변수
   const { htdflSttn, htdflSttnSearch, initHtdfl } = useWrStore((state) => state);
-  let { htdflSttnRes } = htdflSttn;
+  let { htdflSttnRes,htdflSttnResCount } = htdflSttn;
   const [htdflTable, setHtdflTable] = useState<customHtdflBdst[]>();
   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<pubHasuType[]>();
   const [hasuPage, setHasuPage] = useState<number>(1);
+  const [hasuRes,setHasuRes] = useState<number>()
   if (!featureData) return;
   ///////////////////////////////////////////// 피쳐데이터 선택 시 각 시설별 데이터 처리 ///////////////////////////////////////////////
   const getSelectedLayers = () => {
@@ -488,7 +487,7 @@ const NewWindowPopup: React.FC<NewWindowPopupProps> = ({
               tableData={hasuTable || []}
               headlist={pubFacHeadList}
               pageSize={10}
-              total={100000}
+              total={5000}
               headName={""}
               cellClick={hasuCellClick}
               onPageChange={setHasuPage}
@@ -570,7 +569,7 @@ const NewWindowPopup: React.FC<NewWindowPopupProps> = ({
               children={<HeadMakeColSpan upHeadList={pbnstSttn.pbnstSttNodeList} />}
               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<NewWindowPopupProps> = ({
               children={<HeadMakeColSpan upHeadList={rainSttn.rainSttNodeList} />}
               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<NewWindowPopupProps> = ({
               children={<HeadMakeColSpan upHeadList={rswtSttn.rswtSttNodeList} />}
               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<NewWindowPopupProps> = ({
               children={<HeadMakeColSpan upHeadList={htdflSttn.htdflSttNodeList} />}
               headlist={htdflSttn.htdflSttHeadList}
               pageSize={20}
-              total={100000}
+              total={htdflSttnResCount || 0}
               cellClick={(index: number | undefined, headId: string) => {
                 htdflCellClick(index ?? undefined, headId);
               }}