From d53230245ff0105d9f67f24d1439b64e050371dd Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sat, 5 Apr 2025 21:55:05 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8F=AA=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81id=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/apis/module/model.js     |  6 +-
 main/manager-web/src/components/HeaderBar.vue | 55 ++++++++++---------
 .../src/views/DeviceManagement.vue            |  4 --
 main/manager-web/src/views/ModelConfig.vue    |  5 +-
 4 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/main/manager-web/src/apis/module/model.js b/main/manager-web/src/apis/module/model.js
index f13e335b..409241f4 100644
--- a/main/manager-web/src/apis/module/model.js
+++ b/main/manager-web/src/apis/module/model.js
@@ -75,9 +75,9 @@ export default {
       }).send()
   },
   // 删除模型配置
-  deleteModel(modelType, provideCode, id, callback) {
+  deleteModel(id, callback) {
     RequestService.sendRequest()
-      .url(`${getServiceUrl()}/api/v1/models/models/${modelType}/${provideCode}/${id}`)
+      .url(`${getServiceUrl()}/api/v1/models/models/${id}`)
       .method('DELETE')
       .success((res) => {
         RequestService.clearRequestTime()
@@ -87,7 +87,7 @@ export default {
         console.error('删除模型失败:', err)
         this.$message.error(err.msg || '删除模型失败')
         RequestService.reAjaxFun(() => {
-          this.deleteModel(modelType, provideCode, id, callback)
+          this.deleteModel(id, callback)
         })
       }).send()
   },
diff --git a/main/manager-web/src/components/HeaderBar.vue b/main/manager-web/src/components/HeaderBar.vue
index 7646c9c3..539120ea 100644
--- a/main/manager-web/src/components/HeaderBar.vue
+++ b/main/manager-web/src/components/HeaderBar.vue
@@ -3,22 +3,27 @@
     <div class="header-container">
       <!-- 左侧元素 -->
       <div class="header-left">
-        <img loading="lazy" alt="" src="@/assets/xiaozhi-logo.png" class="logo-img"/>
-        <img loading="lazy" alt="" src="@/assets/xiaozhi-ai.png" class="brand-img"/>
+        <img loading="lazy" alt="" src="@/assets/xiaozhi-logo.png" class="logo-img" />
+        <img loading="lazy" alt="" src="@/assets/xiaozhi-ai.png" class="brand-img" />
       </div>
 
       <!-- 中间导航菜单 -->
       <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' }"/>
+          <img loading="lazy" alt="" src="@/assets/header/robot.png"
+            :style="{ filter: $route.path === '/home' ? 'brightness(0) invert(1)' : 'None' }" />
           智能体管理
         </div>
-        <div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/model-config' }" @click="goModelConfig">
-          <img loading="lazy" alt="" src="@/assets/header/model_config.png" :style="{ filter: $route.path === '/model-config' ? 'brightness(0) invert(1)' : 'None' }"/>
+        <div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/model-config' }"
+          @click="goModelConfig">
+          <img loading="lazy" alt="" src="@/assets/header/model_config.png"
+            :style="{ filter: $route.path === '/model-config' ? 'brightness(0) invert(1)' : 'None' }" />
           模型配置
         </div>
-        <div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/user-management' }" @click="goUserManagement">
-          <img loading="lazy" alt="" src="@/assets/header/user_management.png" :style="{ filter: $route.path === '/user-management' ? 'brightness(0) invert(1)' : 'None' }"/>
+        <div v-if="isSuperAdmin" class="equipment-management"
+          :class="{ 'active-tab': $route.path === '/user-management' }" @click="goUserManagement">
+          <img loading="lazy" alt="" src="@/assets/header/user_management.png"
+            :style="{ filter: $route.path === '/user-management' ? 'brightness(0) invert(1)' : 'None' }" />
           用户管理
         </div>
       </div>
@@ -26,19 +31,15 @@
       <!-- 右侧元素 -->
       <div class="header-right">
         <div class="search-container">
-          <el-input
-            v-model="search"
-            placeholder="输入名称搜索.."
-            class="custom-search-input"
-            @keyup.enter.native="handleSearch"
-          >
+          <el-input v-model="search" placeholder="输入名称搜索.." class="custom-search-input"
+            @keyup.enter.native="handleSearch">
             <i slot="suffix" class="el-icon-search search-icon" @click="handleSearch"></i>
           </el-input>
         </div>
-        <img loading="lazy" alt="" src="@/assets/home/avatar.png" class="avatar-img"/>
+        <img loading="lazy" alt="" src="@/assets/home/avatar.png" class="avatar-img" />
         <el-dropdown trigger="click" class="user-dropdown">
           <span class="el-dropdown-link">
-             {{ userInfo.username || '加载中...' }}<i class="el-icon-arrow-down el-icon--right"></i>
+            {{ userInfo.username || '加载中...' }}<i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="showChangePasswordDialog">修改密码</el-dropdown-item>
@@ -49,7 +50,7 @@
     </div>
 
     <!-- 修改密码弹窗 -->
-    <ChangePasswordDialog v-model="isChangePasswordDialogVisible"/>
+    <ChangePasswordDialog v-model="isChangePasswordDialogVisible" />
   </el-header>
 </template>
 
@@ -97,7 +98,7 @@ export default {
     },
     // 获取用户信息
     fetchUserInfo() {
-      userApi.getUserInfo(({data}) => {
+      userApi.getUserInfo(({ data }) => {
         this.userInfo = data.data
         if (data.data.superAdmin !== undefined) {
           this.$store.commit('setUserInfo', data.data);
@@ -138,14 +139,14 @@ export default {
         // 调用 Vuex 的 logout action
         await this.logout();
         this.$message.success({
-          message:'退出登录成功',
-          showClose:true
+          message: '退出登录成功',
+          showClose: true
         });
       } catch (error) {
         console.error('退出登录失败:', error);
         this.$message.error({
-          message:'退出登录失败，请重试',
-          showClose:true
+          message: '退出登录失败，请重试',
+          showClose: true
         });
       }
     },
@@ -161,7 +162,8 @@ export default {
   background: #f6fcfe66;
   border: 1px solid #fff;
   height: 53px !important;
-  min-width: 900px; /* 设置最小宽度防止过度压缩 */
+  min-width: 900px;
+  /* 设置最小宽度防止过度压缩 */
   overflow: hidden;
 }
 
@@ -222,7 +224,8 @@ export default {
   align-items: center;
   transition: all 0.3s ease;
   cursor: pointer;
-  flex-shrink: 0; /* 防止导航按钮被压缩 */
+  flex-shrink: 0;
+  /* 防止导航按钮被压缩 */
 }
 
 .equipment-management.active-tab {
@@ -242,10 +245,10 @@ export default {
   max-width: 220px;
 }
 
-.custom-search-input >>> .el-input__inner {
+.custom-search-input>>>.el-input__inner {
   height: 30px;
   border-radius: 15px;
-  background-color: #e2e5f8;
+  background-color: #fff;
   border: 1px solid #e4e6ef;
   padding-left: 15px;
   font-size: 12px;
@@ -309,7 +312,7 @@ export default {
     max-width: 145px;
   }
 
-  .custom-search-input >>> .el-input__inner {
+  .custom-search-input>>>.el-input__inner {
     padding-left: 10px;
     font-size: 11px;
   }
diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue
index e6ff09e5..cceead5d 100644
--- a/main/manager-web/src/views/DeviceManagement.vue
+++ b/main/manager-web/src/views/DeviceManagement.vue
@@ -94,10 +94,6 @@ export default {
       this.deviceList[index].isEdit = false;
     },
     handleUnbind(device_id) {
-      if (!this.deviceApi) {
-        this.$message.error('功能模块加载失败');
-        return;
-      }
       this.$confirm('确认要解绑该设备吗？', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue
index dc2b77e1..0ab24653 100644
--- a/main/manager-web/src/views/ModelConfig.vue
+++ b/main/manager-web/src/views/ModelConfig.vue
@@ -101,7 +101,7 @@
             <div class="batch-actions">
               <el-button size="mini" @click="selectAll" style="width: 75px; background: #606ff3">{{ isAllSelected ?
                 '取消全选' : '全选'
-              }}</el-button>
+                }}</el-button>
               <el-button size="mini" type="danger" icon="el-icon-delete" @click="batchDelete">
                 删除
               </el-button>
@@ -229,9 +229,8 @@ export default {
       }).then(() => {
         const deletePromises = this.selectedModels.map(model =>
           new Promise(resolve => {
+            // TODO: 删除获取model.id
             Api.model.deleteModel(
-              this.activeTab,
-              model.configJson?.provider || '',
               model.id,
               ({ data }) => resolve(data.code === 0)
             )