diff --git a/apps/cm/src/pages/dashboard/ui/basIn-select.tsx b/apps/cm/src/pages/dashboard/ui/basIn-select.tsx index ca077da20..78ab08637 100644 --- a/apps/cm/src/pages/dashboard/ui/basIn-select.tsx +++ b/apps/cm/src/pages/dashboard/ui/basIn-select.tsx @@ -1,6 +1,6 @@ "use client"; -import React, { useState } from "react"; +import React from "react"; import { Select, SelectContent, diff --git a/apps/cm/src/pages/dashboard/ui/fo-fclt-cnt-rt.tsx b/apps/cm/src/pages/dashboard/ui/fo-fclt-cnt-rt.tsx index 05f39cca1..f9534f1aa 100644 --- a/apps/cm/src/pages/dashboard/ui/fo-fclt-cnt-rt.tsx +++ b/apps/cm/src/pages/dashboard/ui/fo-fclt-cnt-rt.tsx @@ -31,9 +31,9 @@ const FoFcltCntRt: React.FC = () => { if (!operFcltStatus) { return { facilityCount: 0, operatingRate: 0, chartData: [0, 100] }; } - - const basinData = operFcltStatus.filter(d => d.rvbsn === selectedBasin); - const operatingData = basinData.find(d => d.gubun === 'R'); + console.log(operFcltStatus); + const basinData = operFcltStatus.filter(d => d.rvbsn === selectedBasin); // 선택된 유역의 데이터만 filter + const operatingData = basinData.find(d => d.gubun === 'R'); // 선택 유역의 R 데이터만 const nonOperatingData = basinData.find(d => d.gubun === 'A'); const facilityCount = operatingData?.cnt ?? 0; @@ -42,11 +42,12 @@ const FoFcltCntRt: React.FC = () => { const totalCapacity = operatingCapacity + nonOperatingCapacity; const operatingRate = totalCapacity > 0 ? Math.round((operatingCapacity / totalCapacity) * 100) : 0; + const nonOperatingRate = totalCapacity > 0 ? Math.round((nonOperatingCapacity / totalCapacity) * 100) : 0; return { facilityCount, operatingRate, - chartData: [operatingCapacity, nonOperatingCapacity], + chartData: [operatingRate, nonOperatingRate], }; }, [operFcltStatus, selectedBasin]); diff --git a/apps/cm/src/pages/dashboard/ui/fo-wqlt-Infl-effl.tsx b/apps/cm/src/pages/dashboard/ui/fo-wqlt-Infl-effl.tsx index 3320a1a87..7ea5c3c15 100644 --- a/apps/cm/src/pages/dashboard/ui/fo-wqlt-Infl-effl.tsx +++ b/apps/cm/src/pages/dashboard/ui/fo-wqlt-Infl-effl.tsx @@ -39,6 +39,7 @@ interface ChartData { } const FoWqltInflEffl: React.FC = () => { + const [selectedBasin, setSelectedBasin] = useState("한강"); const [selectedTab, setSelectedTab] = useState('BOD'); // 데이터 (실제로는 API에서 가져올 데이터) @@ -53,7 +54,8 @@ const FoWqltInflEffl: React.FC = () => { const tabs: WaterQualityType[] = ['BOD', 'TOC', 'SS', 'TP', 'TN']; // 차트 공통 옵션 - const getChartOptions = (yAxisLabel: string): ChartOptions<'line'> => ({ + // const getChartOptions = (yAxisLabel: string): ChartOptions<'line'> => ({ + const getChartOptions = (): ChartOptions<'line'> => ({ responsive: true, maintainAspectRatio: false, interaction: { @@ -180,7 +182,7 @@ const FoWqltInflEffl: React.FC = () => {

수계별 유입ㆍ방류수질 분석

- +
@@ -210,12 +212,13 @@ const FoWqltInflEffl: React.FC = () => {
{/* 유입 차트 */}
- + {/* */} +
{/* 발류 차트 */}
- +
diff --git a/apps/cm/src/pages/dashboard/ui/sn-old-ppl.tsx b/apps/cm/src/pages/dashboard/ui/sn-old-ppl.tsx index 5bb36ffe6..622445baf 100644 --- a/apps/cm/src/pages/dashboard/ui/sn-old-ppl.tsx +++ b/apps/cm/src/pages/dashboard/ui/sn-old-ppl.tsx @@ -59,7 +59,7 @@ export default function SnOldPpl() { const createDataset = (label: string, data: PplLengthContent[], color: string) => { const dataMap = new Map(data.map(item => [item.zoneNm, item.sumPrlgVl])); - console.log(dataMap); + // console.log(dataMap); return { label, data: allZones.map(zone => dataMap.get(zone) ?? 0),