diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx index 05dd3447c..499722b85 100644 --- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx +++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx @@ -286,6 +286,7 @@ export default function AgedPipeStatusByCtpvPopupPage() { } + flushOuterMargin /> ); diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts index 253395321..d65a9a18a 100644 --- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts +++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts @@ -65,16 +65,16 @@ export const normalizeAgedPipeStatusByCtpvFilters = ( filters: Partial, ): AgedPipeStatusByCtpvFilters => { const currentYear = new Date().getFullYear(); - let startYear = Math.trunc(Number(filters.startYear ?? currentYear)); - let endYear = Math.trunc(Number(filters.endYear ?? startYear)); + let startYear = Math.trunc(Number(filters.startYear ?? currentYear - 2)); + let endYear = Math.trunc(Number(filters.endYear ?? currentYear)); let elapsedYears = Math.trunc( Number( filters.elapsedYears ?? AGED_PIPE_STATUS_BY_CTPV_DEFAULT_ELAPSED_YEARS, ), ); - if (!Number.isFinite(startYear)) startYear = currentYear; - if (!Number.isFinite(endYear)) endYear = startYear; + if (!Number.isFinite(startYear)) startYear = currentYear - 2; + if (!Number.isFinite(endYear)) endYear = currentYear; if ( !Number.isFinite(elapsedYears) || elapsedYears < 1 || diff --git a/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx index 62821229f..6b272923c 100644 --- a/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx +++ b/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx @@ -390,8 +390,6 @@ export default function FloodDngrMapPopupPage() { onPageChange={(page) => void loadRows(page, appliedFilters)} onRowClick={(row) => void handleRowClick(row)} rowId={(row, index) => `${row.sggCd}-${row.sbmrgFrqExpln}-${index}`} - scrollMode="horizontal" - minTableWidth="120rem" /> ); diff --git a/apps/sn/src/features/windowPopup/model/popupDefinitions.ts b/apps/sn/src/features/windowPopup/model/popupDefinitions.ts index 237206abe..477a46ef1 100644 --- a/apps/sn/src/features/windowPopup/model/popupDefinitions.ts +++ b/apps/sn/src/features/windowPopup/model/popupDefinitions.ts @@ -191,7 +191,7 @@ export const windowPopupDefinitions = { agedPipeStatusByCtpvPopup: { key: "agedPipeStatusByCtpvPopup", title: "시도별 노후관로현황", - width: 1160, + width: 1400, height: 820, }, fldngHstryPopup: { diff --git a/packages/common/business_components/src/ui/standard_data_table/index.tsx b/packages/common/business_components/src/ui/standard_data_table/index.tsx index f044b851c..f5f67714f 100644 --- a/packages/common/business_components/src/ui/standard_data_table/index.tsx +++ b/packages/common/business_components/src/ui/standard_data_table/index.tsx @@ -253,7 +253,7 @@ function StandardDataTable({ return (
-
+

{title}

@@ -66,7 +66,7 @@ function StandardPopupLayout({