From f35144f3f185ff48677bc92457470ae61a475d19 Mon Sep 17 00:00:00 2001
From: hmo <staymo7777@gmail.com>
Date: Wed, 22 Jul 2026 10:53:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=9B=AF=E7=9B=98):=20=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E5=8C=BA=E5=85=A8=E5=B1=95=E7=A4=BA+=E5=8F=AF=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C/=E6=8E=92=E9=98=9F=E5=BE=BD=E7=AB=A0=EF=BC=88?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=86=85=E6=A0=87=E5=8F=AF=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E9=99=8D=E7=BA=A7=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server.py         | 16 +++++++++-------
 static/index.html | 13 +++++++++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/server.py b/server.py
index d9432395..e0c5c4d5 100644
--- a/server.py
+++ b/server.py
@@ -229,17 +229,19 @@ def get_watch():
 
     _cands = [d for d in results if d['sort_group'] == 0 and _is_fresh(d)]
     _cands.sort(key=lambda x: x.get('rr_ratio') or 0, reverse=True)
-    _selected, _cum = [], 0.0
+    # 现金预算内标记"可执行"，预算外标记"排队"（不再降级隐藏）
+    _cum = 0.0
     for d in _cands:
         pct = _sugg_pct(d)
-        if len(_selected) < 5 and _cum + pct <= _budget_pct + 1e-9:
-            d['suggested_position_pct'] = pct
+        d['suggested_position_pct'] = pct
+        if _cum + pct <= _budget_pct + 1e-9:
+            d['rec_exec'] = True   # 可执行
             _cum += pct
-            _selected.append(d)
-    _sel_codes = {d['code'] for d in _selected}
+        else:
+            d['rec_exec'] = False  # 排队（现金不足）
+    # 落选（tag 但非新鲜）仍降回自然分组；新鲜者全部留在推荐区
     for d in results:
-        if d['sort_group'] == 0 and d['code'] not in _sel_codes:
-            # 落选：降回自然分组
+        if d['sort_group'] == 0 and not _is_fresh(d):
             d['sort_group'] = 1 if d['decision_type'] == '持仓策略' else 2
 
     # 排序：group → signal_rank → group-internal (持仓按position_pct desc, 自选按rr desc)
diff --git a/static/index.html b/static/index.html
index 2f763e1d..03623f30 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1519,9 +1519,18 @@ async function renderWatch() {
         // 当前操作策略摘要
         const strat = fmtStrategy(s);
 
-        // 推荐行高亮
+        // 推荐行高亮 + 可执行/排队徽章
         const rowCls = isRec ? 'bg-amber-900/15 border-l-2 border-l-amber-400' : 'border-b border-slate-800/30 hover:bg-slate-800/20';
-        const recBadge = isRec ? '<span class="text-xs px-1.5 py-0.5 rounded bg-amber-500/20 text-amber-400 ml-1">🔥推荐</span>' : '';
+        let recBadge = '';
+        if (isRec) {
+          if (s.rec_exec === true) {
+            recBadge = '<span class="text-xs px-1.5 py-0.5 rounded bg-green-500/20 text-green-400 ml-1">💰可执行</span>';
+          } else if (s.rec_exec === false) {
+            recBadge = '<span class="text-xs px-1.5 py-0.5 rounded bg-slate-500/20 text-slate-400 ml-1">⏳排队</span>';
+          } else {
+            recBadge = '<span class="text-xs px-1.5 py-0.5 rounded bg-amber-500/20 text-amber-400 ml-1">🔥推荐</span>';
+          }
+        }
 
         // 推荐行策略文本加粗醒目
         const stratCls = isRec ? 'font-semibold text-amber-200' : 'text-slate-300';