diff --git a/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php b/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php index 9ca5bc67..5a03f582 100644 --- a/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php +++ b/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php @@ -22,7 +22,7 @@ class GetCompanyDetailForUpdateController extends BaseController { return DeviceModel::alias('d') ->field([ - 'd.id', 'd.memo', + 'd.id', 'd.memo', 'd.model', 'd.brand', 'd.phone', 'd.imei', 'd.createTime', 'd.alive', ]) ->where('companyId', $companyId) ->select() diff --git a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx index 9c7f266e..c2791cf2 100644 --- a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx +++ b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx @@ -23,6 +23,12 @@ declare module 'react' { interface Device { id: number memo: string + imei: string + phone: string + model: string + brand: string + alive: number + createTime: number } interface Project { @@ -264,14 +270,40 @@ export default function EditProjectPage({ params }: { params: { id: string } })
- {project && project.devices && project.devices.length > 0 && project.devices.map((device) => ( -
- + {project && project.devices && project.devices.length > 0 && ( +
+ + + + + + + + + + + + + + {project.devices.map((device) => ( + + + + + + + + + + ))} + +
设备名称IMEI手机号型号品牌状态添加时间
{device.memo}{device.imei || '-'}{device.phone || '-'}{device.model || '-'}{device.brand || '-'} + + {device.alive === 1 ? '在线' : '离线'} + + {device.createTime || '-'}
- ))} + )}