diff --git a/src/api/modules/device.ts b/src/api/modules/device.ts index b331d6a..b17072a 100644 --- a/src/api/modules/device.ts +++ b/src/api/modules/device.ts @@ -54,6 +54,14 @@ export class DeviceService extends BaseService { return this.getOne(`/api/admin/devices/by-imei/${imei}`) } + /** + * 通过ICCID查询设备详情 + * @param iccid ICCID + */ + static getDeviceByIccid(iccid: string): Promise> { + return this.getOne(`/api/admin/devices/by-iccid/${iccid}`) + } + /** * 删除设备 * @param id 设备ID diff --git a/src/locales/langs/zh.json b/src/locales/langs/zh.json index 3618956..5a319c0 100644 --- a/src/locales/langs/zh.json +++ b/src/locales/langs/zh.json @@ -444,6 +444,7 @@ "deviceSearch": "设备查询", "singleCard": "单卡信息", "standaloneCardList": "IoT卡管理", + "iotCardDetail": "IoT卡详情", "iotCardTask": "IoT卡任务", "deviceTask": "设备任务", "taskDetail": "任务详情", diff --git a/src/router/routes/asyncRoutes.ts b/src/router/routes/asyncRoutes.ts index 4549c54..f1ca4f3 100644 --- a/src/router/routes/asyncRoutes.ts +++ b/src/router/routes/asyncRoutes.ts @@ -977,6 +977,16 @@ export const asyncRoutes: AppRouteRecord[] = [ keepAlive: true } }, + { + path: 'iot-card-management/detail', + name: 'IotCardDetail', + component: RoutesAlias.StandaloneCardList + '/detail', + meta: { + title: 'menus.assetManagement.iotCardDetail', + isHide: true, + keepAlive: false + } + }, { path: 'iot-card-task', name: 'IotCardTask', diff --git a/src/types/components.d.ts b/src/types/components.d.ts index f5fb055..525c39d 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -109,6 +109,7 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElProgress: typeof import('element-plus/es')['ElProgress'] diff --git a/src/views/asset-management/device-detail/index.vue b/src/views/asset-management/device-detail/index.vue index d131380..e9f24a9 100644 --- a/src/views/asset-management/device-detail/index.vue +++ b/src/views/asset-management/device-detail/index.vue @@ -1,94 +1,78 @@ + + diff --git a/src/views/device-management/devices/index.vue b/src/views/device-management/devices/index.vue index 818f3d6..f6f69d4 100644 --- a/src/views/device-management/devices/index.vue +++ b/src/views/device-management/devices/index.vue @@ -62,7 +62,7 @@
-
设备号码:
+
设备号码:
{{ deviceInfo.deviceNumber }}
@@ -153,7 +153,9 @@
ICCID: - {{ deviceInfo.card1.iccid }} + + {{ deviceInfo.card1.iccid }} +
接入号: @@ -265,7 +267,9 @@
ICCID: - {{ deviceInfo.card2.iccid }} + + {{ deviceInfo.card2.iccid }} +
接入号: @@ -755,9 +759,11 @@