统一策略名称并将持仓改为双标签页

This commit is contained in:
baobao 2026-10-27 14:55:50 +08:00
parent 9d1e455792
commit 98a58d165a
4 changed files with 39 additions and 34 deletions

View File

@ -26,7 +26,7 @@ CASH_WS, CASH_EST = "ws", "estimate"
def position_groups(original_view: dict) -> list:
"""页面按策略展示;保留原策略快照和交易计算的默认范围。"""
"""页面按策略展示;保留主观量化快照和交易计算的默认范围。"""
from config.settings import settings
def group(book, name, view, *, ready=True):
@ -40,17 +40,17 @@ def position_groups(original_view: dict) -> list:
"market_value": totals.get("portfolio_mv", 0) if ready else None,
"pnl": totals.get("float_pnl", 0) if ready and not missing else None}}
result = [group(books.ORIGINAL, "原策略", original_view)]
result = [group(books.ORIGINAL, "主观量化", original_view)]
if not settings.INFRA_STRATEGY_BOOK_SCHEMA:
result.append(group(books.MICRO, "微盘30股", {}))
result.append(group(books.MICRO, "微盘轮动", {}))
return result
try:
with books.scope(books.MICRO):
micro = positions_view()
result.append(group(books.MICRO, "微盘30股", micro))
result.append(group(books.MICRO, "微盘轮动", micro))
except Exception:
logger.exception("微盘持仓读取失败")
result.append(group(books.MICRO, "微盘30股", {}, ready=False))
result.append(group(books.MICRO, "微盘轮动", {}, ready=False))
return result

View File

