diff --git a/src/api/system/device/types.ts b/src/api/system/device/types.ts
index 73a128df..9a1acca7 100644
--- a/src/api/system/device/types.ts
+++ b/src/api/system/device/types.ts
@@ -34,38 +34,30 @@ export interface DeviceQueryParams extends BaseQueryParams {
createTime?: [string, string];
}
-/** 用户分页对象 */
+/** 设备分页对象 */
export interface DeviceItem {
- /** 用户ID */
+ /** 设备ID */
id: string;
- /** 用户头像地址 */
- avatar?: string;
- /** 创建时间 */
- createTime?: Date;
- /** 部门名称 */
- deptName?: string;
- /** 用户邮箱 */
- email?: string;
- /** 性别 */
- gender?: number;
- /** 手机号 */
- mobile?: string;
- /** 用户昵称 */
- nickname?: string;
- /** 角色名称,多个使用英文逗号(,)分割 */
- roleNames?: string;
- /** 用户状态(1:启用;0:禁用) */
- status?: number;
- /** 用户名 */
- Devicename?: string;
/** 设备序列号 */
serialno?: string;
+ /** 设备型号 */
+ snModel?: string;
+ /** 设备名 */
+ snName?: string;
+ /** 设备绑定手机 */
+ snMobile?: string;
+ /** 推送ID */
+ pushId?: string;
+ /** 设备状态(1:启用;0:禁用) */
+ status?: number;
/** 在线状态(1:在线;0:离线) */
online?: number;
/** 最后心跳时间 */
lastHeartbeatTime?: string;
- /** 推送ID */
- pushId?: string;
+ /** 激活时间 */
+ activateTime?: string;
+ /** 创建时间 */
+ createTime?: Date;
}
/** 设备在线状态视图对象 */
@@ -337,6 +329,7 @@ export interface DeviceOtherInfo {
packageName?: string;
channel?: string;
deviceId?: string;
+ pushId?: string;
gaid?: string;
oaid?: string;
phoneNumber?: string;
diff --git a/src/components/DeviceSn/DeviceSnDetail.vue b/src/components/DeviceSn/DeviceSnDetail.vue
index 77407104..cd0e4692 100644
--- a/src/components/DeviceSn/DeviceSnDetail.vue
+++ b/src/components/DeviceSn/DeviceSnDetail.vue
@@ -494,6 +494,9 @@
{{ formatText(otherInfo.deviceId) }}
+
+ {{ formatText(otherInfo.pushId) }}
+
{{ formatText(otherInfo.gaid) }}
diff --git a/src/views/devices/sn/config/content.ts b/src/views/devices/sn/config/content.ts
index 5956cd20..def0a7c5 100644
--- a/src/views/devices/sn/config/content.ts
+++ b/src/views/devices/sn/config/content.ts
@@ -68,9 +68,9 @@ const contentConfig: IContentConfig = {
slotName: "onlineStatus",
width: 100,
},
- { label: "设备型号", align: "center", prop: "snModel", width: 200 },
{ label: "设备昵称", align: "center", prop: "snName", width: 200 },
- { label: "推送ID", align: "center", prop: "pushId", width: 200, showOverflowTooltip: true },
+ { label: "设备型号", align: "center", prop: "snModel", width: 200 },
+ { label: "推送ID", align: "center", prop: "pushId", width: 200 },
// { label: "设备 IMEI", align: "center", prop: "snImei", width: 200 },
// { label: "设备版本号", align: "center", prop: "snDispalyId", width: 400 },
// { label: "头像", align: "center", prop: "avatar", templet: "image" },