diff --git a/src/pages/meters/MeterPage.tsx b/src/pages/meters/MeterPage.tsx index 0ba31ed..93460a4 100644 --- a/src/pages/meters/MeterPage.tsx +++ b/src/pages/meters/MeterPage.tsx @@ -533,7 +533,7 @@ export default function MeterManagement({ {/* SEARCH */} setSearch(e.target.value)} disabled={!selectedProject} @@ -550,21 +550,6 @@ export default function MeterManagement({ field: "areaName", render: (rowData) => rowData.areaName || "-", }, - { - title: "Account Number", - field: "accountNumber", - render: (rowData) => rowData.accountNumber || "-", - }, - { - title: "User Name", - field: "userName", - render: (rowData) => rowData.userName || "-", - }, - { - title: "User Address", - field: "userAddress", - render: (rowData) => rowData.userAddress || "-", - }, { title: "Meter S/N", field: "meterSerialNumber", @@ -590,6 +575,21 @@ export default function MeterManagement({ field: "deviceName", render: (rowData) => rowData.deviceName || "-", }, + { + title: "Device Type", + field: "deviceType", + render: (rowData) => rowData.deviceType || "-", + }, + { + title: "Meter Status", + field: "meterStatus", + render: (rowData) => rowData.meterStatus || "-", + }, + { + title: "Installed Time", + field: "installedTime", + render: (rowData) => rowData.installedTime || "-", + }, ]} data={searchFiltered} onRowClick={(_, rowData) => setActiveMeter(rowData as Meter)}