Merge commit '6844db4c295b7ceab1ffe49255630ad90082edb7'

This commit is contained in:
leedj312
2025-09-17 18:03:33 +09:00
3 changed files with 10 additions and 9 deletions
@@ -58,6 +58,7 @@ export default function MyForm() {
dataList={demandCompList}
rtnValue={callback}
rtnInputData={handleInsertSdmData}
openNetwork={true}
/>
<Toaster position="top-center" />
</div>
@@ -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() {
<div className="bg-white rounded-xl shadow border border-[#DBE2E6] overflow-hidden max-h-[900px]">
{/* 타이틀 영역 */}
<div className="border-b border-[#DBE2E6] px-4 py-3">
<h3 className="text-[12px] font-semibold">재이용시설현황(2023)</h3>
<h3 className="text-[12px] font-semibold">{`재이용시설현황(${defaultYear})`}</h3>
<p className="text-[12px] text-[#999] font-medium">행정구역별 재이용시설현황(개소)</p>
</div>
@@ -306,7 +306,7 @@ export default function WrStatusPage() {
{/* 타이틀 + 버튼 영역 */}
<div className="flex justify-between items-center border-b border-[#436d85] px-4 py-3">
<div>
<h3 className="text-[12px] font-semibold">재이용시설현황(2023)</h3>
<h3 className="text-[12px] font-semibold">{`재이용시설현황(${defaultYear})`}</h3>
<p className="text-[12px] text-[#999] font-medium">행정구역별 재이용시설현황[개소(천m³/년)]</p>
</div>
</div>
@@ -350,7 +350,7 @@ export default function WrStatusPage() {
{/* 재이용통계 차트 */}
<div className="bg-white rounded-xl shadow border border-[#DBE2E6] overflow-hidden">
<div className="border-b border-[#DBE2E6] px-4 py-3">
<h3 className="text-[12px] font-semibold">재이용통계(2023)</h3>
<h3 className="text-[12px] font-semibold">{`재이용통계(${defaultYear})`}</h3>
<p className="text-[12px] text-[#999] font-medium">행정구역별 재이용시설 현황 개소수 그래프</p>
</div>
<div className="p-4 bg-[#f9fbfd]">
+4 -4
View File
@@ -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(',','') ??'',
}));
}