sn: 중점우수토실 외

apps/sn/app/(map-layout)/map/components/common/table.ts

@@ -686,7 +686,7 @@ export const untrtSwgRainCol1 = [
 
 // 중점우수토실 측정지점 시설현황
 export const untrtSwgRainCol2 = [
-  { id: 'flwmtr_mesure_tp_etc', title: '구분' },
+  { id: 'flwmtr_mesure_tp_etc', title: '구분' }, // 유량계측정방식 기타
   { id: 'discharge_pipe_spec', title: '방류관로 규격(m)' },
   { id: 'swr_ppl_eqp_ar', title: '배수구역 면적(m²)' },
   { id: 'swr_trt_popl', title: '하수처리 인구(인)' },
@@ -722,7 +722,7 @@ export const untrtSwgRainCol4 = [
 export const untrtSwgRainCol5 = [
   { id: 'odr', title: '회차' },
   { id: 'mesureDt', title: '측정일자' },
-  { id: 'mesureQy', title: '수량(m)' },
+  { id: 'mesureQy', title: '수량(m³)' },
   { id: 'mesureBod', title: 'BOD(mg/L)' },
   { id: 'mesureToc', title: 'TOC(mg/L)' },
   { id: 'mesureLoad', title: '오염부하량(kg)' }

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

@@ -100,15 +100,20 @@ const Ssc = ({ featureData, isMainSsc, chmbrXcnts, chmbrYdnts, onSaveClick }: {
       const processedDataArray: any[] = result.content.map((data: any) => {
         // 🎯 formatDisplayData로 기본 포맷팅 적용
         const formattedItem = formatDisplayData(data);
-
+        const flwmtrInstTp = data.flwmtrInstTp === 'R' ? '이동식' : data.flwmtrInstTp === 'S' ? '고정식' : '-';
+        const flwmtrMesureTp = data.flwmtrMesureTp === 'R' ? '레이더' : data.flwmtrMesureTp === 'P' ? '플륨' 
+                             : data.flwmtrMesureTp === 'U' ? '초음파' : data.flwmtrMesureTp === 'E' ? '기타' : '-';
+        const flwmtrCombined = `${flwmtrInstTp}, ${flwmtrMesureTp}`;
         // 🎯 추가 데이터 조합
         return {
           ...formattedItem,
-          flwmtrCombined: `${data.flwmtrMesureTpEtc || '-'} / ${data.flwmtrKnd || '-'}`,
-          mesureBeginDt: data.mesureBeginDt ? formatNoYearNoSec(data.mesureBeginDt) : '-',
-          mesureEndDt: data.mesureEndDt ? formatNoYearNoSec(data.mesureEndDt) : '-',
-          qltwtrBeginDt: data.qltwtrBeginDt ? formatNoYearNoSec(data.qltwtrBeginDt) : '-',
-          qltwtrEndDt: data.qltwtrEndDt ? formatNoYearNoSec(data.qltwtrEndDt) : '-',
+          rainInfo: `${data.rainInfo === '0' ? '강우량계' : data.observatory || '-'}`, // 강우정보 0: 강우량계,1: 관측기관 이면 OBSERVATORY 이값사용
+          measureIntrvl: `${data.measureIntrvlGbn === '1' ? '1분' : (data.measureIntrvlGbn === '0' ? data.measureIntrvl+'분' : '-')}`, // 측정간격          
+          flwmtrCombined: `${flwmtrCombined} / ${data.flwmtrKnd || '-'}`, // 유량계종류 및 모델명
+          mesureBeginDt: data.mesureBeginDt ? formatNoYearNoSec(data.mesureBeginDt) : '-', // 수량 측정시작일
+          mesureEndDt: data.mesureEndDt ? formatNoYearNoSec(data.mesureEndDt) : '-', // 수량 측정종료일
+          qltwtrBeginDt: data.qltwtrBeginDt ? formatNoYearNoSec(data.qltwtrBeginDt) : '-', // 수질 측정시작일(채수시작일)
+          qltwtrEndDt: data.qltwtrEndDt ? formatNoYearNoSec(data.qltwtrEndDt) : '-', // 수질 측정종료일(채수종료일)
         };
       });
       setRainMeasureData(processedDataArray);

apps/sn/app/(with-base-layout)/oper/oldPp/tableModal.tsx

@@ -21,7 +21,7 @@ import { HeadMakeColSpan } from '@common/business_components/ui/table/HeadMakeCo
 import { oldPpTable2HeadList, oldPpTable2NodeList, oldPpTable6HeadList, oldPpTable6NodeList } from './headList';
 
 const TABS = [
-  { val: "1", text: "row data" },
+  { val: "1", text: "raw data" },
   { val: "2", text: "1.정밀조사" },
   { val: "3", text: "2.정밀조사_정비사업연계" },
   { val: "4", text: " 3.정비사업" },