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 feb87da..6fab694 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ 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 @@