Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev

apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx

@@ -180,8 +180,8 @@ const Ssc = ({ featureData, isMainSsc, chmbrXcnts, chmbrYdnts, onSaveClick }: {
   };
 
   const renderModalBody = () => (
-    <div className='grid grid-cols-1 gap-4 p-4'>
-      <div>
+    <div className='grid grid-cols-1 gap-4 p-4 mr-4 mt-4'>
+      <div className='border rounded-lg p-4 bg-white'>
         <Label className='text-3xl font-medium text-label '>강우/측정 정보</Label>
         {/* 강우정보 테이블 */}
         <UiTable
@@ -228,17 +228,20 @@ const Ssc = ({ featureData, isMainSsc, chmbrXcnts, chmbrYdnts, onSaveClick }: {
         </UiTable>
       </div>
 
-      {/* 수량/수질측정 정보 테이블 */}
-      <UiTable
-        headName='수량/수질측정 정보'
-        tableData={mntrngsData}
-        headlist={untrtSwgRainCol5}
-        pageSize={3}
-        total={totalDetailCount}
-        cellClick={undefined}
-        onPageChange={setCurDetailPage}
-        resetPageNo={isResetDetailPage}
-      />
+      <div className='border rounded-lg p-4 bg-white'>
+        {/* 수량/수질측정 정보 테이블 */}
+        <Label className='text-3xl font-medium text-label '>수량/수질측정 정보</Label>
+        <UiTable
+          headName=' '
+          tableData={mntrngsData}
+          headlist={untrtSwgRainCol5}
+          pageSize={3}
+          total={totalDetailCount}
+          cellClick={undefined}
+          onPageChange={setCurDetailPage}
+          resetPageNo={isResetDetailPage}
+        />
+      </div>
     </div>
   )
 

apps/sn/app/(map-layout)/map/searchModal/reportTab.tsx

@@ -80,11 +80,8 @@ const ReportTab: React.FC<ReportTabProps> = ({ open, isSearch = true, ctpvNm, sg
   useEffect(() => {
     // showTable이 true일 때만 fetch (최초 렌더 방지)
     setIsResetPage(false);
-    setIsResetSelection(true);
 
     if (showTable) fetchFilteredData();
-
-    setIsResetSelection(false);
   }, [curPage]);
 
   const handleCtpvCdChange = (sidoId: number) => {
@@ -165,16 +162,17 @@ const ReportTab: React.FC<ReportTabProps> = ({ open, isSearch = true, ctpvNm, sg
       addFileName(filterReportData).then(data => {
         filterReportData = data;
         setTableData(filterReportData || []);
+        setIsResetSelection(false); // 데이터 설정 후 선택 초기화 해제
       });
-      setTableData(filterReportData || []);
 
+      setTableData(filterReportData || []);
       setShowTable(true);
     } catch (err) {
       console.error('API ERROR:', err);
       setTableData([]);
+      setIsResetSelection(false); // 에러 시에도 선택 초기화 해제
     } finally {
       setIsLoading(false); // 로딩 종료
-      setIsResetSelection(false);
     }
   };