From fe86e1fb0fa08f989bfdd8fb89ddb2e43fab2cc9 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Sat, 5 Apr 2025 21:03:46 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E7=BB=9F=E4=B8=80=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=AF=BB=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/manager-web/src/apis/api.js | 9 + main/manager-web/src/apis/httpRequest.js | 2 - main/manager-web/src/apis/module/ota.js | 54 ----- .../src/components/ActivateDeviceDialog.vue | 98 -------- .../src/components/AddDeviceDialog.vue | 65 +++-- .../src/components/AddModelDialog.vue | 41 ++-- .../src/components/AddWisdomBodyDialog.vue | 30 +-- .../src/components/ModelEditDialog.vue | 17 +- .../src/views/DeviceManagement.vue | 71 +++--- main/manager-web/src/views/ModelConfig.vue | 17 +- main/manager-web/src/views/UserManagement.vue | 226 +++++++++--------- main/manager-web/src/views/home.vue | 50 ++-- main/manager-web/src/views/login.vue | 1 - main/manager-web/src/views/register.vue | 1 - main/manager-web/src/views/roleConfig.vue | 83 +++---- 15 files changed, 304 insertions(+), 461 deletions(-) delete mode 100644 main/manager-web/src/apis/module/ota.js delete mode 100644 main/manager-web/src/components/ActivateDeviceDialog.vue diff --git a/main/manager-web/src/apis/api.js b/main/manager-web/src/apis/api.js index 4d290ee8..c1468791 100755 --- a/main/manager-web/src/apis/api.js +++ b/main/manager-web/src/apis/api.js @@ -1,5 +1,10 @@ // 引入各个模块的请求 +import admin from './module/admin.js' +import agent from './module/agent.js' +import device from './module/device.js' +import model from './module/model.js' import user from './module/user.js' + /** * 接口地址 * 开发时自动读取使用.env.development文件 @@ -20,4 +25,8 @@ export function getServiceUrl() { export default { getServiceUrl, user, + admin, + agent, + device, + model, } diff --git a/main/manager-web/src/apis/httpRequest.js b/main/manager-web/src/apis/httpRequest.js index 182152f9..78e2dbf6 100755 --- a/main/manager-web/src/apis/httpRequest.js +++ b/main/manager-web/src/apis/httpRequest.js @@ -100,7 +100,6 @@ function sendRequest() { */ // 在错误处理函数中添加日志 function httpHandlerError(info, callBack) { - console.log('httpHandlerError', info) /** 请求成功,退出该函数 可以根据项目需求来判断是否请求成功。这里判断的是status为200的时候是成功 */ let networkError = false @@ -108,7 +107,6 @@ function httpHandlerError(info, callBack) { if (info.data.code === 'success' || info.data.code === 0 || info.data.code === undefined) { return networkError } else if (info.data.code === 401) { - console.log('触发 401,清除 Token 并跳转登录页'); store.commit('clearAuth'); goToPage(Constant.PAGE.LOGIN, true); return true diff --git a/main/manager-web/src/apis/module/ota.js b/main/manager-web/src/apis/module/ota.js deleted file mode 100644 index 127efb41..00000000 --- a/main/manager-web/src/apis/module/ota.js +++ /dev/null @@ -1,54 +0,0 @@ -import { getServiceUrl } from '../api' -import RequestService from '../httpRequest' - -export default { - /** - * 设备激活接口 - * @param {string} code 激活码 - * @param {function} callback 回调函数 - */ - activateDevice(code, callback) { - RequestService.sendRequest() - .url(`${getServiceUrl()}/api/v1/ota/activation`) - .method('GET') - .query({ code }) - .success((res) => { - RequestService.clearRequestTime() - callback(res) - }) - .fail((err) => { - console.error('设备激活失败:', err) - RequestService.reAjaxFun(() => { - this.activateDevice(code, callback) - }) - }).send() - }, - - /** - * 检查OTA版本和设备激活状态 - * @param {object} deviceInfo 设备信息对象 - * @param {string} deviceId 设备唯一标识 - * @param {string} clientId 客户端标识 - * @param {function} callback 回调函数 - */ - checkOtaVersion(deviceInfo, deviceId, clientId, callback) { - RequestService.sendRequest() - .url(`${getServiceUrl()}/api/v1/ota`) - .method('POST') - .header({ - 'Device-Id': deviceId, - 'Client-Id': clientId - }) - .data(deviceInfo) - .success((res) => { - RequestService.clearRequestTime() - callback(res) - }) - .fail((err) => { - console.error('检查OTA版本失败:', err) - RequestService.reAjaxFun(() => { - this.checkOtaVersion(deviceInfo, deviceId, clientId, callback) - }) - }).send() - } -} \ No newline at end of file diff --git a/main/manager-web/src/components/ActivateDeviceDialog.vue b/main/manager-web/src/components/ActivateDeviceDialog.vue deleted file mode 100644 index 59384e79..00000000 --- a/main/manager-web/src/components/ActivateDeviceDialog.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - - \ No newline at end of file diff --git a/main/manager-web/src/components/AddDeviceDialog.vue b/main/manager-web/src/components/AddDeviceDialog.vue index fa8e3ab7..bc7da372 100644 --- a/main/manager-web/src/components/AddDeviceDialog.vue +++ b/main/manager-web/src/components/AddDeviceDialog.vue @@ -1,7 +1,9 @@ \ No newline at end of file diff --git a/main/manager-web/src/components/AddModelDialog.vue b/main/manager-web/src/components/AddModelDialog.vue index 4b5ca445..8f580d8f 100644 --- a/main/manager-web/src/components/AddModelDialog.vue +++ b/main/manager-web/src/components/AddModelDialog.vue @@ -1,5 +1,6 @@ @@ -320,7 +330,7 @@ export default { } .btn-search { - background: linear-gradient(135deg, #6B8CFF, #A966FF); + background: linear-gradient(135deg, #6b8cff, #a966ff); border: none; color: white; } @@ -434,7 +444,7 @@ export default { padding: 0 12px; border-radius: 4px; border: 1px solid #e4e7ed; - background: #DEE7FF; + background: #dee7ff; color: #606266; font-size: 14px; cursor: pointer; @@ -512,7 +522,7 @@ export default { } &::after { - content: '选择'; + content: "选择"; display: inline-block; color: black; font-weight: bold; @@ -555,4 +565,4 @@ export default { } } } - \ No newline at end of file + diff --git a/main/manager-web/src/views/home.vue b/main/manager-web/src/views/home.vue index 663f5430..118fbaa0 100644 --- a/main/manager-web/src/views/home.vue +++ b/main/manager-web/src/views/home.vue @@ -45,9 +45,10 @@