diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
index 21e81bd43..7385d84cc 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
@@ -5,7 +5,8 @@ import { Button, Input, Label } from '@common/components';
import React, { useEffect, useState } from 'react';
import type { TInftwtAnls } from './aplcnYms';
-import { getChartDataInftwtAnlsRslt, getOptionsInftwtAnlsInfo, selectInftwtAnls, selectInftwtAnlsRslt, useAplcnYms } from './aplcnYms';
+import { useAplcnYms, getOptionsInftwtAnlsInfo, selectInftwtAnls } from './aplcnYms';
+import { getChartDataInftwtAnlsRslt, selectInftwtAnlsRslt, selectOilq, getChartDataOilq } from './aplcnYms';
type ModalOpenProp = {
isModalOpen: boolean,
setIsModalOpen: (open: boolean) => void,
@@ -81,23 +82,25 @@ const InfilChart = ({ btnTxt, isModalOpen, setIsModalOpen, closeModal }: ModalOp
.then((data) => {
setInftwtAnlss(data ?? []);
setInftwtAnlsInfos(getOptionsInftwtAnlsInfo(data));
+ setInftwtAnlsSn(0); // 초기화
})
.catch((error) => {
console.error("selectInftwtAnls 에러:", error);
setInftwtAnlss([]);
setInftwtAnlsInfos([{ val: 0, text: '선택' }]);
});
- setInftwtAnlsSn(0); // 초기화
+
}, [aplcnYm]);
// 값 표시
useEffect(() => {
// 선택된 침입수분석 정보에 대한 처리 로직
+ if (inftwtAnlsSn === 0) return;
const selectedAnls = inftwtAnlss.find(anls => anls.inftwtAnlsSn === inftwtAnlsSn);
if (selectedAnls) {
setInftwtAnls(selectedAnls);
}
- }, [inftwtAnlsSn, inftwtAnlss]);
+ }, [inftwtAnlsSn]);
const closePopup = () => { // 팝업 닫기
selectInftwtAnlsRslt(inftwtAnlsSn, "L13101003").then((data) => {// 침입수분석 결과 조회
@@ -107,13 +110,13 @@ const InfilChart = ({ btnTxt, isModalOpen, setIsModalOpen, closeModal }: ModalOp
chartData1: rsltData // 침입수분석결과
}));
});
- // selectOilq(inftwtAnlsSn,"L13101003").then((data) => {// 유량 조회
- // const rsltData = getChartDataOilq(data ?? []);
- // setChartData(prev => ({
- // ...prev,
- // chartData2: rsltData // 유량
- // }));
- // });
+ selectOilq(inftwtAnlsSn,"L13101003").then((data) => {// 유량 조회
+ const rsltData = getChartDataOilq(data ?? []);
+ setChartData(prev => ({
+ ...prev,
+ chartData2: rsltData // 유량
+ }));
+ });
setPopupOpen(false);
};
@@ -220,8 +223,8 @@ const InfilChart = ({ btnTxt, isModalOpen, setIsModalOpen, closeModal }: ModalOp
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
index 449f7bbde..3b13a3df7 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
@@ -223,7 +223,7 @@ const RdiiChart = ({ btnTxt, isModalOpen, setIsModalOpen, closeModal }: ModalOpe