明确原策略总览口径并同步持仓预览数据

This commit is contained in:
baobao 2026-10-27 14:38:56 +08:00
parent c0f67f7dfa
commit 85b76c2402
2 changed files with 19 additions and 10 deletions

View File

@ -993,12 +993,12 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<div class="m"><div class="k">账户总资产<span class="help" data-tip="采用账户资金快照中的总资产,包含账户现金和持仓估值;与用户设定的策略总规模不同。">?</span></div><div class="v">{{ money(ov.total_asset) }}</div></div>
<div class="m"><div class="k">可用资金<span class="muted" v-if="ov.cash_source!=='ws'"> (估算)</span><span class="help" :data-tip="ov.cash_source==='ws' ? '采用账户报告的可用余额,已含可用的卖出回笼,不重复相加。账户冻结资金 ' + money(ov.frozen_cash) + ' 元。' : '账户资金暂不可用,此处仅按策略总规模减行情估值展示估算余额,不能视为账户可用资金。'">?</span></div>
<div class="v" :class="ov.cash_source==='ws'?'':'muted'">{{ money(ov.cash_source==='ws' ? ov.cash_avail : ov.cash_est) }}</div></div>
<div class="m"><div class="k">账户持仓市值<span class="help" :data-tip="'与总资产、可用资金采用同一份账户快照。持仓明细按行情估值,当前为 ' + money(ov.portfolio_mv) + ' 元;两者可能因估值价格不同而有差异。'">?</span></div><div class="v">{{ money(ov.account_market_value) }}</div></div>
<div class="m"><div class="k" style="flex-wrap:wrap">策略仓位<span class="help" style="flex-shrink:0" :data-tip="'按持仓行情估值 ' + money(ov.portfolio_mv) + ' 元除以用户设定总规模 ' + money(ov.scale) + ' 元计算,仓位纪律沿用此口径。'">?</span><span class="muted" style="margin-left:4px">上限 {{ pct(ov.portfolio_cap) }}</span></div>
<div class="m"><div class="k">账户持仓市值<span class="help" :data-tip="'与总资产、可用资金采用同一份账户快照。原策略持仓按行情估值,当前为 ' + money(ov.portfolio_mv) + ' 元;两者可能因估值价格不同而有差异。'">?</span></div><div class="v">{{ money(ov.account_market_value) }}</div></div>
<div class="m"><div class="k" style="flex-wrap:wrap">原策略仓位<span class="help" style="flex-shrink:0" :data-tip="'按原策略持仓行情估值 ' + money(ov.portfolio_mv) + ' 元除以用户设定总规模 ' + money(ov.scale) + ' 元计算,仓位纪律沿用此口径。'">?</span><span class="muted" style="margin-left:4px">上限 {{ pct(ov.portfolio_cap) }}</span></div>
<div class="v">{{ pct(ov.portfolio_pct) }}</div></div>
<div class="m"><div class="k">持仓综合盈亏<span class="help" data-tip="按摊薄成本计算,包含当前持仓对应股票此前卖出已实现的盈亏,不等于剩余股份的浮动盈亏。">?</span></div>
<div class="m"><div class="k">原策略持仓盈亏<span class="help" data-tip="按摊薄成本计算,包含当前持仓对应股票此前卖出已实现的盈亏,不等于剩余股份的浮动盈亏。">?</span></div>
<div class="v" :class="(ov.float_pnl||0)>=0?'up':'down'">{{ money(ov.float_pnl) }}<span style="font-size:12px"> {{ ov.float_pnl_pct==null?'':pct(ov.float_pnl_pct) }}</span></div></div>
<div class="m"><div class="k">持仓只数<span class="muted" style="margin-left:4px">上限 {{ ov.max_names }}</span></div>
<div class="m"><div class="k">原策略只数<span class="muted" style="margin-left:4px">上限 {{ ov.max_names }}</span></div>
<div class="v">{{ ov.names_count }}</div></div>
<div class="m" style="cursor:pointer" @click="openRailSide('r')"><div class="k">待确认提议</div>
<div class="v" :class="proposals.length?'up':''">{{ proposals.length }}<span class="muted" style="font-size:12px"> 条</span></div></div>
@ -1579,17 +1579,17 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<div v-show="mode==='ops'" class="ops-wrap">
<div class="metrics">
<div class="m"><div class="k">总规模</div><div class="v">{{ money(ov.scale) }}</div></div>
<div class="m"><div class="k">组合市值</div><div class="v">{{ money(ov.portfolio_mv) }}</div></div>
<div class="m"><div class="k">总仓位</div>
<div class="m"><div class="k">原策略市值</div><div class="v">{{ money(ov.portfolio_mv) }}</div></div>
<div class="m"><div class="k">原策略仓位</div>
<div class="v">{{ pct(ov.portfolio_pct) }}<span class="muted"> / {{ pct(ov.portfolio_cap) }}</span></div></div>
<div class="m"><div class="k">可用额度</div><div class="v">{{ money(ov.cap_room) }}</div></div>
<div class="m"><div class="k">原策略额度</div><div class="v">{{ money(ov.cap_room) }}</div></div>
<div class="m"><div class="k">账户可用<span class="muted" v-if="ov.cash_source!=='ws'"> (估算)</span></div>
<div class="v" :class="ov.cash_source==='ws'?'':'muted'">{{ money(ov.cash_source==='ws' ? ov.cash_avail : ov.cash_est) }}</div></div>
<div class="m"><div class="k">持仓数</div>
<div class="m"><div class="k">原策略只数</div>
<div class="v">{{ ov.names_count }}<span class="muted"> / {{ ov.max_names }}</span></div></div>
<div class="m"><div class="k">持仓综合盈亏<span class="help" data-tip="按摊薄成本计算,包含当前持仓对应股票此前卖出已实现的盈亏,不等于剩余股份的浮动盈亏。">?</span></div>
<div class="m"><div class="k">原策略持仓盈亏<span class="help" data-tip="按摊薄成本计算,包含当前持仓对应股票此前卖出已实现的盈亏,不等于剩余股份的浮动盈亏。">?</span></div>
<div class="v" :class="(ov.float_pnl||0)>=0?'up':'down'">{{ money(ov.float_pnl) }}</div></div>
<div class="m"><div class="k">厚垫 / 负垫</div>
<div class="m"><div class="k">原策略厚垫 / 负垫</div>
<div class="v">{{ ov.solid_names }} / {{ ov.neg_names }}</div></div>
</div>

View File

@ -158,7 +158,16 @@ def strategies(include_archived: bool = False):
@app.get("/api/positions")
def positions():
rows = [{**p, "book_id": "original"} for p in POSITIONS]
held = [p for p in rows if p["total_qty"] > 0]
return {"ok": True, "positions": POSITIONS, "stock_params": {},
"strategy_groups": [
{"book_id": "original", "name": "原策略", "positions": rows, "held": held,
"ready": True, "price_missing": [], "totals": {"names_count": len(held),
"market_value": sum(p["market_value"] for p in held),
"pnl": sum(p["market_value"] - p["avg_cost"] * p["total_qty"] for p in held)}},
{"book_id": "micro30", "name": "微盘30股", "positions": [], "held": [],
"ready": True, "price_missing": [], "totals": {"names_count": 0, "market_value": 0, "pnl": 0}}],
"summary": {"total_scale": 2000000.0, "market_value": sum(p["market_value"] for p in POSITIONS)}}