@ -346,9 +346,9 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
/* 持仓表 (2026-09-15 重排): 操作列折叠成一枚「⋯」(58 像素), 仍用 fixed="right" 钉住 —— 表格放得下时它就在原位,
中栏比表格窄时其余列横向滚动、它始终可点; 原来三枚按钮钉住 172 像素, 会盖住「状态 · 下一步」。
状态芯片一行、「下一步」短语一行放下, 具体说明进悬停。 */
.position-book + .position-book{margin-top:20px;padding-top:16px;border-top:1px solid var(--line);}
.position-tabs > .el-tabs__header{margin-bottom:8px;}
.position-tabs .tabn{margin-left:6px;}
.book-heading{display:flex;align-items:center;flex-wrap:wrap;gap:8px 18px;margin:10px 0;}
.book-heading h4{margin:0;font-size:14px;}
.book-heading .book-stat{font-size:12px;color:var(--muted);}
.postbl .el-scrollbar__wrap{overflow-x:auto;}
/* 钉住的列要不透明, 否则滚动时下面那列的文字会透上来 (表格背景被设成了 transparent) */
@ -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>
@ -1013,12 +1013,13 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<!-- 持仓: 操作折叠成一枚「⋯」, 表格在中栏放得下; 比中栏还宽时横向滚动 -->
<div class="panel tblk postbl" id="t-pos">
<h3>持仓 <span class="muted" style="font-weight:400">· 按策略查看</span></h3>
<h3>持仓</h3>
<div class="sub2">占比按总操作规模计算。
<span class="help" data-tip="摊薄成本=(剩余批次买入金额-此前卖出已实现盈亏)÷剩余股数,不是券商买入均价。综合盈亏与安全垫均按摊薄成本计算;减仓后股数较少时,收益率可能明显放大。人工设定价仅随人工命令变更,系统参考位另见管理视图。">?</span></div>
<div v-for="group in positionGroups" :key="group.book_id" class="position-book" :data-book="group.book_id">
<el-tabs v-model="positionTab" class="position-tabs">
<el-tab-pane v-for="group in positionGroups" :key="group.book_id" :name="'hold-'+group.book_id" class="position-book" :data-book="group.book_id">
<template #label>{{ group.name }} <span class="tabn">{{ group.ready ? group.totals.names_count : '—' }}</span></template>
<div class="book-heading">
<h4>{{ group.name }} <span class="muted">· {{ group.ready ? group.totals.names_count + ' 只' : '待读取' }}</span></h4>
<span class="book-stat">持仓市值 {{ money(group.totals.market_value) }} 元<span v-if="group.price_missing.length">(含成本估值)</span></span>
<span class="book-stat" title="按本策略持仓的摊薄成本计算,包含这些持仓此前卖出已实现的盈亏。">持仓综合盈亏 <span :class="group.totals.pnl==null || group.totals.pnl===0 ? '' : group.totals.pnl>0 ? 'clr-up' : 'clr-down'">{{ money(group.totals.pnl) }}</span> 元</span>
</div>
@ -1145,7 +1146,8 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
</template>
</el-table-column>
</el-table>
</div>
</el-tab-pane>
</el-tabs>
</div>
<!-- 当日指令 -->
@ -1579,17 +1581,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>
@ -1826,10 +1828,11 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<!-- ==================== ③ 持仓与账本 ==================== -->
<el-tab-pane label="持仓与账本" name="pos">
<div class="panel">
<h3>持仓总览 · 按策略查看</h3>
<div v-for="group in positionGroups" :key="group.book_id" class="position-book" :data-book="group.book_id">
<h3>持仓总览</h3>
<el-tabs v-model="positionLedgerTab" class="position-tabs">
<el-tab-pane v-for="group in positionGroups" :key="group.book_id" :name="'ledger-'+group.book_id" class="position-book" :data-book="group.book_id">
<template #label>{{ group.name }} <span class="tabn">{{ group.ready ? group.totals.names_count : '—' }}</span></template>
<div class="book-heading">
<h4>{{ group.name }} <span class="muted">· {{ group.ready ? group.totals.names_count + ' 只' : '待读取' }}</span></h4>
<span class="book-stat">持仓市值 {{ money(group.totals.market_value) }} 元<span v-if="group.price_missing.length">(含成本估值)</span></span>
<span class="book-stat" title="按本策略持仓的摊薄成本计算,包含这些持仓此前卖出已实现的盈亏。">持仓综合盈亏 <span :class="group.totals.pnl==null || group.totals.pnl===0 ? '' : group.totals.pnl>0 ? 'clr-up' : 'clr-down'">{{ money(group.totals.pnl) }}</span> 元</span>
</div>
@ -1959,7 +1962,8 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
</template>
</el-table-column>
</el-table>
</div>
</el-tab-pane>
</el-tabs>
</div>
<div class="panel">
@ -2753,6 +2757,7 @@ createApp({
const health = ref({}), ov = ref({}), params = ref([]), paramsRaw = ref({});
const catalog = ref([]), commands = ref([]), plans = ref([]), plansOf = ref('');
const positions = ref([]), positionGroups = ref([]), lotsByPosition = ref({});
const positionTab = ref('hold-original'), positionLedgerTab = ref('ledger-original');
const positionKey = row => (row.book_id || 'original') + ':' + row.ts_code;
const lotsRequests = {};
const instructions = ref([]), ledger = ref([]), proposals = ref([]), preparingProposals = ref([]);
@ -4998,7 +5003,7 @@ createApp({
});
return { tab, loading, err, health, ov, params, catalog, commands, plans, plansOf,
positions, positionGroups, positionKey, lotsByPosition, instructions, ledger, ledgerToday, proposals, preparingProposals, report, reportDrawer,
positions, positionGroups, positionTab, positionLedgerTab, positionKey, lotsByPosition, instructions, ledger, ledgerToday, proposals, preparingProposals, report, reportDrawer,
opsDrawer, opsResult, opsLoading, issuing, form, curSpec, dirtyCount, dm,
money, pct, groupLabel, fieldLabel, stTag, cuTag, logicTag, canCancel, progPct, insPct,
scaleGap,

View File

@ -6,25 +6,25 @@
.card{min-width:0}.small{overflow-wrap:anywhere}header{gap:12px;flex-wrap:wrap}header>div,.grid>div{min-width:0}th,td{white-space:nowrap}
</style></head>
<body><main>
<header><div><h1>策略轮换</h1><div class="sub">原主观量化策略与微盘30股策略共用账户,分别记录。</div></div><div><a href="/">返回工作台</a><button id="refresh">刷新</button></div></header>
<header><div><h1>策略轮换</h1><div class="sub">主观量化与微盘轮动共用账户,分别记录。</div></div><div><a href="/">返回工作台</a><button id="refresh">刷新</button></div></header>
<div class="card warning" id="errors"></div>
<div class="grid"><section class="card"><div class="label">运行档位</div><div class="metric" id="mode">读取中</div><div class="sub" id="control"></div></section><section class="card"><div class="label">账户资金使用阶段</div><div class="metric" id="phase">读取中</div><div class="sub" id="reason"></div></section><section class="card"><div class="label">名单与数据日期</div><div class="metric" id="count">—</div><div class="sub" id="date"></div></section></div>
<section class="card"><h2>宏观信号</h2><div class="grid"><div><div class="label">成长主线瓦解</div><div class="metric" id="growth">—</div></div><div><div class="label">微盘活跃度历史位置</div><div class="metric" id="percentile">—</div></div><div><div class="label">本次判断</div><div class="metric" id="signal">—</div></div></div><p class="sub">成长主线瓦解或低于历史5%分位时入场,高于历史95%分位时退出。中证2000成交活跃度用于观察市场状态。股汇对冲指标只作用于原策略。</p><div class="small sub" id="version"></div></section>
<section class="card"><h2>宏观信号</h2><div class="grid"><div><div class="label">成长主线瓦解</div><div class="metric" id="growth">—</div></div><div><div class="label">微盘活跃度历史位置</div><div class="metric" id="percentile">—</div></div><div><div class="label">本次判断</div><div class="metric" id="signal">—</div></div></div><p class="sub">成长主线瓦解或低于历史5%分位时入场,高于历史95%分位时退出。中证2000成交活跃度用于观察市场状态。股汇对冲指标只作用于主观量化。</p><div class="small sub" id="version"></div></section>
<section class="card"><h2>目标名单与实际进度</h2><p class="sub">目标固定30只。未完成建仓或尚未卖出的调出成员,会使实际数量暂时偏离30只。保留成员不重新等权。</p><p id="progress" class="sub"></p><div class="scroll"><table><thead><tr><th>排名</th><th>代码</th><th>名称</th><th>总市值(亿元)</th><th>收盘价</th><th>全日成交额(万元)</th><th>资格</th><th>实际股数</th><th>名单变动</th><th>初始金额/日成交额</th></tr></thead><tbody id="members"></tbody></table></div><div class="warning" id="waits" hidden></div></section>
<section class="card"><h2>资金与收益记录</h2><div id="account" class="sub">尚无纸面或自动执行账本。</div><div class="scroll"><table><thead><tr><th>策略</th><th>资产</th><th>净投入</th><th>盈亏</th><th>单位净值</th><th>最大回撤</th><th>累计费用</th></tr></thead><tbody id="summary"></tbody></table><table><thead><tr><th>策略</th><th>股票</th><th>股数</th><th>账面成本</th><th>持仓权重</th><th>估值</th></tr></thead><tbody id="positions"></tbody></table></div><div id="reconcile" class="small sub"></div><p class="small sub">历史30只研究收益不等于账户轮换收益。纸面结果单独记录,资金划拨不计为盈利。开盘窗口容量与实际成交偏差在执行后记录。</p></section>
<section class="card"><h2>验收与控制</h2><div class="warning" id="activation"></div><p class="sub">观察至少3个交易日,再纸面运行至少10个交易日。自动档需要回测、容量、账本、资金占用及页面验收完成。</p><div class="controls"><button data-mode="observe">观察</button><button data-mode="paper">纸面模拟</button><button data-mode="auto" id="automatic">自动执行</button><button data-action="pause_new">暂停新增</button><button data-action="pause_all">暂停全部</button><button data-action="run">恢复运行</button><button data-action="exit_disable">退出并停用</button></div><div class="small sub">控制操作需要系统管理员权限。退出并停用会产生卖出安排;观察和纸面档不会向QMT发单。</div></section>
</main><script>
const modes={observe:'观察',paper:'纸面模拟',auto:'自动执行'},phases={original:'原策略运行',entering_micro:'转入微盘',micro:'微盘运行',returning_original:'转回原策略'},controls={run:'运行',pause_new:'暂停新增',pause_all:'暂停全部',exit_disable:'退出并停用'};
const modes={observe:'观察',paper:'纸面模拟',auto:'自动执行'},phases={original:'主观量化运行',entering_micro:'转入微盘轮动',micro:'微盘轮动运行',returning_original:'转回主观量化'},controls={run:'运行',pause_new:'暂停新增',pause_all:'暂停全部',exit_disable:'退出并停用'};
const el=id=>document.getElementById(id),fmt=(x,n=2)=>x==null?'—':Number(x).toLocaleString('zh-CN',{maximumFractionDigits:n});
function cell(row,value){const td=document.createElement('td');td.textContent=value;row.append(td);return td}
function line(table,values){const tr=document.createElement('tr');values.forEach(v=>cell(tr,v));table.append(tr)}
async function request(url,options){const r=await fetch(url,options);if(r.status===401)throw Error('请先返回工作台登录');if(r.status===403)throw Error('此操作需要系统管理员权限');const v=await r.json();if(!r.ok||v.ok===false)throw Error(v.error||'请求失败');return v.data||v}
async function load(){try{const v=await request('/api/rotation'),s=v.snapshot||{},g=s.signal||{},st=v.state||{},a=st.account;el('errors').textContent=[...(v.errors||[]),...(s.errors||[]),...(!s.basket_ready?['目标名单尚未就绪,停止新增和换仓。']:[])].join('\n');el('mode').textContent=modes[v.mode]||'未知档位';el('control').textContent=controls[v.control]||'未知控制';el('phase').textContent=phases[v.phase]||'等待状态';el('reason').textContent=(st.rotation||{}).reason||'等待有效信号';el('count').textContent=(s.members||[]).length+' / 30';el('date').textContent=s.data_date?('数据 '+s.data_date+' · 执行 '+s.effective_date+' · '+(s.frozen?'已冻结':'未冻结')):'尚无快照';el('growth').textContent=s.signal_ready?(g.growth_break?'已触发':'未触发'):'数据未就绪';el('percentile').textContent=g.activity_percentile==null?'—':fmt(g.activity_percentile*100)+'%';el('signal').textContent=!s.signal_ready?'等待数据':g.high?'高位退出':g.low?'极低位入场':g.growth_break?'成长瓦解入场':'保持当前阶段';el('version').textContent='规则 '+(s.rule_version||v.rule_version)+' · 快照 '+(s.snapshot_version||'暂无');el('members').replaceChildren();(s.members||[]).forEach(m=>line(el('members'),[m.rank,m.code,m.name,fmt(m.total_mv_wan/10000),fmt(m.close),fmt(m.daily_amount_yuan/10000),m.eligible?'通过':'未通过']));el('waits').hidden=!(st.blocked||[]).length;el('waits').textContent=(st.blocked||[]).join('\n');el('positions').replaceChildren();if(a){el('account').textContent='纸面可用现金 '+fmt(a.cash)+' 元 · 最近估值 '+fmt(st.nav)+' 元 · 初始化 '+a.seeded_at;Object.entries(a.books||{}).forEach(([book,rows])=>Object.entries(rows).filter(([,p])=>p.qty).forEach(([code,p])=>line(el('positions'),[book==='micro30'?'微盘30股':'原策略',code,p.qty,fmt(p.cost),fmt(a.realized[book]),fmt(a.fees[book])])))}else el('account').textContent='尚无纸面或自动执行账本。';el('activation').textContent=(v.activation_errors||[]).join('\n')||'自动执行的前置验收已完成。';el('automatic').disabled=!!(v.activation_errors||[]).length;renderDetails(v)}catch(e){el('errors').textContent=e.message}}
async function load(){try{const v=await request('/api/rotation'),s=v.snapshot||{},g=s.signal||{},st=v.state||{},a=st.account;el('errors').textContent=[...(v.errors||[]),...(s.errors||[]),...(!s.basket_ready?['目标名单尚未就绪,停止新增和换仓。']:[])].join('\n');el('mode').textContent=modes[v.mode]||'未知档位';el('control').textContent=controls[v.control]||'未知控制';el('phase').textContent=phases[v.phase]||'等待状态';el('reason').textContent=(st.rotation||{}).reason||'等待有效信号';el('count').textContent=(s.members||[]).length+' / 30';el('date').textContent=s.data_date?('数据 '+s.data_date+' · 执行 '+s.effective_date+' · '+(s.frozen?'已冻结':'未冻结')):'尚无快照';el('growth').textContent=s.signal_ready?(g.growth_break?'已触发':'未触发'):'数据未就绪';el('percentile').textContent=g.activity_percentile==null?'—':fmt(g.activity_percentile*100)+'%';el('signal').textContent=!s.signal_ready?'等待数据':g.high?'高位退出':g.low?'极低位入场':g.growth_break?'成长瓦解入场':'保持当前阶段';el('version').textContent='规则 '+(s.rule_version||v.rule_version)+' · 快照 '+(s.snapshot_version||'暂无');el('members').replaceChildren();(s.members||[]).forEach(m=>line(el('members'),[m.rank,m.code,m.name,fmt(m.total_mv_wan/10000),fmt(m.close),fmt(m.daily_amount_yuan/10000),m.eligible?'通过':'未通过']));el('waits').hidden=!(st.blocked||[]).length;el('waits').textContent=(st.blocked||[]).join('\n');el('positions').replaceChildren();if(a){el('account').textContent='纸面可用现金 '+fmt(a.cash)+' 元 · 最近估值 '+fmt(st.nav)+' 元 · 初始化 '+a.seeded_at;Object.entries(a.books||{}).forEach(([book,rows])=>Object.entries(rows).filter(([,p])=>p.qty).forEach(([code,p])=>line(el('positions'),[book==='micro30'?'微盘轮动':'主观量化',code,p.qty,fmt(p.cost),fmt(a.realized[book]),fmt(a.fees[book])])))}else el('account').textContent='尚无纸面或自动执行账本。';el('activation').textContent=(v.activation_errors||[]).join('\n')||'自动执行的前置验收已完成。';el('automatic').disabled=!!(v.activation_errors||[]).length;renderDetails(v)}catch(e){el('errors').textContent=e.message}}
function renderDetails(v){
const st=v.state||{},a=st.account,s=v.snapshot||{},p=st.progress||{},metrics=st.metrics||(v.accounting||{}).metrics||{};
const names={original:'原策略',micro30:'微盘30股',account:'全账户'};
const names={original:'主观量化',micro30:'微盘轮动',account:'全账户'};
const positions=a?Object.entries(a.books||{}).flatMap(([book,rows])=>Object.entries(rows).filter(([,p])=>p.qty).map(([code,p])=>({book_id:book,code,qty:p.qty,cost:p.cost,market_value:null}))):((v.accounting||{}).positions||[]);
el('progress').textContent='股票预算上限 '+fmt(v.stock_budget)+' 元 · 原策略剩余 '+fmt(p.original_market_value)+' 元 · 微盘已建 '+fmt(p.micro_market_value)+' 元 · 可用现金 '+fmt(p.available_cash)+' 元 · 观察 '+(v.observed_days||0)+' 日 · 健康纸面 '+(v.paper_days||0)+' 日';
el('progress').textContent='股票预算上限 '+fmt(v.stock_budget)+' 元 · 主观量化剩余 '+fmt(p.original_market_value)+' 元 · 微盘轮动已建 '+fmt(p.micro_market_value)+' 元 · 可用现金 '+fmt(p.available_cash)+' 元 · 观察 '+(v.observed_days||0)+' 日 · 健康纸面 '+(v.paper_days||0)+' 日';
el('members').replaceChildren();const target=new Set((s.members||[]).map(x=>x.code));
(s.members||[]).forEach(m=>{const held=positions.find(x=>x.book_id==='micro30'&&x.code===m.code);line(el('members'),[m.rank,m.code,m.name,fmt(m.total_mv_wan/10000),fmt(m.close),fmt(m.daily_amount_yuan/10000),s.basket_ready&&m.eligible?'通过':'待核实',held?held.qty:'—',!positions.length?'待建仓':held?'保留':'调入',m.daily_amount_yuan?fmt(v.stock_budget/30/m.daily_amount_yuan*100)+'%':'未知']);});
positions.filter(x=>x.book_id==='micro30'&&!target.has(x.code)).forEach(x=>line(el('members'),['—',x.code,'残余持仓','—','—','—','等待卖出',x.qty,'调出','—']));

View File

@ -162,11 +162,11 @@ def 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,
{"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": [],
{"book_id": "micro30", "name": "微盘轮动", "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)}}