From bdedc48aca39d4c1ced0941a5310904bc38efb86 Mon Sep 17 00:00:00 2001
From: Ran_Chen <1908198662@qq.com>
Date: Wed, 2 Apr 2025 15:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90device=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E8=B0=83=E6=95=B4=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=BC=98=E5=8C=96Headerbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/apis/module/device.js    | 54 +++++++++++++++++++
 main/manager-web/src/apis/module/user.js      | 52 ------------------
 .../src/components/AddDeviceDialog.vue        |  4 +-
 .../src/components/ChangePasswordDialog.vue   |  9 ++--
 main/manager-web/src/components/HeaderBar.vue |  5 --
 main/manager-web/src/components/TtsModel.vue  |  9 +++-
 main/manager-web/src/main.js                  |  1 +
 main/manager-web/src/utils/index.js           |  9 ++--
 .../src/views/DeviceManagement.vue            | 45 ++++++++--------
 9 files changed, 99 insertions(+), 89 deletions(-)
 create mode 100644 main/manager-web/src/apis/module/device.js

diff --git a/main/manager-web/src/apis/module/device.js b/main/manager-web/src/apis/module/device.js
new file mode 100644
index 00000000..e8dc2c71
--- /dev/null
+++ b/main/manager-web/src/apis/module/device.js
@@ -0,0 +1,54 @@
+import RequestService from '../httpRequest'
+import {getServiceUrl} from '../api'
+
+export default {
+    // 已绑设备
+     getAgentBindDevices(agentId, callback) {
+         RequestService.sendRequest()
+             .url(`${getServiceUrl()}/api/v1/device/bind/${agentId}`)
+             .method('GET')
+             .success((res) => {
+                 RequestService.clearRequestTime();
+                 callback(res);
+             })
+             .fail((err) => {
+                 console.error('获取设备列表失败:', err);
+                 RequestService.reAjaxFun(() => {
+                     this.getAgentBindDevices(agentId, callback);
+                 });
+             }).send();
+     },
+    // 解绑设备
+    unbindDevice(device_id, callback) {
+          RequestService.sendRequest()
+            .url(`${getServiceUrl()}/api/v1/device/unbind`)
+            .method('POST')
+            .data({ deviceId: device_id })
+            .success((res) => {
+              RequestService.clearRequestTime();
+              callback(res);
+            })
+            .fail((err) => {
+              console.error('解绑设备失败:', err);
+              RequestService.reAjaxFun(() => {
+                this.unbindDevice(device_id, callback);
+              });
+            }).send();
+    },
+    // 绑定设备
+    bindDevice(agentId, deviceCode, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/api/v1/device/bind/${agentId}/${deviceCode}`)
+            .method('POST')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('绑定设备失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.bindDevice(agentId, deviceCode, callback);
+                });
+            }).send();
+    },
+}
\ No newline at end of file
diff --git a/main/manager-web/src/apis/module/user.js b/main/manager-web/src/apis/module/user.js
index 8e7513fe..8464794c 100755
--- a/main/manager-web/src/apis/module/user.js
+++ b/main/manager-web/src/apis/module/user.js
@@ -21,7 +21,6 @@ export default {
     },
     // 获取验证码
     getCaptcha(uuid, callback) {
-
         RequestService.sendRequest()
             .url(`${getServiceUrl()}/api/v1/user/captcha?uuid=${uuid}`)
             .method('GET')
@@ -52,7 +51,6 @@ export default {
             .fail(() => {
             }).send()
     },
-
     // 保存设备配置
     saveDeviceConfig(device_id, configData, callback) {
         RequestService.sendRequest()
@@ -106,54 +104,4 @@ export default {
             })
             .send();
     },
-    
-    // 已绑设备
-     getAgentBindDevices(agentId, callback) {
-         RequestService.sendRequest()
-             .url(`${getServiceUrl()}/api/v1/user/agent/device/bind/${agentId}`)
-             .method('GET')
-             .success((res) => {
-                 RequestService.clearRequestTime();
-                 callback(res);
-             })
-             .fail((err) => {
-                 console.error('获取设备列表失败:', err);
-                 RequestService.reAjaxFun(() => {
-                     this.getAgentBindDevices(agentId, callback);
-                 });
-             }).send();
-     },
-    // 解绑设备
-    unbindDevice(device_id, callback) {
-          RequestService.sendRequest()
-            .url(`${getServiceUrl()}/api/v1/user/device/unbind/${device_id}`)
-            .method('PUT')
-            .success((res) => {
-              RequestService.clearRequestTime();
-              callback(res);
-            })
-            .fail((err) => {
-              console.error('解绑设备失败:', err);
-              RequestService.reAjaxFun(() => {
-                this.unbindDevice(device_id, callback);
-              });
-            }).send();
-    },
-    // 绑定设备
-    bindDevice(agentId, code, callback) {
-        RequestService.sendRequest()
-            .url(`${getServiceUrl()}/api/v1/user/agent/device/bind/${agentId}`)
-            .method('POST')
-            .data({ code })
-            .success((res) => {
-                RequestService.clearRequestTime();
-                callback(res);
-            })
-            .fail((err) => {
-                console.error('绑定设备失败:', err);
-                RequestService.reAjaxFun(() => {
-                    this.bindDevice(agentId, code, callback);
-                });
-            }).send();
-    },
 }
diff --git a/main/manager-web/src/components/AddDeviceDialog.vue b/main/manager-web/src/components/AddDeviceDialog.vue
index 129ed156..a1ba5540 100644
--- a/main/manager-web/src/components/AddDeviceDialog.vue
+++ b/main/manager-web/src/components/AddDeviceDialog.vue
@@ -49,8 +49,8 @@ export default {
         return;
       }
       this.loading = true;
-      import('@/apis/module/user').then(({ default: userApi }) => {
-        userApi.bindDevice(
+      import('@/apis/module/device').then(({ default: deviceApi }) => {
+        deviceApi.bindDevice(
             this.agentId,
             this.deviceCode, ({data}) => {
               this.loading = false;
diff --git a/main/manager-web/src/components/ChangePasswordDialog.vue b/main/manager-web/src/components/ChangePasswordDialog.vue
index 5d1217ef..a0bb1f7d 100644
--- a/main/manager-web/src/components/ChangePasswordDialog.vue
+++ b/main/manager-web/src/components/ChangePasswordDialog.vue
@@ -1,9 +1,11 @@
 <template>
   <form>
     <el-dialog :visible.sync="value" width="400px" center>
-      <div
-          style="width: 40px;height: 40px;border-radius: 50%;background: #5778ff;display: flex;align-items: center;justify-content: center;">
-        <img loading="lazy" src="@/assets/login/shield.png" alt="" style="width: 19px;height: 23px; filter: brightness(0) invert(1);" />
+      <div style="margin: 0 10px 10px;display: flex;align-items: center;gap: 10px;font-weight: 700;font-size: 20px;text-align: left;color: #3d4566;">
+        <div style="width: 40px;height: 40px;border-radius: 50%;background: #5778ff;display: flex;align-items: center;justify-content: center;">
+          <img loading="lazy" src="@/assets/login/shield.png" alt="" style="width: 19px;height: 23px; filter: brightness(0) invert(1);" />
+        </div>
+        修改密码
       </div>
       <div style="height: 1px;background: #e8f0ff;"/>
       <div style="margin: 22px 15px;">
@@ -109,7 +111,6 @@ export default {
 
 <style scoped>
 .input-46 {
-  border: 1px solid #e4e6ef;
   background: #f6f8fb;
   border-radius: 15px;
 }
diff --git a/main/manager-web/src/components/HeaderBar.vue b/main/manager-web/src/components/HeaderBar.vue
index aeefa683..961676a3 100644
--- a/main/manager-web/src/components/HeaderBar.vue
+++ b/main/manager-web/src/components/HeaderBar.vue
@@ -10,9 +10,7 @@
       <!-- 中间导航菜单 -->
       <div class="header-center">
         <div class="equipment-management" :class="{ 'active-tab': $route.path === '/home' }" @click="goHome">
-
           <img loading="lazy" alt="" src="@/assets/header/robot.png" :style="{ filter: $route.path === '/home' ? 'brightness(0) invert(1)' : 'None' }"/>
-
           智能体管理
         </div>
         <div class="equipment-management" :class="{ 'active-tab': $route.path === '/user-management' }" @click="goUserManagement">
@@ -43,7 +41,6 @@
              {{ userInfo.username || '加载中...' }}<i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item icon="el-icon-plus" @click.native="">个人中心</el-dropdown-item>
             <el-dropdown-item icon="el-icon-circle-plus" @click.native="showChangePasswordDialog">修改密码</el-dropdown-item>
             <el-dropdown-item icon="el-icon-circle-plus-outline" @click.native="handleLogout">退出登录</el-dropdown-item>
           </el-dropdown-menu>
@@ -128,9 +125,7 @@ export default {
       try {
         // 调用 Vuex 的 logout action
         await this.logout();
-
         this.$message.success('退出登录成功');
-
         this.$router.push('/login');
       } catch (error) {
         console.error('退出登录失败:', error);
diff --git a/main/manager-web/src/components/TtsModel.vue b/main/manager-web/src/components/TtsModel.vue
index 92b107ed..14535592 100644
--- a/main/manager-web/src/components/TtsModel.vue
+++ b/main/manager-web/src/components/TtsModel.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" width="80%" @close="handleClose">
+  <el-dialog :visible.sync="localVisible" width="80%" @close="handleClose">
     <el-row class="main-container">
       <el-col :span="4">
         <el-menu class="model-menu" :default-active="activeModel" mode="vertical" @select="handleModelSelect">
@@ -57,6 +57,7 @@ export default {
   },
   data() {
     return {
+      localVisible: this.visible,
       activeModel: 'EdgeTTS',
       searchQuery: '',
       editDialogVisible: false,
@@ -72,6 +73,11 @@ export default {
       total: 20
     };
   },
+  watch: {
+    visible(newVal) {
+      this.localVisible = newVal;
+    }
+  },
   computed: {
     filteredTtsModels() {
       return this.ttsModels.filter(model =>
@@ -81,6 +87,7 @@ export default {
   },
   methods: {
     handleClose() {
+      this.localVisible = false;
       this.$emit('update:visible', false);
     },
     handleModelSelect(index) {
diff --git a/main/manager-web/src/main.js b/main/manager-web/src/main.js
index d12bf731..12d672ca 100644
--- a/main/manager-web/src/main.js
+++ b/main/manager-web/src/main.js
@@ -8,6 +8,7 @@ import 'element-ui/lib/theme-chalk/index.css';
 import './styles/global.scss'
 
 Vue.use(ElementUI);
+
 Vue.config.productionTip = false
 
 new Vue({
diff --git a/main/manager-web/src/utils/index.js b/main/manager-web/src/utils/index.js
index b9c22fbc..aeb728b4 100755
--- a/main/manager-web/src/utils/index.js
+++ b/main/manager-web/src/utils/index.js
@@ -54,7 +54,8 @@ export function showDanger(msg) {
     }
     Message({
         message: msg,
-        type: 'error'
+        type: 'error',
+        showClose: true
     })
 }
 
@@ -68,7 +69,8 @@ export function showWarning(msg) {
     }
     Message({
         message: msg,
-        type: 'warning'
+        type: 'warning',
+        showClose: true
     });
 }
 
@@ -81,7 +83,8 @@ export function showWarning(msg) {
 export function showSuccess(msg) {
     Message({
         message: msg,
-        type: 'success'
+        type: 'success',
+        showClose: true
     })
 }
 
diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue
index 2e853f17..7be164ce 100644
--- a/main/manager-web/src/views/DeviceManagement.vue
+++ b/main/manager-web/src/views/DeviceManagement.vue
@@ -124,31 +124,32 @@ export default {
     handleCurrentChange(val) {
       this.currentPage = val;
     },
-     fetchBindDevices(agentId) {
-        this.loading = true;
-        import('@/apis/module/user').then(({ default: userApi }) => {
-          userApi.getAgentBindDevices(agentId, ({ data }) => {
+    fetchBindDevices(agentId) {
+      this.loading = true;
+      import('@/apis/module/device').then(({ default: deviceApi }) => {
+        deviceApi.getAgentBindDevices(agentId, ({ data }) => {
             this.loading = false;
             if (data.code === 0) {
-              this.deviceList = data.data[0].list.map(device => ({
-                device_id: device.id,
-                model: device.device_type,
-                firmwareVersion: device.app_version,
-                macAddress: device.mac_address,
-                lastConversation: device.recent_chat_time,
-                remark: '',
-                isEdit: false,
-                otaSwitch: device.ota_upgrade === 1
-              }));
-            } else {
-              this.$message.error(data.msg || '获取设备列表失败');
-            }
-          });
-        }).catch(error => {
-          console.error('模块加载失败:', error);
-          this.$message.error('功能模块加载失败');
+                this.deviceList = data.data.map(device => ({
+                    device_id: device.id,
+                    model: device.board,
+                    firmwareVersion: device.appVersion,
+                    macAddress: device.macAddress,
+                    bindTime: device.createDate,
+                    lastConversation: device.lastConnectedAt,
+                    remark: device.alias,
+                    isEdit: false,
+                    otaSwitch: device.autoUpdate === 1
+                }));
+          } else {
+            this.$message.error(data.msg || '获取设备列表失败');
+          }
         });
-     },
+      }).catch(error => {
+        console.error('模块加载失败:', error);
+        this.$message.error('功能模块加载失败');
+      });
+    },
   }
 };
 </script>