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/chart/infilChart.tsx

@@ -152,7 +152,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
           <div className="bg-white px-4 py-2 ">
             <span className="text-2xl text-red-600 font-bold">● 상수사용량 적용연월</span>
             <div className="flex items-center mt-2">
-              <span className="text-black text-xl font-bold">
+              <span className="ml-5 text-black text-xl font-bold">
                 {(selectedAplcnYm) ? moment(selectedAplcnYm, "YYYYMM").format("YYYY-MM") : ""}
               </span>
             </div>
@@ -161,7 +161,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
           <div className="bg-white px-4 py-2 ">
             <span className="text-2xl text-red-600 font-bold">● 침입수량 산정결과</span>
             <div className="flex items-center mt-2">
-              <span className="ml-2 text-black text-xl">침입수량 : </span>
+              <span className="ml-5 text-black text-xl">침입수량 : </span>
               <span className="w-[35px] inline-block text-right text-black text-xl font-bold">{inftwtQty}</span>
               <span className="ml-2 text-black text-xl">m³/d</span>
             </div>

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

@@ -129,7 +129,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
           <div className="bg-white px-4 py-2 ">
             <span className="text-2xl text-red-600 font-bold">● 상수사용량 적용연월</span>
             <div className="flex items-center mt-2">
-              <span className="text-black text-xl font-bold">
+              <span className="ml-5 text-black text-xl font-bold">
                 {(aplcnYm)? moment(aplcnYm, "YYYYMM").format("YYYY-MM"):""}
               </span>
             </div>
@@ -139,12 +139,12 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
           <div className="bg-white px-4 py-2 ">
             <span className="text-2xl text-red-600 font-bold">● 강우유입수량 분석결과</span>
             <div className="flex items-center mt-2">
-              <span className="w-[90px] inline-block text-right ml-2 text-black text-xl">평균RDII : </span>
+              <span className="w-[95px] inline-block text-right text-black text-xl">평균RDII : </span>
               <span className="w-[30px] inline-block text-right text-black text-xl font-bold"> {rdiiQty}</span>
               <span className="ml-2 text-black"> m³/d</span>
             </div>
             <div className="flex items-center mt-2">
-              <span className="w-[90px] inline-block text-right ml-2 text-black text-xl">강우량대비RDII : </span>
+              <span className="w-[95px] inline-block text-right text-black text-xl">강우량대비RDII : </span>
               <span className="w-[30px] inline-block text-right text-black text-xl font-bold"> {totalVolume}</span>
               <span className="ml-2 text-black"> m³/mm</span>
             </div>

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

@@ -110,7 +110,8 @@ export const addFileName = async (data:FlattenedFolder[]) => {
     data.map(async (item) => {
       const filenameArr:ReportDataFile[] = await getDcFile(String(item.clsfSystmSn));
       const f = filenameArr[0];
-      const result = {...item, fileName:f?.fileTitle, regDate:f?.regDt, fileSn:f?.fileSn, filePath:""};
+      //console.log("clsfSystmSn:", item.clsfSystmSn, "f:", f);
+      const result = {...item, fileName:f?.fileTitle, regDate:f?.regDt, fileSn:f?.fileSn, filePath:f?.filePath};
       // if (f !== undefined && f.fileSn !== "") {
       //   const fprcs = await getDcFileprcs(f?.fileSn);
       //   if (fprcs.length>0)
@@ -149,11 +150,12 @@ export const fileDownload = (data:Blob, fileName:string) => { // Blob데이터
   link.remove();
   window.URL.revokeObjectURL(url);
 }
-export const getFileDownload = async (fileSn:string, fileName:string) => {
+export const getFileDownload = async (fileSn:string, fileName:string, filePath:string) => {
-  const fileprcsData = await getDcFileprcs(fileSn); // filePath 조회
+  //const fileprcsData = await getDcFileprcs(fileSn); // filePath 조회
-  if (fileprcsData?.length === 0 ) { alert("filePath 조회 오류");  }
+  //if (fileprcsData?.length === 0 ) { alert("filePath 조회 오류");  }
-  if (fileprcsData[0].filePath === "") alert("filePath 정보 없으므로 다운로드 불가");
+  //if (fileprcsData[0].filePath === "") alert("filePath 정보 없으므로 다운로드 불가");
-  const blobData = await getDcFileDownload(fileprcsData[0].filePath); // 실제 다운로드 API
+  if (filePath === "") alert("filePath 정보 없으므로 다운로드 불가:filesn"+ fileSn);
+  const blobData = await getDcFileDownload(filePath); // 실제 다운로드 API
   fileDownload(blobData, fileName);
 }
 // 시도 데이터

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

@@ -257,8 +257,9 @@ const SearchModal: React.FC<SearchModalProps> = ({
     if (typeof index === "number" && tableData[index]) {
       const reportData = tableData[index];
       const fileName = reportData.fileName;
+      const filePath = reportData.filePath;
       if (reportData.fileSn !== "") {
-        getFileDownload(reportData.fileSn, fileName);
+        getFileDownload(reportData.fileSn, fileName, filePath);
       }
     }
   };