From 5500611fbae4ef4ff7930fd47a795410f1c5c813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Sat, 13 Jul 2024 19:11:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=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/operate-result-args/index.ts | 19 ++ src/api/operate-result-args/types.ts | 18 ++ src/api/remote/index.ts | 27 +++ src/api/remote/types.ts | 1 + src/api/service/index.ts | 8 +- src/api/service/types.ts | 15 ++ .../components/OrderServiceParameterTable.vue | 8 +- .../components/DeviceLinkInfo.vue | 152 +++++++++--- .../components/DeviceOperateLog.vue | 7 +- .../components/DeviceService.vue | 82 +++++++ .../components/DeviceStatus.vue | 5 +- .../components/OperateTabs.vue | 23 +- .../components/RemoteOperateInfo.vue | 219 ++++-------------- .../components/RemoteOperateList.vue | 109 +++++++++ .../components/ServiceParameter.vue | 108 +++++++++ 15 files changed, 589 insertions(+), 212 deletions(-) create mode 100644 src/api/operate-result-args/index.ts create mode 100644 src/api/operate-result-args/types.ts create mode 100644 src/views/family/operate/remote-operation/components/DeviceService.vue create mode 100644 src/views/family/operate/remote-operation/components/RemoteOperateList.vue create mode 100644 src/views/family/operate/remote-operation/components/ServiceParameter.vue diff --git a/src/api/operate-result-args/index.ts b/src/api/operate-result-args/index.ts new file mode 100644 index 0000000..2e49037 --- /dev/null +++ b/src/api/operate-result-args/index.ts @@ -0,0 +1,19 @@ +import { AxiosPromise } from "axios"; +import { FTTRInfoVO, ServiceCompareVO } from "@/api/operate-result-args/types"; +import request from "@/utils/request"; + +export function getServiceCompareData( + devId?: number, + serviceName?: string +): AxiosPromise { + return request({ + url: `/api/operate-result-args/v1/device-service-parameter/${devId}/${serviceName}`, + method: "GET", + }); +} +export function fttrPrimaryGateway(devId?: number): AxiosPromise { + return request({ + url: `/api/operate-result-args/v1/fttr-primary-gateway/${devId}`, + method: "GET", + }); +} diff --git a/src/api/operate-result-args/types.ts b/src/api/operate-result-args/types.ts new file mode 100644 index 0000000..434de26 --- /dev/null +++ b/src/api/operate-result-args/types.ts @@ -0,0 +1,18 @@ +import { ParamInfo } from "@/api/operate-log/types"; + +export interface ServiceParamInfo { + parameterName?: string; + actualValue?: string; + remarks?: string; + expectationValue?: string; +} +export interface ServiceCompareVO { + title?: string; + list?: ServiceParamInfo[]; +} + +export interface FTTRInfoVO { + title?: string; + + list?: ParamInfo[]; +} diff --git a/src/api/remote/index.ts b/src/api/remote/index.ts index f590589..eddde80 100644 --- a/src/api/remote/index.ts +++ b/src/api/remote/index.ts @@ -6,6 +6,7 @@ import { UnBindingForm, } from "@/api/remote/types"; import { DeviceLinkVO } from "@/api/operate-log/types"; +import { FTTRInfoVO, ServiceCompareVO } from "@/api/operate-result-args/types"; export function remoteDevInfo(devId: number): AxiosPromise { return request({ @@ -49,3 +50,29 @@ export function remoteDeviceLinkInfo( method: "GET", }); } + +export function serviceCompareParameter( + devId?: number, + serviceId?: number, + serviceVerName?: string, + serviceName?: string +): AxiosPromise { + return request({ + url: `/api/equipment/v1/remote/compare-parameter/${devId}/${serviceId}/${serviceVerName}/${serviceName}`, + method: "GET", + }); +} +export function remoteFTTRPrimaryGateway( + devId: number +): AxiosPromise { + return request({ + url: `/api/equipment/v1/remote/fttp-primary-gateway/${devId}`, + method: "GET", + }); +} +export function remoteFTTRSubGateway(devId: number) { + return request({ + url: `/api/equipment/v1/remote/fttp-sub-gateway/${devId}`, + method: "GET", + }); +} diff --git a/src/api/remote/types.ts b/src/api/remote/types.ts index b173c4c..71eef17 100644 --- a/src/api/remote/types.ts +++ b/src/api/remote/types.ts @@ -61,6 +61,7 @@ export interface DeviceInfo { devOnline?: string; devOnlineTime?: string; devCreateTime?: string; + devTypeNameDetail?: string; } export interface RemoteOperateResult { resultState?: string; diff --git a/src/api/service/index.ts b/src/api/service/index.ts index c3a7ed6..717e1ff 100644 --- a/src/api/service/index.ts +++ b/src/api/service/index.ts @@ -3,10 +3,10 @@ import { BusinessFile, BusinessForm, BusinessPageResult, + DeviceBusinessVO, ServicePageResult, } from "@/api/service/types"; import request from "@/utils/request"; -import { Tr069DevTypeQuery, Tr069DevTypeVOPageResult } from "@/api/tr069/types"; export function tr069ServiceList( data: PageQuery, @@ -115,3 +115,9 @@ export function deleteFileAPI(fileId?: number, servId?: number) { method: "DELETE", }); } +export function deviceTabs(devId?: number): AxiosPromise { + return request({ + url: `/api/service/v1/tabs/${devId}`, + method: "GET", + }); +} diff --git a/src/api/service/types.ts b/src/api/service/types.ts index de16bbe..96e094d 100644 --- a/src/api/service/types.ts +++ b/src/api/service/types.ts @@ -42,3 +42,18 @@ export interface Tr069Option { key?: number; label?: string; } +export interface DeviceBusinessVO { + servId?: number; + + servName?: string; + + servVerName?: string; + + servDisplayName?: string; + + servDesc?: string; + + servMapStatus?: string; + + servStatusTime?: string; +} diff --git a/src/views/family/operate/order/components/OrderServiceParameterTable.vue b/src/views/family/operate/order/components/OrderServiceParameterTable.vue index 2090466..54cb2f8 100644 --- a/src/views/family/operate/order/components/OrderServiceParameterTable.vue +++ b/src/views/family/operate/order/components/OrderServiceParameterTable.vue @@ -7,7 +7,7 @@ width="900" >
- + { }; - + diff --git a/src/views/family/operate/remote-operation/components/DeviceLinkInfo.vue b/src/views/family/operate/remote-operation/components/DeviceLinkInfo.vue index 8a8384b..eafc50e 100644 --- a/src/views/family/operate/remote-operation/components/DeviceLinkInfo.vue +++ b/src/views/family/operate/remote-operation/components/DeviceLinkInfo.vue @@ -3,56 +3,122 @@ - - - - - - - - +
+ + + + + + + + + + + + + + + + + +
diff --git a/src/views/family/operate/remote-operation/components/DeviceOperateLog.vue b/src/views/family/operate/remote-operation/components/DeviceOperateLog.vue index 639836b..7f78b80 100644 --- a/src/views/family/operate/remote-operation/components/DeviceOperateLog.vue +++ b/src/views/family/operate/remote-operation/components/DeviceOperateLog.vue @@ -35,24 +35,25 @@
diff --git a/src/views/family/operate/remote-operation/components/DeviceService.vue b/src/views/family/operate/remote-operation/components/DeviceService.vue new file mode 100644 index 0000000..a594760 --- /dev/null +++ b/src/views/family/operate/remote-operation/components/DeviceService.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/views/family/operate/remote-operation/components/DeviceStatus.vue b/src/views/family/operate/remote-operation/components/DeviceStatus.vue index ecb546f..85666f8 100644 --- a/src/views/family/operate/remote-operation/components/DeviceStatus.vue +++ b/src/views/family/operate/remote-operation/components/DeviceStatus.vue @@ -40,7 +40,10 @@ - + diff --git a/src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue b/src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue index 25f6974..df8ce38 100644 --- a/src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue +++ b/src/views/family/operate/remote-operation/components/RemoteOperateInfo.vue @@ -187,183 +187,52 @@ > {{ remote.devTypeNameDetail }} - -
- - 远程操作列表 - - -
- + + -
- - 其他操作列表 - - +
+ + + 设备工单 + + + 设备任务列表 + + + 终端配置文件 + + + 终端日志文件 + + + 设备操作日志 + + + SOAP包日志 + + + 软件版本对外接口调用信息
@@ -378,6 +247,7 @@ import { DeviceInfo, RemoteDevInfoVO, UnBindingForm } from "@/api/remote/types"; import { remoteDevInfo, remoteUnbindingLogicId } from "@/api/remote"; import { InfoFilled } from "@element-plus/icons-vue"; import OperateTabs from "@/views/family/operate/remote-operation/components/OperateTabs.vue"; +import RemoteOperateList from "@/views/family/operate/remote-operation/components/RemoteOperateList.vue"; const route = useRoute(); const router = useRouter(); @@ -398,6 +268,7 @@ const getData = () => { devOnline: data.devOnline, devOnlineTime: data.devOnlineTime, devCreateTime: data.devCreateTime, + devTypeNameDetail: data.devTypeNameDetail, }; }) .finally(() => { @@ -477,4 +348,12 @@ onMounted(() => { :deep(.my-label) { background: var(--el-color-white) !important; } +:deep(.my-label2) { + width: 0 !important; + display: none !important; + background: var(--el-color-white) !important; +} +:deep(.el-divider--vertical) { + height: 2.2em !important; +} diff --git a/src/views/family/operate/remote-operation/components/RemoteOperateList.vue b/src/views/family/operate/remote-operation/components/RemoteOperateList.vue new file mode 100644 index 0000000..faf8ba8 --- /dev/null +++ b/src/views/family/operate/remote-operation/components/RemoteOperateList.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/views/family/operate/remote-operation/components/ServiceParameter.vue b/src/views/family/operate/remote-operation/components/ServiceParameter.vue new file mode 100644 index 0000000..c8b6be5 --- /dev/null +++ b/src/views/family/operate/remote-operation/components/ServiceParameter.vue @@ -0,0 +1,108 @@ + + + + +