From c12893d077b08f867a98216107a35a6c86a38333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Mon, 1 Jul 2024 17:02:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/remote/types.ts | 2 + src/api/resources-equipment/types.ts | 1 + src/api/type-ver-ext/index.ts | 8 + src/router/index.ts | 2 +- src/utils/index.ts | 12 + .../components/DeviceAbility.vue | 169 +++++ .../components/DeviceStatus.vue | 43 ++ .../components/OperateTabs.vue | 24 + .../components/RemoteOperateInfo.vue | 664 +++++++++--------- .../family/operate/remote-operation/index.vue | 6 +- 10 files changed, 603 insertions(+), 328 deletions(-) create mode 100644 src/views/family/operate/remote-operation/components/DeviceAbility.vue create mode 100644 src/views/family/operate/remote-operation/components/DeviceStatus.vue create mode 100644 src/views/family/operate/remote-operation/components/OperateTabs.vue diff --git a/src/api/remote/types.ts b/src/api/remote/types.ts index e9f866d..40feb45 100644 --- a/src/api/remote/types.ts +++ b/src/api/remote/types.ts @@ -1,6 +1,8 @@ export interface RemoteDevInfoVO { devId?: number; + typeAndVerId?: number; + devAdNo?: string; devSno?: string; diff --git a/src/api/resources-equipment/types.ts b/src/api/resources-equipment/types.ts index c0bd301..f6305af 100644 --- a/src/api/resources-equipment/types.ts +++ b/src/api/resources-equipment/types.ts @@ -98,6 +98,7 @@ export interface PrivateProfile { export interface RemoteEquipmentTable { devId?: number; devSno?: string; + typeAndVerId?: number; devAdNo?: string; devPppoe?: string; devStatus?: string; diff --git a/src/api/type-ver-ext/index.ts b/src/api/type-ver-ext/index.ts index b7da40d..6cd756e 100644 --- a/src/api/type-ver-ext/index.ts +++ b/src/api/type-ver-ext/index.ts @@ -10,6 +10,14 @@ export function getCapabilityForm( method: "GET", }); } +export function getCapabilityVO( + typeAndVerId: number +): AxiosPromise { + return request({ + url: `/api/type-ver-ext/v1//remote/capability/${typeAndVerId}`, + method: "GET", + }); +} export function editCapabilityForm(data: CapabilityForm) { return request({ url: `/api/type-ver-ext/v1/edit`, diff --git a/src/router/index.ts b/src/router/index.ts index d9f00cd..7800529 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -218,7 +218,7 @@ export const constantRoutes: RouteRecordRaw[] = [ }, }, { - path: "/resources/remote-info/:devId", + path: "/resources/remote-info/:devId/:typeAndVerId", name: "RemoteOperateInfo", component: () => import( diff --git a/src/utils/index.ts b/src/utils/index.ts index f8fd449..0e825c7 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -78,3 +78,15 @@ export function downloadHook(res: AxiosResponse) { // 释放掉blob对象 window.URL.revokeObjectURL(href); } + +export function getLabelByValue(options: OptionType[], value: string): string { + // 遍历选项数组,查找与给定值匹配的项 + for (const option of options) { + if (option.value === value) { + // 如果找到匹配项,返回其标签 + return option.label; + } + } + // 如果没有找到匹配项,返回null + return ""; +} diff --git a/src/views/family/operate/remote-operation/components/DeviceAbility.vue b/src/views/family/operate/remote-operation/components/DeviceAbility.vue new file mode 100644 index 0000000..004d6bb --- /dev/null +++ b/src/views/family/operate/remote-operation/components/DeviceAbility.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/views/family/operate/remote-operation/components/DeviceStatus.vue b/src/views/family/operate/remote-operation/components/DeviceStatus.vue new file mode 100644 index 0000000..566122c --- /dev/null +++ b/src/views/family/operate/remote-operation/components/DeviceStatus.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/views/family/operate/remote-operation/components/OperateTabs.vue b/src/views/family/operate/remote-operation/components/OperateTabs.vue new file mode 100644 index 0000000..6190818 --- /dev/null +++ b/src/views/family/operate/remote-operation/components/OperateTabs.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue b/src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue index dcfee96..cf0f53b 100644 --- a/src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue +++ b/src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue @@ -1,331 +1,344 @@ @@ -220,8 +220,8 @@ const handleQuery = () => { loading.value = false; }); }; -const skipRemoteInfo = (devId: number) => { - router.push({ path: `/resources/remote-info/${devId}` }); +const skipRemoteInfo = (row: RemoteEquipmentTable) => { + router.push({ path: `/resources/remote-info/${row.devId}/${row.typeAndVerId}` }); };