diff --git a/apps/dm/app/(with-layout)/status/_components/GreywaterStatusSection.tsx b/apps/dm/app/(with-layout)/status/_components/GreywaterStatusSection.tsx index 3dcc0c390..f16a8b38d 100644 --- a/apps/dm/app/(with-layout)/status/_components/GreywaterStatusSection.tsx +++ b/apps/dm/app/(with-layout)/status/_components/GreywaterStatusSection.tsx @@ -50,26 +50,26 @@ export default function GreywaterStatusSection() { const rswtrYears = useDmStore((state) => state.rswtr.rswtrYears); const selectYear = rswtrYears.slice(-1)[0]; const rswtrByLawYearsHeader = useDmStore((state) => state.rswtr.rswtrByLawYearsHeader); - const rswtrByLawYears = useDmStore((state) => state.rswtr.rswtrByLawYears); - const rswtrByLawYearsFactory = useDmStore((state) => state.rswtr.rswtrByLawYearsFactory); + const rswtrByLawYears = useDmStore((state) => state.rswtr.rswtrByLawYears); // 전체 중수도 설치 및 이용 현황 (공장 및 발전시설 제외) + const rswtrByLawYearsFactory = useDmStore((state) => state.rswtr.rswtrByLawYearsFactory); // 공장 및 발전시설 내 중수도 설치 현황 const rswtrByBildTpYearsHeader = useDmStore((state) => state.rswtr.rswtrByBildTpYearsHeader); const rswtrByBildTpYears = useDmStore((state) => state.rswtr.rswtrByBildTpYears); const rswtrByUsgYearsHeader = useDmStore((state) => state.rswtr.rswtrByUsgYearsHeader); - const rswtrByUsgYears = useDmStore((state) => state.rswtr.rswtrByUsgYears); + const rswtrByUsgYears = useDmStore((state) => state.rswtr.rswtrByUsgYears); // 출처 텍스트 function SourceText() { return (
- 자료: 환경부(2024), 「{selectYear} 하수도 통계」 + 자료: 하수도정보시스템 {selectYear} 하수도 통계
); } useEffect(() => { - void getRswtrByLawYears('nofactory'); - void getRswtrByLawYears('factory'); + void getRswtrByLawYears('nofactory'); // rswtrByLawYears: 전체 중수도 설치 및 이용 현황 (공장 및 발전시설 제외) + void getRswtrByLawYears('factory'); // rswtrByLawYearsFactory: 공장 및 발전시설 내 중수도 설치 현황 void getRswtrByBildTpYears(); void getRswtrByUsgYears(); }, [getRswtrByLawYears, getRswtrByBildTpYears, getRswtrByUsgYears]); @@ -163,7 +163,7 @@ export default function GreywaterStatusSection() { key={`${rowKey}-${header.id}`} className={`${tableStyles.td} ${index === 0 ? "!font-bold !text-neutral-900" : ""} ${[1, 3, 5].includes(index) ? "bg-[#EAF5F5]" : ""}`} > - {index === 0 ? value : formatUsage(value as string | number, 1000, 1)} + {index === 0 ? value : formatUsage(value as string | number, 10000, 1)} ); }); @@ -307,7 +307,7 @@ export default function GreywaterStatusSection() { colSpan={6} className={`${tableStyles.th} ${tableStyles.headerBg} py-2`} > - 이용량 (천m³/년) + 이용량 (만m³/년)- 자료: 환경부(2024), 「{selectYear} 하수도 통계」 + 자료: 하수도정보시스템 {selectYear} 하수도 통계
); } diff --git a/apps/dm/app/store/dm-status/index.tsx b/apps/dm/app/store/dm-status/index.tsx index 7de2f2c78..0eecdf7da 100644 --- a/apps/dm/app/store/dm-status/index.tsx +++ b/apps/dm/app/store/dm-status/index.tsx @@ -1,7 +1,7 @@ import { fetchType, getFetch } from "@/components/ui/api"; import type { TableHeaderType, DmStatusBildTpYearsType, DmStatusUsgBildTpType, DmStatusUsgYearsType, - DmStatusLawYearsType, DmStatusSidoYearsType, + DmStatusLawYearsType, } from "./type"; import { rainyByBildTpYearsHeader, rainyByUsgBildTpHeader, rainyByUsgYearsHeader } from "./type"; import { rswtrByLawYearsHeader, rswtrByBildTpYearsHeader, rswtrByUsgYearsHeader } from "./type"; @@ -69,8 +69,8 @@ export const dmStatusState: DmStatusType = { rswtrByLawYearsHeader: rswtrByLawYearsHeader, rswtrByBildTpYearsHeader: rswtrByBildTpYearsHeader, rswtrByUsgYearsHeader: rswtrByUsgYearsHeader, - rswtrByLawYearsFactory: [], - rswtrByLawYears: [], + rswtrByLawYearsFactory: [], // 공장 및 발전시설 내 중수도 설치 현황 + rswtrByLawYears: [], // 전체 중수도 설치 및 이용 현황 (공장 및 발전시설 제외) rswtrByBildTpYears: [], rswtrByUsgYears: [], },