Merge commit 'fe71d85bc62a941cf47a043365d555a979fffbfe' into iipbs/wr/regForTest

apps/wr/app/layout.tsx

@@ -3,23 +3,38 @@ import { BaseLayout } from "@common/components";
 import "./globals.css";
 import { StoreProvider } from "./store";
 import { MainDiv } from "@common/business_components";
+import koBase from '../public/locales/ko/message.json';
+import i18next from "i18next";
+import { I18nextProvider } from "react-i18next";
 
 export default function RootLayout({
   children,
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  i18next.init({
+    lng: 'ko',
+    fallbackLng: 'ko',
+    resources: {
+      ko: {
+        base: koBase,
+      },
+    }
+  });
+
   return (
     <html lang="en">
       <body>
+        <I18nextProvider i18n={i18next}>
           <StoreProvider>
             <BaseLayout>
-             <MainDiv>
+              <MainDiv>
                 {children}
-                </MainDiv>
+              </MainDiv>
             </BaseLayout>
           </StoreProvider>
+        </I18nextProvider>
       </body>
-    </html>
+    </html >
   );
 }

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);
               }}

apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx

@@ -45,7 +45,7 @@ export default function Home() {
   useEffect(() => {
     if (code.sggCd.length > 0) {
 
-      if( rswtRes?.length > 0){
+      if (rswtRes?.length > 0) {
         const rswtData = tableData(rswtRes, { code })?.map(
           (item: customRswtBdst) => {
             let archArea =
@@ -62,12 +62,20 @@ export default function Home() {
         );
         setbdstTable(rswtData);
         setRswtForm(rswtRes[selectVal ?? 0]);
-      }else{
+      } else {
         setbdstTable([]);
         setRswtForm({} as customRswtBdst);
       }
     }
-  }, [code, rswtRes, selectVal]);
+    // }, [code, rswtRes, selectVal]);
+
+  }, [code, rswtRes]);
+  useEffect(() => {
+    if (rswtRes && rswtRes.length > 0) {
+      setRswtForm(rswtRes[selectVal ?? 0]);
+    }
+  }, [rswtRes, selectVal]);
+
   const cellClick: (val: number | undefined, headId: string) => void = (
     val,
     headId
@@ -75,7 +83,7 @@ export default function Home() {
     if ((bdstTable ?? []).length > 0 && val !== undefined) {
       {
         setSelect(val);
-        setRswtForm(rswtRes[val]);
+        // setRswtForm(rswtRes[val]);
       }
     }
 

apps/wr/app/stats/rainStat/page.tsx

@@ -29,7 +29,7 @@ export default function RainStat() {
 
   useEffect(() => {
     searchRainStatList(searchYear);
-  }, [code.cityCd, code.sggCd, searchRainStatList, searchYear])
+  }, [code.cityCd, code.sggCd, searchRainStatList])
 
   const excelDetailDownLoad=() =>{
     const sidoList = new Set<string>();
@@ -237,7 +237,7 @@ export default function RainStat() {
                   />
                 </div>
                 <div className="flex flex-row space-x-2 items-center">
-                  <Button className="" size={"sm"} onClick={() => { }}>
+                  <Button className="" size={"sm"} onClick={()=>{searchRainStatList(searchYear);}}>
                     조회
                   </Button>
                   <Button className="" size={"sm"} onClick={() => excelClick()}>

apps/wr/app/stats/rswtStat/page.tsx

@@ -26,7 +26,7 @@ export default function RswtStat() {
 
   useEffect(() => {
     searchRswtStatList(searchYear)
-  }, [searchRswtStatList, searchYear])
+  }, [searchRswtStatList])
 
   const excelClick = () => {
     downloadExcel({