From f50aa032b3f4af5dd64ba52458574380f69f744f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Fri, 28 Jun 2024 16:49:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=9C=E7=A8=8B=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/remote/index.ts | 17 + src/api/remote/types.ts | 53 +++ src/api/resources-equipment/index.ts | 12 +- src/api/resources-equipment/types.ts | 17 + src/router/index.ts | 13 + src/views/family/operate/order/index.vue | 3 +- .../components/RemoteOperateInfo.vue | 386 ++++++++++++++++++ .../family/operate/remote-operation/index.vue | 228 +++++++++++ src/views/resources/equipment/index.vue | 4 + 9 files changed, 730 insertions(+), 3 deletions(-) create mode 100644 src/api/remote/index.ts create mode 100644 src/api/remote/types.ts create mode 100644 src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue create mode 100644 src/views/family/operate/remote-operation/index.vue diff --git a/src/api/remote/index.ts b/src/api/remote/index.ts new file mode 100644 index 0000000..b344827 --- /dev/null +++ b/src/api/remote/index.ts @@ -0,0 +1,17 @@ +import request from "@/utils/request"; +import { AxiosPromise } from "axios"; +import { RemoteDevInfoVO, UnBindingForm } from "@/api/remote/types"; + +export function remoteDevInfo(devId: number): AxiosPromise { + return request({ + url: `/api/equipment/v1/remote/${devId}`, + method: "GET", + }); +} +export function remoteUnbindingLogicId(data: UnBindingForm) { + return request({ + url: `/api/equipment/v1/remote/unbinding`, + method: "POST", + data, + }); +} diff --git a/src/api/remote/types.ts b/src/api/remote/types.ts new file mode 100644 index 0000000..e9f866d --- /dev/null +++ b/src/api/remote/types.ts @@ -0,0 +1,53 @@ +export interface RemoteDevInfoVO { + devId?: number; + + devAdNo?: string; + + devSno?: string; + + devPppoe?: string; + + devVendorName?: string; + + devVendorOui?: string; + + devTypeName?: string; + + devHardVer?: string; + + softVer?: string; + + domain?: string; + + devRemark1?: string; + + userSnNo?: string; + + useState?: string; + + devIp?: string; + + devStatus?: string; + + customType?: string; + + conType?: string; + + devOnlineTime?: string; + + devAccessType?: string; + + devTypeNameDetail?: string; + + blacklist?: string; + + devRemark4?: string; +} + +export interface UnBindingForm { + devId?: number; + devAdNo?: string; + devSno?: string; + devVendorOui?: string; + devRemark4?: string; +} diff --git a/src/api/resources-equipment/index.ts b/src/api/resources-equipment/index.ts index d5f95f7..318be6f 100644 --- a/src/api/resources-equipment/index.ts +++ b/src/api/resources-equipment/index.ts @@ -4,7 +4,7 @@ import { EquipmentEditForm, EquipmentResult, EquipmentTableResult, - PrivateProfile, + PrivateProfile, RemoteEquipmentTableResult } from "@/api/resources-equipment/types"; import request from "@/utils/request"; import { DevOuiSnoPageResult, DevOuiSnoSearchForm } from "@/api/order/types"; @@ -86,3 +86,13 @@ export function findDevOuiSnoPage( data, }); } + +export function remoteTablePage( + data: SelectForm +): AxiosPromise { + return request({ + url: `/api/equipment/v1/remote/page`, + method: "POST", + data, + }); +} diff --git a/src/api/resources-equipment/types.ts b/src/api/resources-equipment/types.ts index 64037c8..c0bd301 100644 --- a/src/api/resources-equipment/types.ts +++ b/src/api/resources-equipment/types.ts @@ -95,4 +95,21 @@ export interface PrivateProfile { fileUrl?: string; } +export interface RemoteEquipmentTable { + devId?: number; + devSno?: string; + devAdNo?: string; + devPppoe?: string; + devStatus?: string; + softVer?: string; + devTypeId?: number; + devVendorName?: string; + devVendorOui?: string; + devTypeName?: string; + devHardVer?: string; + devOnline?: string; + devOnlineTime?: string; +} +export type RemoteEquipmentTableResult = PageResult; + diff --git a/src/router/index.ts b/src/router/index.ts index 2d832fa..d9f00cd 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -217,6 +217,19 @@ export const constantRoutes: RouteRecordRaw[] = [ title: "修改工单", }, }, + { + path: "/resources/remote-info/:devId", + name: "RemoteOperateInfo", + component: () => + import( + "@/views/family/operate/remote-operation/components/RemoteOperateInfo.vue" + ), + meta: { + hidden: true, + keepAlive: true, + title: "远程操作详情", + }, + }, ], }, ]; diff --git a/src/views/family/operate/order/index.vue b/src/views/family/operate/order/index.vue index c806b7b..ef88888 100644 --- a/src/views/family/operate/order/index.vue +++ b/src/views/family/operate/order/index.vue @@ -24,8 +24,7 @@ +
+ + + + + {{ remote.devAdNo }} + + + {{ remote.devPppoe }} + + + {{ remote.devVendorOui }}-{{ remote.devSno }} + + + {{ remote.devVendorName }} {{ remote.devTypeName }} {{ + remote.devHardVer + }} {{ remote.softVer }} + + + {{ remote.domain }} + + + {{ remote.blacklist }} + + + {{ remote.devRemark1 }} + + + {{ remote.userSnNo }} + + + {{ remote.useState }} + + + {{ remote.devIp }} + + + {{ remote.devStatus }} + + + {{ remote.customType }} + + + {{ remote.conType }} + + + {{ remote.devOnlineTime }} + + + {{ remote.devAccessType }} + + + {{ remote.devTypeNameDetail }} + + +
+ + 远程操作列表 + + +
+ + + {{ remote.devTypeNameDetail }} + + + +
+ + + + + diff --git a/src/views/family/operate/remote-operation/index.vue b/src/views/family/operate/remote-operation/index.vue new file mode 100644 index 0000000..59b3e7e --- /dev/null +++ b/src/views/family/operate/remote-operation/index.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/src/views/resources/equipment/index.vue b/src/views/resources/equipment/index.vue index 4bca292..5a29f6a 100644 --- a/src/views/resources/equipment/index.vue +++ b/src/views/resources/equipment/index.vue @@ -122,6 +122,7 @@ label="软件版本" align="center" prop="softVer" + show-overflow-tooltip v-if="columns[4].show" />