From 5bfc3efc9cf673150758b93f2b0c0210aa2efa74 Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Thu, 27 Mar 2025 11:24:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E2=80=9C=E8=A7=A3?=
 =?UTF-8?q?=E7=BB=91=E8=AE=BE=E5=A4=87=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/apis/module/user.js      | 32 +++++++++++++---
 .../src/views/DeviceManagement.vue            | 37 +++++++++++++++----
 2 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/main/manager-web/src/apis/module/user.js b/main/manager-web/src/apis/module/user.js
index 88a77623..83f5457f 100755
--- a/main/manager-web/src/apis/module/user.js
+++ b/main/manager-web/src/apis/module/user.js
@@ -5,7 +5,8 @@ import {getServiceUrl} from '../api'
 export default {
     // 登录
     login(loginForm, callback) {
-        RequestService.sendRequest().url(`${getServiceUrl()}/api/v1/user/login`)
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/api/v1/user/login`)
             .method('POST')
             .data(loginForm)
             .success((res) => {
@@ -40,7 +41,9 @@ export default {
     },
     // 注册账号
     register(registerForm, callback) {
-        RequestService.sendRequest().url(`${getServiceUrl()}/api/v1/user/register`).method('POST')
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/api/v1/user/register`)
+            .method('POST')
             .data(registerForm)
             .success((res) => {
                 RequestService.clearRequestTime()
@@ -132,11 +135,11 @@ export default {
     // 修改用户密码
     changePassword(oldPassword, newPassword, successCallback, errorCallback) {
         RequestService.sendRequest()
-            .url(`${getServiceUrl()}/api/v1/user/change-password`)  // 修改URL
-            .method('PUT')  // 修改方法为PUT
+            .url(`${getServiceUrl()}/api/v1/user/change-password`)
+            .method('PUT')
             .data({
-                old_password: oldPassword,  // 修改参数名
-                new_password: newPassword   // 修改参数名
+                old_password: oldPassword,
+                new_password: newPassword,
             })
             .success((res) => {
                 RequestService.clearRequestTime();
@@ -197,4 +200,21 @@ export default {
                  });
              }).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();
+    }
 }
diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue
index 9135a3e6..b6741d7e 100644
--- a/main/manager-web/src/views/DeviceManagement.vue
+++ b/main/manager-web/src/views/DeviceManagement.vue
@@ -31,7 +31,7 @@
           </el-table-column>
           <el-table-column label="操作" width="80">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" @click="handleUnbind(scope.row)" style="color: #ff4949">
+              <el-button size="mini" type="text" @click="handleUnbind(scope.row.device_id)" style="color: #ff4949">
                 解绑
               </el-button>
             </template>
@@ -59,7 +59,7 @@
 <script>
 import HeaderBar from "@/components/HeaderBar.vue";
 import AddDeviceDialog from "@/components/AddDeviceDialog.vue";
-
+import { userApi } from '@/apis/module/user';
 export default {
   components: {HeaderBar, AddDeviceDialog },
   data() {
@@ -69,6 +69,7 @@ export default {
       pageSize: 5,
       deviceList: [],
       loading: false,
+      userApi: null,
     };
   },
   computed: {
@@ -80,9 +81,12 @@ export default {
   },
   mounted() {
     const agentId = this.$route.query.agentId;
-    if (agentId) {
-      this.fetchBindDevices(agentId);
-    }
+    import('@/apis/module/user').then(({ default: userApi }) => {
+      this.userApi = userApi;
+      if (agentId) {
+        this.fetchBindDevices(agentId);
+      }
+    });
   },
   methods: {
     handleAddDevice() {
@@ -94,8 +98,25 @@ export default {
     stopEditRemark(index) {
       this.deviceList[index].isEdit = false;
     },
-    handleUnbind(device) {
-      console.log('解绑设备', device);
+    handleUnbind(device_id) {
+      if (!this.userApi) {
+        this.$message.error('功能模块加载失败');
+        return;
+      }
+      this.$confirm('确认要解绑该设备吗？', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.userApi.unbindDevice(device_id, ({ data }) => {
+          if (data.code === 0) {
+            this.$message.success('设备解绑成功');
+            this.fetchBindDevices(this.$route.query.agentId);
+          } else {
+            this.$message.error(data.msg || '设备解绑失败');
+          }
+        });
+      });
     },
     handleDeviceAdded(deviceCode) {
       console.log('添加的智能体名称：', deviceCode);
@@ -113,7 +134,7 @@ export default {
             this.loading = false;
             if (data.code === 0) {
               this.deviceList = data.data[0]?.list.map(device => ({
-                id: device.id,
+                device_id: device.id,
                 model: device.device_type,
                 firmwareVersion: device.app_version,
                 macAddress: device.mac_address,

From 3ca06f8d50d0fb59f334f6eec7f82dc1c303e9b2 Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Thu, 27 Mar 2025 17:54:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E2=80=9D=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E8=AE=BE=E5=A4=87=E2=80=9C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/apis/module/user.js      | 48 +++++++++++++------
 .../src/components/AddDeviceDialog.vue        | 43 +++++++++++++++--
 .../src/views/DeviceManagement.vue            |  9 ++--
 3 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/main/manager-web/src/apis/module/user.js b/main/manager-web/src/apis/module/user.js
index 83f5457f..66fefdbc 100755
--- a/main/manager-web/src/apis/module/user.js
+++ b/main/manager-web/src/apis/module/user.js
@@ -186,6 +186,7 @@ export default {
     },
     // 已绑设备
      getAgentBindDevices(agentId, callback) {
+        console.log("77777777777777777777777")
          RequestService.sendRequest()
              .url(`${getServiceUrl()}/api/v1/user/agent/device/bind/${agentId}`)
              .method('GET')
@@ -202,19 +203,36 @@ export default {
      },
     // 解绑设备
     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();
-    }
+          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) {
+        console.log("32323234343434344340000")
+        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 e7ba492e..6c99a038 100644
--- a/main/manager-web/src/components/AddDeviceDialog.vue
+++ b/main/manager-web/src/components/AddDeviceDialog.vue
@@ -33,16 +33,49 @@
 export default {
   name: 'AddDeviceDialog',
   props: {
-    visible: { type: Boolean, required: true }
+    visible: { type: Boolean, required: true },
+    agentId: { type: String, required: true }
   },
   data() {
-    return { deviceCode: "" }
+    return {
+      deviceCode: "",
+      loading: false,
+    }
   },
   methods: {
     confirm() {
-      this.$emit('update:visible', false)
-      this.$emit('added', this.deviceCode)
-      this.deviceCode = ""
+      // console.log(this.agentId)
+      //  console.log("=========")
+      // console.log(this.$route.query.agentId)
+      if (!/^\d{6}$/.test(this.deviceCode)) {
+        this.$message.error('请输入6位数字验证码');
+        return;
+      }
+      this.loading = true;
+      import('@/apis/module/user').then(({ default: userApi }) => {
+        userApi.bindDevice(
+            this.agentId,
+            this.deviceCode, ({data}) => {
+              this.loading = false;
+              if (data.code === 0) {
+                this.$emit('refresh');
+                this.$message.success('设备绑定成功');
+                this.closeDialog();
+              } else {
+                this.$message.error(data.msg || '绑定失败');
+              }
+            }
+          );
+        }).catch((err) => {
+          this.loading = false;
+          console.error('API模块加载失败:', err);
+          this.$message.error('绑定服务不可用');
+        });
+    },
+    closeDialog() {
+      this.$emit('update:visible', false);
+      this.deviceCode = '';
+
     },
     cancel() {
       this.$emit('update:visible', false)
diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue
index b6741d7e..2e853f17 100644
--- a/main/manager-web/src/views/DeviceManagement.vue
+++ b/main/manager-web/src/views/DeviceManagement.vue
@@ -51,7 +51,7 @@
       <div style="font-size: 12px; font-weight: 400; margin-top: auto; padding-top: 30px; color: #979db1;">
         ©2025 xiaozhi-esp32-server
       </div>
-      <AddDeviceDialog :visible.sync="addDeviceDialogVisible" @added="handleDeviceAdded" />
+      <AddDeviceDialog :visible.sync="addDeviceDialogVisible" :agent-id="currentAgentId" @refresh="fetchBindDevices(currentAgentId)"  />
     </el-main>
   </div>
 </template>
@@ -59,12 +59,12 @@
 <script>
 import HeaderBar from "@/components/HeaderBar.vue";
 import AddDeviceDialog from "@/components/AddDeviceDialog.vue";
-import { userApi } from '@/apis/module/user';
 export default {
   components: {HeaderBar, AddDeviceDialog },
   data() {
     return {
       addDeviceDialogVisible: false,
+      currentAgentId: this.$route.query.agentId || '',
       currentPage: 1,
       pageSize: 5,
       deviceList: [],
@@ -118,9 +118,6 @@ export default {
         });
       });
     },
-    handleDeviceAdded(deviceCode) {
-      console.log('添加的智能体名称：', deviceCode);
-    },
     handleSizeChange(val) {
       this.pageSize = val;
     },
@@ -133,7 +130,7 @@ export default {
           userApi.getAgentBindDevices(agentId, ({ data }) => {
             this.loading = false;
             if (data.code === 0) {
-              this.deviceList = data.data[0]?.list.map(device => ({
+              this.deviceList = data.data[0].list.map(device => ({
                 device_id: device.id,
                 model: device.device_type,
                 firmwareVersion: device.app_version,