diff --git a/apps/dm/app/(base-layout)/pages/sdmMng/sdmInsert/page.tsx b/apps/dm/app/(base-layout)/pages/sdmMng/sdmInsert/page.tsx index 9a68510e3..79eb07830 100644 --- a/apps/dm/app/(base-layout)/pages/sdmMng/sdmInsert/page.tsx +++ b/apps/dm/app/(base-layout)/pages/sdmMng/sdmInsert/page.tsx @@ -58,6 +58,7 @@ export default function MyForm() { dataList={demandCompList} rtnValue={callback} rtnInputData={handleInsertSdmData} + openNetwork={true} /> diff --git a/apps/dm/app/(base-layout)/pages/wrStatus/page.tsx b/apps/dm/app/(base-layout)/pages/wrStatus/page.tsx index 263d9e42e..5552c2f53 100644 --- a/apps/dm/app/(base-layout)/pages/wrStatus/page.tsx +++ b/apps/dm/app/(base-layout)/pages/wrStatus/page.tsx @@ -36,7 +36,7 @@ export default function WrStatusPage() { { label: '온배수', color: '#FED16A', key: 'thermal' }, ]; const facilityTotalsColor = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#FED16A']; - + const defaultYear= '2023' const handleMarkerClick = (regionId: string) => { @@ -142,7 +142,7 @@ export default function WrStatusPage() { useEffect(() => { - getDmStatusData('2023'); + getDmStatusData(defaultYear); },[]) @@ -245,7 +245,7 @@ export default function WrStatusPage() {
{/* 타이틀 영역 */}
-

재이용시설현황(2023)

+

{`재이용시설현황(${defaultYear})`}

행정구역별 재이용시설현황(개소)

@@ -306,7 +306,7 @@ export default function WrStatusPage() { {/* 타이틀 + 버튼 영역 */}
-

재이용시설현황(2023)

+

{`재이용시설현황(${defaultYear})`}

행정구역별 재이용시설현황[개소(천m³/년)]

@@ -350,7 +350,7 @@ export default function WrStatusPage() { {/* 재이용통계 차트 */}
-

재이용통계(2023)

+

{`재이용통계(${defaultYear})`}

행정구역별 재이용시설 현황 개소수 그래프

diff --git a/apps/dm/app/common/comFunction.ts b/apps/dm/app/common/comFunction.ts index 6d7274b95..02db72e8d 100644 --- a/apps/dm/app/common/comFunction.ts +++ b/apps/dm/app/common/comFunction.ts @@ -66,9 +66,9 @@ const makeRegion = (region: string) => { export const changeStatusMapData= (data: DmStatusDataType[]) : DmStatusChartType[]=> { return data.map((item) => ({ label: makeRegion(item.region??''), - 하수: item.sewage.split('(')[0]??'', - 빗물: item.rainwater.split('(')[0]??'', - 중수도: item.reclaimed.split('(')[0] ??'', - 온배수: item.thermal.split('(')[0] ??'', + 하수: item.sewage.split('(')[0]?.replaceAll(',','') ??'', + 빗물: item.rainwater.split('(')[0]?.replaceAll(',','')??'', + 중수도: item.reclaimed.split('(')[0]?.replaceAll(',','') ??'', + 온배수: item.thermal.split('(')[0]?.replaceAll(',','') ??'', })); } \ No newline at end of file