diff --git a/apps/dm/app/(with-layout)/status/greywater/page.tsx b/apps/dm/app/(with-layout)/status/greywater/page.tsx
index c8b8b9568..7d9260d0a 100644
--- a/apps/dm/app/(with-layout)/status/greywater/page.tsx
+++ b/apps/dm/app/(with-layout)/status/greywater/page.tsx
@@ -1,16 +1,7 @@
"use client";
import SubPageHeader from "@/components/SubPageHeader";
-<<<<<<< Updated upstream
-import BusinessSubNav from "@/components/BusinessSubNav";
-
-import greywaterOverall from "@/public/images/landing/cases/greywater_overall.png";
-import greywaterFactory from "@/public/images/landing/cases/greywater_factory.png";
-import greywaterBuilding from "@/public/images/landing/cases/greywater_building.png";
-import greywaterUsage from "@/public/images/landing/cases/greywater_usage.png";
-=======
import React from "react";
->>>>>>> Stashed changes
// 공통 섹션 타이틀 컴포넌트
function SectionTitle({ children }: { children: React.ReactNode }) {
@@ -22,58 +13,11 @@ function SectionTitle({ children }: { children: React.ReactNode }) {
);
}
-<<<<<<< Updated upstream
-=======
// 구분선
->>>>>>> Stashed changes
function Hr({ className = "" }: { className?: string }) {
return
;
}
-<<<<<<< Updated upstream
-function ImgCard({ src, alt }: { src: StaticImageData; alt: string }) {
- return (
-
-
-
- );
-}
-
-function SectionShell({
- id,
- title,
- children,
- className = "",
-}: {
- id: string;
- title: string;
- children: React.ReactNode;
- className?: string;
-}) {
- return (
-
- );
-}
-
-export default function GreywaterStatusPage() {
- return (
-
-
-
-
>>>>>> Stashed changes
{ label: "중수도(현황)" },
]}
hideFooterLine
@@ -115,15 +58,6 @@ export default function GreywaterPage() {
-<<<<<<< Updated upstream
-
-
-
-=======
{/* 1) 전체 중수도 설치 및 이용 현황 (공장 및 발전시설 제외) */}
전체 중수도 설치 및 이용 현황 (공장 및 발전시설 제외)
@@ -214,18 +148,9 @@ export default function GreywaterPage() {
->>>>>>> Stashed changes
-<<<<<<< Updated upstream
-
-
-
-=======
{/* 2) 공장 및 발전시설 내 중수도 설치 및 이용 현황 */}
공장 및 발전시설 내 중수도 설치 및 이용 현황
@@ -312,18 +237,9 @@ export default function GreywaterPage() {
->>>>>>> Stashed changes
-<<<<<<< Updated upstream
-
-
-
-=======
{/* 3) 중수도 건축물별 이용량 현황 */}
중수도 건축물별 이용량 현황
@@ -382,20 +298,9 @@ export default function GreywaterPage() {
->>>>>>> Stashed changes
-<<<<<<< Updated upstream
-
-
-
-
-=======
{/* 4) 중수도 용도별 이용량 현황 */}
중수도 용도별 이용량 현황
@@ -451,8 +356,8 @@ export default function GreywaterPage() {
-
->>>>>>> Stashed changes
+
+
);
}
\ No newline at end of file
diff --git a/apps/dm/app/(with-layout)/status/rain/page.tsx b/apps/dm/app/(with-layout)/status/rain/page.tsx
index 899a4b1bb..cee592068 100644
--- a/apps/dm/app/(with-layout)/status/rain/page.tsx
+++ b/apps/dm/app/(with-layout)/status/rain/page.tsx
@@ -1,14 +1,6 @@
"use client";
import SubPageHeader from "@/components/SubPageHeader";
-<<<<<<< Updated upstream
-import BusinessSubNav from "@/components/BusinessSubNav";
-
-import rainwaterBuilding from "@/public/images/landing/cases/rainwater_building.png";
-import rainwaterUsage from "@/public/images/landing/cases/rainwater_usage.png";
-import rainwaterUsageAmount from "@/public/images/landing/cases/rainwater_usage_amount.png";
-=======
->>>>>>> Stashed changes
// 공통 섹션 타이틀 컴포넌트
function SectionTitle({ children }: { children: React.ReactNode }) {
@@ -20,58 +12,11 @@ function SectionTitle({ children }: { children: React.ReactNode }) {
);
}
-<<<<<<< Updated upstream
-=======
// 구분선
->>>>>>> Stashed changes
function Hr({ className = "" }: { className?: string }) {
return ;
}
-<<<<<<< Updated upstream
-function ImgCard({ src, alt }: { src: StaticImageData; alt: string }) {
- return (
-
-
-
- );
-}
-
-function SectionShell({
- id,
- title,
- children,
- className = "",
-}: {
- id: string;
- title: string;
- children: React.ReactNode;
- className?: string;
-}) {
- return (
-
- );
-}
-
-export default function RainStatusPage() {
- return (
-
-
-
-
>>>>>> Stashed changes
{ label: "빗물이용시설(현황)" },
]}
hideFooterLine
@@ -112,18 +56,6 @@ export default function RainwaterStatusPage() {
-<<<<<<< Updated upstream
-
-
-
-=======
{/* 1) 빗물이용시설의 건축물별 빗물이용량 현황 */}
빗물이용시설의 건축물별 빗물이용량 현황
@@ -171,21 +103,9 @@ export default function RainwaterStatusPage() {
->>>>>>> Stashed changes
-<<<<<<< Updated upstream
-
-
-
-=======
{/* 2) 빗물이용시설의 용도별 분포 (2023년 기준) */}
빗물이용시설의 용도별 분포 (2023년 기준)
@@ -242,23 +162,9 @@ export default function RainwaterStatusPage() {
->>>>>>> Stashed changes
-<<<<<<< Updated upstream
-
-
-
-
-=======
{/* 3) 빗물이용시설의 용도별 빗물이용량 현황 */}
빗물이용시설의 용도별 빗물이용량 현황
@@ -306,7 +212,7 @@ export default function RainwaterStatusPage() {
->>>>>>> Stashed changes
+
);
}
\ No newline at end of file
diff --git a/apps/dm/app/(with-layout)/status/sewage/page.tsx b/apps/dm/app/(with-layout)/status/sewage/page.tsx
index 9e76eef6e..fdb1fe8f9 100644
--- a/apps/dm/app/(with-layout)/status/sewage/page.tsx
+++ b/apps/dm/app/(with-layout)/status/sewage/page.tsx
@@ -2,15 +2,6 @@
import React from "react";
import SubPageHeader from "@/components/SubPageHeader";
-<<<<<<< Updated upstream
-import BusinessSubNav from "@/components/BusinessSubNav";
-
-import treatedWaterYear from "@/public/images/landing/cases/treated_water_year.png";
-import treatedWaterUsage from "@/public/images/landing/cases/treated_water_usage.png";
-import treatedWaterFacility from "@/public/images/landing/cases/treated_water_facility.png";
-import treatedWaterRegion from "@/public/images/landing/cases/treated_water_region.png";
-=======
->>>>>>> Stashed changes
// 공통 섹션 타이틀 컴포넌트
function SectionTitle({ children }: { children: React.ReactNode }) {
@@ -22,40 +13,11 @@ function SectionTitle({ children }: { children: React.ReactNode }) {
);
}
-<<<<<<< Updated upstream
-=======
// 구분선
->>>>>>> Stashed changes
function Hr({ className = "" }: { className?: string }) {
return ;
}
-<<<<<<< Updated upstream
-function ImgCard({ src, alt }: { src: StaticImageData; alt: string }) {
- return (
-
-
-
- );
-}
-
-function SectionShell({
- id,
- title,
- children,
- className = "",
-}: {
- id: string;
- title: string;
- children: React.ReactNode;
- className?: string;
-}) {
-=======
// 출처 텍스트
function SourceText() {
return (
@@ -78,20 +40,19 @@ const tableStyles = {
headerBg: "bg-[#E3E7EA]",
};
-export default function TreatedWaterPage() {
->>>>>>> Stashed changes
- return (
-
- );
-}
+// export default function TreatedWaterPage() {
+// return (
+//
+// {title}
+// {children}
+//
+// );
+// }
export default function TreatedStatusPage() {
return (
-
+ {/*
*/}
-<<<<<<< Updated upstream
-
-
-
-=======
{/* 1) 연도별 하수처리수 재이용 현황 */}
연도별 하수처리수 재이용 현황
@@ -209,21 +158,9 @@ export default function TreatedStatusPage() {
->>>>>>> Stashed changes
-<<<<<<< Updated upstream
-
-
-
-=======
{/* 2) 용도별 하수처리수 재이용 현황 */}
용도별 하수처리수 재이용 현황
@@ -301,21 +238,9 @@ export default function TreatedStatusPage() {
->>>>>>> Stashed changes
-<<<<<<< Updated upstream
-
-
-
-=======
{/* 3) 하수처리시설 설치 및 이용 현황 */}
하수처리시설 설치 및 이용 현황
@@ -402,23 +327,9 @@ export default function TreatedStatusPage() {
->>>>>>> Stashed changes
-<<<<<<< Updated upstream
-
-
-
-
-=======
{/* 4) 시도별 하수처리수 재이용 현황 */}
시도별 하수처리수 재이용 현황
@@ -500,7 +411,8 @@ export default function TreatedStatusPage() {
->>>>>>> Stashed changes
+
+
);
}
\ No newline at end of file