From 8a459f11109a099077aabcddd83419783eee5f61 Mon Sep 17 00:00:00 2001 From: ljpark Date: Wed, 2 Jul 2025 09:59:12 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EB=9F=89api=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../popupComponent/chart/aplcnYms.ts | 5 +-- .../popupComponent/chart/infilChart.tsx | 36 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts index 56157bc0e..2e0fd6965 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts @@ -95,7 +95,7 @@ export const useAplcnYms = (gubun:string) => { if (result) setData(result); }; fetch(gubun); - }, []); + }, [gubun]); return data; }; @@ -155,7 +155,7 @@ export const selectOilq = async(inftwtAnlsSn:number, pplMngNo:string) => { // console.warn("inftwtAnlsSn or pplMngNo is not provided"); return []; } - const result = await getData(`v1/inftwtAnlsRslt/oilqppl/${inftwtAnlsSn}/${pplMngNo}`); + const result = await getData(`v1/inftwtAnlsRslt/oilqPpl/${inftwtAnlsSn}/${pplMngNo}`); if (result && result.numberOfElements > 0) { console.log("selectOilq", result.content); return result.content; @@ -165,6 +165,7 @@ export const selectOilq = async(inftwtAnlsSn:number, pplMngNo:string) => { // } }; +//---------- export const getOptionsRdiiAnlsInfo = (anlsArr: TRdiiAnls[]): { text: string; val: number }[] => { const options = anlsArr.map(anls => ({ text: anls.anlsInfo, 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 a8a7d0f85..8700f0eb3 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 @@ -26,7 +26,9 @@ const InfilChart = ({ btnTxt, isModalOpen, setIsModalOpen, closeModal, pplMngNo const [inftwtAnls, setInftwtAnls] = useState(null); // 침입수분석정보 const [inftwtAnlsSn, setInftwtAnlsSn] = useState(0); // 침입수분석 정보 선택시 사용 const [chartData, setChartData] = useState<{ chartData1: DataType[]; chartData2: DataType[] }>({ - chartData1: [], chartData2: [], + chartData1: [], chartData2: [{ label: "1", val: 15 }, + { label: "2", val: 35 }, + { label: "3", val: 55 },], }); const aplcnYms = useAplcnYms('inftwtAnlsRslt'); // 상수사용월 데이터 가져오기 pplMngNo = "L"+pplMngNo; // "L13101003"; @@ -50,13 +52,15 @@ const InfilChart = ({ btnTxt, isModalOpen, setIsModalOpen, closeModal, pplMngNo useEffect(() => { if (isModalOpen === false) { - setPopupOpen(true); // 모달이 닫힐 때 팝업은 + setPopupOpen(true); // 모달이 닫힐 때 조회조건팝업은 열어두기 setAplcnYm(""); // 상수사용월 초기화 setInftwtAnlss([]); // 침입수분석 초기화 setInftwtAnlsInfos([{ val: 0, text: '선택' }]); // 침입수분석정보 초기화 setInftwtAnls(null); // 침입수분석정보 초기화 setInftwtAnlsSn(0); // 침입수분석 일련번호 초기화 - setChartData({chartData1: [], chartData2: []}); // 차트 데이터 초기화 + setChartData({chartData1: [], chartData2: [{ label: "1", val: 15 }, + { label: "2", val: 35 }, + { label: "3", val: 55 },],}); // 차트 데이터 초기화 } }, [isModalOpen]); @@ -103,19 +107,19 @@ const InfilChart = ({ btnTxt, isModalOpen, setIsModalOpen, closeModal, pplMngNo chartData1: rsltData // 침입수분석결과 })); }); - // selectOilq(inftwtAnlsSn, pplMngNo).then((data) => {// 유량 조회 - // const rsltData = getChartDataOilq(data ?? []); - // setChartData(prev => ({ - // ...prev, - // chartData2: rsltData // 유량 - // })); - // }).catch((err) => { - // console.error("selectOilq 에러:", err); - // setChartData(prev => ({ - // ...prev, - // chartData2: [] // 유량 데이터 초기화 - // })); - // }); + selectOilq(inftwtAnlsSn, pplMngNo).then((data) => {// 유량 조회 + const rsltData = getChartDataOilq(data ?? []); + setChartData(prev => ({ + ...prev, + chartData2: rsltData // 유량 + })); + }).catch((err) => { + console.error("selectOilq 에러:", err); + setChartData(prev => ({ + ...prev, + chartData2: [] // 유량 데이터 초기화 + })); + }); setPopupOpen(false); };