diff --git a/evolution/evolution_api.py b/evolution/evolution_api.py index 6238d802..ac754e51 100644 --- a/evolution/evolution_api.py +++ b/evolution/evolution_api.py @@ -119,6 +119,7 @@ def get_combo_dashboard(): res = json.loads(r[0]) s = res.get("summary", {}) pf = s.get("portfolio_full", {}) + p5 = s.get("portfolio", {}) members[v] = { "role": "趋势市主战" if v == "v_next4" else "震荡/下跌市接管", "trades": s.get("total_trades"), @@ -129,6 +130,9 @@ def get_combo_dashboard(): "return_pct": pf.get("total_return_pct"), "max_dd_pct": pf.get("portfolio_max_dd_pct"), "universality": s.get("universality", {}), + # 组合模拟实际执行笔数(扣费后) + 年均(手工可行性参考) + "positions_taken_5slot": p5.get("positions_taken"), + "positions_taken_full": pf.get("positions_taken"), } conn.close() diff --git a/static/index.html b/static/index.html index 142f314e..b8a1ddaa 100644 --- a/static/index.html +++ b/static/index.html @@ -2084,20 +2084,28 @@ async function renderResearchCombo() { // ── 2. 组合成员策略指标 ── const members = d.members || {}; if (Object.keys(members).length) { - h += '