From 832bf3bf66ca6abecc5d5fa8571d87f1b73db4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Wed, 17 Jul 2024 16:06:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=9C=E7=A8=8B=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E3=80=81=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device-type-ver/index.ts | 14 +- src/api/device-type-ver/types.ts | 9 + src/api/operate-task2/index.ts | 9 + src/api/remote/index.ts | 80 +++++++- src/api/remote/types.ts | 22 ++- src/assets/logo.png | Bin 5441 -> 7995 bytes src/layout/components/NavBar/index.vue | 2 +- src/layout/components/TagsView/index.vue | 10 +- src/router/index.ts | 50 +++++ src/settings.ts | 2 +- src/styles/index.scss | 5 +- src/styles/variables.scss | 6 +- src/utils/index.ts | 3 +- src/views/dashboard/index.vue | 41 ++-- .../components/DeviceAbility.vue | 18 +- .../components/DeviceMonitoring.vue | 118 +++++++++++ .../components/DeviceOperateLog.vue | 8 +- .../components/DeviceOrder.vue | 8 +- .../components/DeviceSpeed.vue | 183 ++++++++++++++++++ .../components/DeviceStatus.vue | 11 +- .../components/DeviceTypeVersionLog.vue | 8 +- .../remote-operation/components/Ping.vue | 142 ++++++++++++++ .../remote-operation/components/Profiles.vue | 9 +- .../components/RemoteOperateInfo.vue | 14 +- .../components/RemoteOperateList.vue | 162 ++++++++++++++-- .../components/SoapPackageLog.vue | 8 +- .../components/TerminalLogFiles.vue | 8 +- .../components/UpgradeSoftVer.vue | 109 +++++++++++ src/views/family/operate/task/index.vue | 76 ++++++++ src/views/system/user/index.vue | 2 +- 30 files changed, 1060 insertions(+), 77 deletions(-) create mode 100644 src/views/family/operate/remote-operation/components/DeviceMonitoring.vue create mode 100644 src/views/family/operate/remote-operation/components/DeviceSpeed.vue create mode 100644 src/views/family/operate/remote-operation/components/Ping.vue create mode 100644 src/views/family/operate/remote-operation/components/UpgradeSoftVer.vue create mode 100644 src/views/family/operate/task/index.vue diff --git a/src/api/device-type-ver/index.ts b/src/api/device-type-ver/index.ts index e5d3aa1..d9cde7f 100644 --- a/src/api/device-type-ver/index.ts +++ b/src/api/device-type-ver/index.ts @@ -2,8 +2,10 @@ import { BindingTr069Form, DeviceTypeToVerPageResult, DeviceTypeToVerQuery, - DeviceTypeVerForm, DevVerServicePageResult, - GroupNamePageResult + DeviceTypeVerForm, + DevVerServicePageResult, + GroupNamePageResult, + SoftVersionUpgradeVO, } from "@/api/device-type-ver/types"; import request from "@/utils/request"; import { AxiosPromise } from "axios"; @@ -150,3 +152,11 @@ export function tr069BindingDevType(data: BindingTr069Form) { data, }); } +export function upgradeSoftVerTable( + devId: number +): AxiosPromise { + return request({ + url: `/api/device-type-ver/v1/upgrade-soft-ver/${devId}`, + method: "GET", + }); +} diff --git a/src/api/device-type-ver/types.ts b/src/api/device-type-ver/types.ts index 83cfb15..e1130d6 100644 --- a/src/api/device-type-ver/types.ts +++ b/src/api/device-type-ver/types.ts @@ -47,3 +47,12 @@ export interface BindingTr069Form { tr069VerId?: number; } +export interface SoftVersionUpgradeVO { + typeAndVerId?: number; + + fileId?: number; + + softVer?: string; + + devTypeVerDesc?: string; +} diff --git a/src/api/operate-task2/index.ts b/src/api/operate-task2/index.ts index fb39c43..b551a8a 100644 --- a/src/api/operate-task2/index.ts +++ b/src/api/operate-task2/index.ts @@ -15,3 +15,12 @@ export function operateTask2Page( data, }); } +export function taskTablePage( + data?: PageQuery +): AxiosPromise { + return request({ + url: `/api/operate-task2/v1/task-page`, + method: "POST", + data, + }); +} diff --git a/src/api/remote/index.ts b/src/api/remote/index.ts index eddde80..aacf412 100644 --- a/src/api/remote/index.ts +++ b/src/api/remote/index.ts @@ -1,9 +1,11 @@ import request from "@/utils/request"; import { AxiosPromise } from "axios"; import { + DeviceMonitorForm, + PingForm, RemoteDevInfoVO, - RemoteOperateResult, - UnBindingForm, + RemoteOperateResult, SpeedInfo, + UnBindingForm } from "@/api/remote/types"; import { DeviceLinkVO } from "@/api/operate-log/types"; import { FTTRInfoVO, ServiceCompareVO } from "@/api/operate-result-args/types"; @@ -76,3 +78,77 @@ export function remoteFTTRSubGateway(devId: number) { method: "GET", }); } + +export function remoteIpPing(data: PingForm) { + return request({ + url: `/api/equipment/v1/remote/ip-ping`, + method: "POST", + data, + }); +} +export function remoteUploadConfig(devId: number) { + return request({ + url: `/api/equipment/v1/remote/upload-config/${devId}`, + method: "GET", + }); +} +export function remoteUploadLog(devId: number) { + return request({ + url: `/api/equipment/v1/remote/upload-log/${devId}`, + method: "GET", + }); +} +export function remoteReboot(devId: number) { + return request({ + url: `/api/equipment/v1/remote/reboot/${devId}`, + method: "GET", + }); +} + +export function remoteFactoryReset(devId: number) { + return request({ + url: `/api/equipment/v1/remote/factory-reset/${devId}`, + method: "GET", + }); +} +export function remoteDeviceMonitor(data: DeviceMonitorForm) { + return request({ + url: `/api/equipment/v1/remote/device-monitor`, + method: "POST", + data, + }); +} +export function getSpeedInfo(devId: number): AxiosPromise { + return request({ + url: `/api/speed/v1/speed-info/${devId}`, + method: "get", + }); +} +export function remoteCheckConnType(devId: number): AxiosPromise { + return request({ + url: `/api/equipment/v1/remote/check-conn-type/${devId}`, + method: "GET", + }); +} +export function tr143Speed( + devId: number, + downloadUrl: string +): AxiosPromise { + return request({ + url: `/api/equipment/v1/remote/tr143-speed/${devId}`, + method: "GET", + params: { downloadUrl }, + }); +} +export function remoteSoftVerUpgrade(devId: number, fileId?: number) { + return request({ + url: `/api/equipment/v1/remote/soft-version-upgrade/${devId}/${fileId}`, + method: "GET", + }); +} +export function remoteOpenRegister(devId: number, fileId?: number) { + return request({ + url: `/api/equipment/v1/remote/register/${devId}`, + method: "GET", + }); +} diff --git a/src/api/remote/types.ts b/src/api/remote/types.ts index 71eef17..7424128 100644 --- a/src/api/remote/types.ts +++ b/src/api/remote/types.ts @@ -64,6 +64,24 @@ export interface DeviceInfo { devTypeNameDetail?: string; } export interface RemoteOperateResult { - resultState?: string; - resultCode?: string; + resultState: string; + resultCode: string; +} + +export interface PingForm { + deviceId?: number; + host?: string; + pingNumber?: string; + packSize?: string; + pingInterface?: string; +} +export interface DeviceMonitorForm { + devId?: number; + monitorPeriod?: string; + monitorInterval?: string; +} + +export interface SpeedInfo { + downloadUrls: string[]; + speedMaxRate: string; } diff --git a/src/assets/logo.png b/src/assets/logo.png index feb87da242c618a8167f390e120875b117d8d03e..6fab694330c3b553abd07538df9f23547f3de8cc 100644 GIT binary patch literal 7995 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�BdU6kRy_YBa0|Wy$rB4m?8hX*>u~s++)2 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 Xbp6I{tNFTXCQ1U+GSIA6w?_XT*IQZ1 diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue index 9fe18a2..084fdc4 100644 --- a/src/layout/components/NavBar/index.vue +++ b/src/layout/components/NavBar/index.vue @@ -13,6 +13,6 @@ @apply flex-x-between; height: $navbar-height; - //background: var(--el-bg-color); + background: var(--el-bg-color); } diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index a84aa74..a8cf5eb 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -377,14 +377,14 @@ onMounted(() => { width: 100%; height: 50px; color: #68758e; - //background-color: var(--el-bg-color); - //border: 1px solid var(--el-border-color-light); - //box-shadow: 0 1px 1px var(--el-box-shadow-light); + background-color: var(--el-bg-color); + border: 1px solid var(--el-border-color-light); + box-shadow: 0 1px 1px var(--el-box-shadow-light); .tags-item { display: inline-block; padding: 3px 8px; - margin: 6px 0 0 5px; + margin: 8px 0 0 5px; font-size: 13.5px; //height: 32px; line-height: 25px; @@ -397,7 +397,7 @@ onMounted(() => { } &:first-of-type { - margin-left: 10px; + margin-left: 5px; } &:last-of-type { diff --git a/src/router/index.ts b/src/router/index.ts index c3c2158..060daae 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -321,6 +321,56 @@ export const constantRoutes: RouteRecordRaw[] = [ title: "软件版本对外接口调用信息", }, }, + { + path: "/resources/remote/ping/:devId", + name: "Ping", + component: () => + import("@/views/family/operate/remote-operation/components/Ping.vue"), + meta: { + hidden: true, + keepAlive: true, + title: "测试Ping", + }, + }, + { + path: "/resources/remote/device-monitor/:devId", + name: "DeviceMonitoring", + component: () => + import( + "@/views/family/operate/remote-operation/components/DeviceMonitoring.vue" + ), + meta: { + hidden: true, + keepAlive: true, + title: "设备监控", + }, + }, + { + path: "/resources/remote/device-speed/:devId/:pppoe", + name: "DeviceSpeed", + component: () => + import( + "@/views/family/operate/remote-operation/components/DeviceSpeed.vue" + ), + meta: { + hidden: true, + keepAlive: true, + title: "测速操作", + }, + }, + { + path: "/resources/remote/upgrade-soft-ver/:devId", + name: "UpgradeSoftVer", + component: () => + import( + "@/views/family/operate/remote-operation/components/UpgradeSoftVer.vue" + ), + meta: { + hidden: true, + keepAlive: true, + title: "软件版本升级", + }, + }, ], }, ]; diff --git a/src/settings.ts b/src/settings.ts index 92bde20..ce3dbbe 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -12,7 +12,7 @@ const defaultSettings: AppSettings = { size: "default", language: "zh-cn", themeColor: "#00C3EE", - watermarkEnabled: true, + watermarkEnabled: false, watermarkContent: pkg.name, }; diff --git a/src/styles/index.scss b/src/styles/index.scss index 5f6b5f9..1e984a7 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,13 +1,14 @@ @use "./reset"; .app-container { - padding: 10px; + margin-top: 20px; + //padding: 10px; border-radius: 8px; } .search-container { padding: 18px 0 0 10px; - margin-bottom: 10px; + margin-bottom: 4px; background-color: var(--el-bg-color-overlay); border: 1px solid var(--el-border-color-light); border-radius: 8px; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index ca0514c..a2f91de 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,11 +1,11 @@ /** 全局SCSS变量 */ :root { - --menu-background: var(--el-bg-color-page); + --menu-background: #fff; --menu-text: #68758e; --menu-active-text: var(--el-menu-active-color); --menu-hover: #263445; - --sidebar-logo-background: #fff; + --sidebar-logo-background: #000; } /** 暗黑主题 */ @@ -21,7 +21,7 @@ $menu-background: var(--menu-background); // 菜单背景色 $menu-text: var(--menu-text); // 菜单文字颜色 $menu-active-text: var(--menu-active-text); // 菜单激活文字颜色 $menu-hover: var(--menu-hover); // 菜单悬停背景色 -$sidebar-logo-background: var(--el-bg-color-page); // 侧边栏 Logo 背景色 +$sidebar-logo-background: #fff; // 侧边栏 Logo 背景色 $sidebar-width: 210px; // 侧边栏宽度 $sidebar-width-collapsed: 54px; // 侧边栏收缩宽度 diff --git a/src/utils/index.ts b/src/utils/index.ts index 0e825c7..d955d7f 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,4 +1,6 @@ import { AxiosResponse } from "axios"; +import { RouteLocationNormalizedLoaded } from "vue-router"; +import { useTagsViewStore } from "@/store"; /** * Check if an element has a class @@ -61,7 +63,6 @@ export function downloadHook(res: AxiosResponse) { let fileName = ""; if (result) { fileName = decodeURI(result[1]); - console.log(fileName); } const downloadElement = document.createElement("a"); // 创建下载的链接 diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 3e82a35..ec4714a 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,29 +1,27 @@ + + diff --git a/src/views/family/operate/remote-operation/components/DeviceOperateLog.vue b/src/views/family/operate/remote-operation/components/DeviceOperateLog.vue index 7f78b80..77d5b17 100644 --- a/src/views/family/operate/remote-operation/components/DeviceOperateLog.vue +++ b/src/views/family/operate/remote-operation/components/DeviceOperateLog.vue @@ -3,8 +3,11 @@ @@ -78,6 +81,7 @@ + + diff --git a/src/views/family/operate/remote-operation/components/DeviceStatus.vue b/src/views/family/operate/remote-operation/components/DeviceStatus.vue index 85666f8..2ece084 100644 --- a/src/views/family/operate/remote-operation/components/DeviceStatus.vue +++ b/src/views/family/operate/remote-operation/components/DeviceStatus.vue @@ -1,5 +1,13 @@