From 441ff7c7da9431ec57079a1dbe3cf3d3b2b3bb8d Mon Sep 17 00:00:00 2001
From: butubb <1422726308@qq.com>
Date: Fri, 4 Sep 2026 10:15:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E7=A7=BB=E5=85=A5=E5=B7=A5=E5=85=B7=E9=A1=B5=EF=BC=88=E5=8E=9F?=
 =?UTF-8?q?=E9=A1=B6=E7=BA=A7=20tab=20=E5=88=A0=E9=99=A4=EF=BC=89=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E5=B7=A5=E5=85=B7=E9=A1=B5=E6=96=B0=E5=A2=9E=E3=80=8C?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=86=E7=BB=84=E3=80=8D=E5=AD=90=E5=88=86?=
 =?UTF-8?q?=E6=A0=8F=EF=BC=8C=E5=88=86=E7=BB=84=E7=AE=A1=E7=90=86=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=B8=8E=E5=85=B6=E4=BB=96=E8=AE=BE=E5=A4=87=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E8=81=9A=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/admin/base.js         |  2 +-
 templates/admin/monitor.html | 37 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/static/admin/base.js b/static/admin/base.js
index 42a9c9e..27f6e3d 100644
--- a/static/admin/base.js
+++ b/static/admin/base.js
@@ -99,7 +99,6 @@ function showTab(name){
   if(name==='monitor'){loadMonitor();_monitorTimer=setInterval(loadMonitor,5000);}
   if(name==='tasks'){showSubTab('tasks',_activeSubs.tasks);loadTasks();loadCustomActions();}
   if(name==='tools'){showSubTab('tools',_activeSubs.tools);loadToolsDevices();loadAdbDevices();loadTailscaleDevices();loadApks();}
-  if(name==='groups')loadGroups();
   if(name==='logs'){loadLogs();if(document.getElementById('log-auto').checked)_logTimer=setInterval(loadLogs,3000);}
   if(name==='users')loadUsers();
 }
@@ -114,6 +113,7 @@ function showSubTab(tabId, name){
   const tab = document.getElementById('tab-'+tabId);
   tab.querySelectorAll('.sub-tab').forEach(b=>b.classList.toggle('active', b.dataset.sub===name));
   tab.querySelectorAll('.sub-panel').forEach(p=>p.classList.toggle('active', p.id===tabId+'-sub-'+name));
+  if(name==='groups' && typeof loadGroups==='function') loadGroups();
   if(name==='devpool' && typeof loadDevPool==='function'){
     loadDevPool();
     if(typeof loadDiscovery==='function'){
diff --git a/templates/admin/monitor.html b/templates/admin/monitor.html
index 93c4534..9f3f432 100644
--- a/templates/admin/monitor.html
+++ b/templates/admin/monitor.html
@@ -313,7 +313,6 @@ body{background:var(--bg);font-family:var(--body);color:var(--text);font-size:14
   <div class="tabs">
     <button class="tab active" data-tab="monitor" onclick="showTab('monitor')">监控</button>
     <button class="tab" data-tab="tasks" onclick="showTab('tasks')">任务</button>
-    <button class="tab" data-tab="groups" onclick="showTab('groups')">分组</button>
     <button class="tab" data-tab="logs" onclick="showTab('logs')" data-perm="logs">日志</button>
     <button class="tab" data-tab="users" onclick="showTab('users')" data-perm="admin">用户</button>
     <button class="tab" data-tab="tools" onclick="showTab('tools')" data-perm="admin">工具</button>
@@ -423,23 +422,6 @@ body{background:var(--bg);font-family:var(--body);color:var(--text);font-size:14
 </div>
 
 <!-- ========== Tab 3: 分组 ========== -->
-<div id="tab-groups" class="tab-panel">
-  <div class="page-title">设备分组管理</div>
-  <div class="page-sub">管理设备分组，用于任务按分组执行</div>
-  <div class="toolbar">
-    <button class="btn btn-primary" onclick="openGroupModal()" data-perm="tasks">新建分组</button>
-    <button class="btn" onclick="loadGroups()">刷新</button>
-    <input class="form-control list-search" id="search-groups" placeholder="搜索分组名/描述...">
-  </div>
-  <table class="table">
-    <thead><tr>
-      <th data-sort="name" onclick="_lpSort('groups','name')">分组名</th><th>描述</th><th data-sort="count" onclick="_lpSort('groups','count')">设备数</th><th>设备列表</th><th>操作</th>
-    </tr></thead>
-    <tbody id="tb-groups"></tbody>
-  </table>
-  <div class="list-pager" id="pager-groups"></div>
-</div>
-
 <!-- ========== Tab 4: 日志 ========== -->
 <div id="tab-logs" class="tab-panel">
   <div class="page-title">日志查看</div>
@@ -497,6 +479,7 @@ body{background:var(--bg);font-family:var(--body);color:var(--text);font-size:14
     <button class="sub-tab" data-sub="appver" onclick="showSubTab('tools','appver')">应用版本管理</button>
     <button class="sub-tab" data-sub="devapps" onclick="showSubTab('tools','devapps')">设备已装应用</button>
     <button class="sub-tab" data-sub="devpool" onclick="showSubTab('tools','devpool')">设备池管理</button>
+    <button class="sub-tab" data-sub="groups" onclick="showSubTab('tools','groups')">设备分组</button>
   </div>
 
   <!-- 子分栏 1：剪贴板注入 -->
@@ -701,6 +684,24 @@ body{background:var(--bg);font-family:var(--body);color:var(--text);font-size:14
     </div>
   </div>
 
+  <!-- 子分栏：设备分组（原顶级 tab，移到工具页） -->
+  <div class="sub-panel" id="tools-sub-groups">
+    <div class="toolbar">
+      <button class="btn btn-primary" onclick="openGroupModal()" data-perm="tasks">新建分组</button>
+      <button class="btn" onclick="loadGroups()">刷新</button>
+      <input class="form-control list-search" id="search-groups" placeholder="搜索分组名/描述...">
+      <span id="groups-status" class="text-muted"></span>
+    </div>
+    <table class="table table-hover table-sm" style="margin-top:8px">
+      <thead><tr>
+        <th data-sort="name" onclick="_lpSort('groups','name')">分组名</th><th>描述</th><th data-sort="count" onclick="_lpSort('groups','count')">设备数</th><th>设备列表</th><th>操作</th>
+      </tr></thead>
+      <tbody id="tb-groups"></tbody>
+    </table>
+    <div class="list-pager" id="pager-groups"></div>
+    <div class="help">管理设备分组，用于任务按分组执行。分组内的设备需先在<b>设备池管理</b>中确认（不在池内的设备不参与调度）。</div>
+  </div>
+
 </div>
 
 </div><!-- /.content -->