diff --git a/DEVLOG.md b/DEVLOG.md
index 483b99f..6d8355b 100644
--- a/DEVLOG.md
+++ b/DEVLOG.md
@@ -2915,3 +2915,7 @@ PMS最终代码56db0fd已推送,155 web/WS/beat为execution-2b1c447,worker
总览增加双策略账户累计盈亏,标明实际初始化起点与未回报费用待补,估值缺失不伪装为零。消息分类统一再次点击收起,栏头和展开内容整体吸顶,侧栏高度随实际布局调整,修复滚动到底部及自动刷新时内容挤入顶部。开发机账务专项与页面三道护栏通过,1440、390、320隔离真实响应复现通过,所有写请求拒绝。仅安排155的pms-web定向发布,详见[修复接续](docs/账户盈亏与消息布局修复_2026-11-09.md)。
10:32:01补记:155仅pms-web发布`pms:overview-layout-60a9709`,开发机与候选各80批全量隔离回归通过。其他18容器和私有配置保持;实际页面哈希匹配,真实累计盈亏字段ready=true,统计起点11月2日。10:32:21确认1732281与落库一致,最近200条连续,待入账和孤儿0,数量对账通过、现金差0。浏览器1440/390/320验收为隔离真实响应复现,未造业务事件或长期观察。证据见上述接续。
+
+## 2026-11-09 多策略盈亏比例与四方网格核验
+
+按用户反馈统一累计盈亏、合计持仓盈亏的金额及比例,悬浮按策略展示,缺数与零分母留空。开发机80批、专项22例及三道页面护栏通过,桌面与390/320隔离真实响应复现通过。四方股份只读发现网格同一边界上下穿越即买卖的索引缺陷,31.37买1000、31.38发卖700已在断网内存环境复现;10:45卖单尚未成交,费用未知。页面按真实来源改称网格加仓/减仓;本次不改交易逻辑和在途订单。发布与后续边界见[接续](docs/多策略盈亏与四方网格核验_2026-11-09.md)。
diff --git a/app/services/portfolio.py b/app/services/portfolio.py
index 98582e0..b139535 100644
--- a/app/services/portfolio.py
+++ b/app/services/portfolio.py
@@ -39,6 +39,8 @@ def position_groups(original_view: dict) -> list:
"ready": ready, "price_missing": missing,
"totals": {"names_count": len(held),
"market_value": totals.get("portfolio_mv", 0) if ready else None,
+ "cost_basis": totals.get("cost_basis", 0) if ready else None,
+ "pnl_pct": totals.get("float_pnl_pct") if ready and not missing else None,
"pnl": totals.get("float_pnl", 0) if ready and not missing else None}}
result = [group(books.ORIGINAL, "主观量化", original_view)]
@@ -55,6 +57,25 @@ def position_groups(original_view: dict) -> list:
return result
+def holding_performance(groups: list) -> dict:
+ """合并各策略当前持仓,收益率按合计摊薄成本加权,不相加或平均百分比。"""
+ rows = []
+ for group in groups:
+ totals = group["totals"]
+ ready = group["ready"] and not group["price_missing"]
+ rows.append({"book_id": group["book_id"], "name": group["name"], "ready": ready,
+ "names_count": totals["names_count"],
+ "profit": totals["pnl"] if ready else None,
+ "profit_pct": totals["pnl_pct"] if ready else None,
+ "cost_basis": totals["cost_basis"] if ready else None})
+ ready = bool(rows) and all(row["ready"] for row in rows)
+ profit = sum(row["profit"] for row in rows) if ready else None
+ cost = sum(row["cost_basis"] for row in rows) if ready else None
+ return {"ready": ready, "profit": round(profit, 2) if ready else None,
+ "profit_pct": profit / cost if ready and cost > 0 else None,
+ "strategies": rows, "reason": None if ready else "部分策略持仓估值待补齐"}
+
+
def position_lots(ts_code: str, book_id: str, status: str | None) -> list:
"""同名股票按策略查看批次;旧表未迁移时微盘必须为空。"""
from config.settings import settings
@@ -218,8 +239,9 @@ def positions_view(*, with_price: bool = True) -> dict:
"cash_age_sec": cash["age_sec"], "cash_why": cash["why"],
"total_asset": cash["total_asset"],
"account_market_value": cash["account_market_value"], "frozen_cash": cash["frozen_cash"],
- "float_pnl": round(port_mv - cost_sum, 2) if cost_sum else 0.0,
+ "float_pnl": round(port_mv - cost_sum, 2),
"float_pnl_pct": round(port_mv / cost_sum - 1, 4) if cost_sum > 0 else None,
+ "cost_basis": round(cost_sum, 2),
"sector_names": sector_names, "sector_mv": sector_mv,
"solid_names": len([x for x in held if x["cushion_state"] == "SOLID"]),
"neg_names": len([x for x in held if (x["cushion_pct"] or 0) < 0]),
@@ -262,7 +284,7 @@ def caps_ctx(view: dict, *, ts_code=None, is_new_name=False, sector=None) -> dic
def account_performance() -> dict:
"""只读账户累计盈亏,使用双策略现金账本的初始化基线。"""
from config.settings import settings
- empty = {"ready": False, "profit": None, "started_at": None,
+ empty = {"ready": False, "profit": None, "profit_pct": None, "started_at": None,
"reason": "账户收益基线尚未建立"}
if not settings.INFRA_STRATEGY_BOOK_SCHEMA:
return empty
@@ -277,10 +299,14 @@ def account_performance() -> dict:
if difference is not None and abs(difference) > .02:
empty["reason"] = "账户现金与策略账本待核对"
return empty
- profit = (view.get("metrics") or {}).get("account", {}).get("profit")
+ metrics = view.get("metrics") or {}
+ profit = metrics.get("account", {}).get("profit")
if profit is None or not math.isfinite(profit):
return empty
+ capitals = [metrics.get(book, {}).get("net_capital") for book in (books.ORIGINAL, books.MICRO)]
+ capital = sum(capitals) if all(v is not None and math.isfinite(v) for v in capitals) else None
return {"ready": True, "profit": round(profit, 2),
+ "profit_pct": profit / capital if capital is not None and capital > 0 else None,
"started_at": view.get("started_at"), "reason": None}
except Exception:
logger.exception("账户累计盈亏读取失败")
@@ -306,6 +332,7 @@ def overview() -> dict:
"cash_avail": t["cash_avail"], "cash_source": t["cash_source"],
"total_asset": t["total_asset"], "cash_why": t["cash_why"],
"account_performance": account_performance(),
+ "holding_performance": holding_performance(position_groups(v)),
"account_market_value": t["account_market_value"], "frozen_cash": t["frozen_cash"],
"float_pnl": t["float_pnl"],
"float_pnl_pct": t["float_pnl_pct"], "solid_names": t["solid_names"],
diff --git a/app/web/static/index.html b/app/web/static/index.html
index 1595410..881a739 100644
--- a/app/web/static/index.html
+++ b/app/web/static/index.html
@@ -79,7 +79,7 @@ body{margin:0;background:var(--plane);color:var(--ink);
.chip.stop{background:var(--stop-weak);color:var(--stop);} .chip.stop .dot{background:var(--stop);}
.help{display:inline-flex;align-items:center;justify-content:center;width:15px;height:15px;border-radius:50%;
border:1px solid var(--muted);color:var(--muted);font-size:10px;cursor:help;position:relative;font-weight:600;margin-left:3px;}
-.help:hover::after{content:attr(data-tip);position:absolute;left:0;top:150%;width:250px;background:var(--ink);color:#fff;
+.help[data-tip]:hover::after{content:attr(data-tip);position:absolute;left:0;top:150%;width:250px;background:var(--ink);color:#fff;
font-size:12px;font-weight:400;line-height:1.5;padding:8px 10px;border-radius:8px;z-index:50;box-shadow:0 6px 20px rgba(0,0,0,.22);}
/* KPI 焦点行 */
.metrics{display:grid;grid-template-columns:repeat(auto-fit,minmax(148px,1fr));gap:12px;margin:16px 0;}
@@ -88,6 +88,14 @@ body{margin:0;background:var(--plane);color:var(--ink);
.m .v{color:var(--ink);font-size:21px;font-weight:680;margin-top:5px;letter-spacing:-.2px;font-variant-numeric:tabular-nums;}
.m .v .muted,.m .v span{font-weight:500;}
.m .v.up{color:var(--up);} .m .v.down{color:var(--down);}
+.m .v.pnl-value{display:flex;align-items:baseline;flex-wrap:wrap;gap:3px 7px;white-space:normal;}
+.m .v.pnl-value .pnl-rate{font-size:12px;white-space:nowrap;}
+.pnl-popover{width:300px;max-width:calc(100vw - 48px);font-size:12px;line-height:1.65;}
+.pnl-popover .pnl-book{display:grid;grid-template-columns:1fr auto auto;gap:10px;align-items:baseline;padding:7px 0;border-bottom:1px solid var(--hair);font-variant-numeric:tabular-nums;}
+.pnl-popover .pnl-note{color:var(--muted);margin-top:9px;font-size:11px;}
+.pnl-popover b{font-weight:600;}
+.pnl-popover .up{color:var(--up);}.pnl-popover .down{color:var(--down);}.m .v.pnl-value.muted{color:var(--muted);}
+.pnl-card:focus-visible{outline:2px solid var(--accent);outline-offset:2px;}
/* 信号速览带 (2026-08-26): 全宽紧凑行, 高度受控内部滚动 */
.sigbrief{max-height:216px;overflow:auto}
.sb-row{display:flex;gap:8px;align-items:center;padding:2px 0;border-bottom:1px dashed rgba(128,128,128,.18)}
@@ -363,6 +371,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
.tmain .m .v{font-size:18px;margin-top:3px;white-space:nowrap;}
@container (max-width:1100px){ .tmain .metrics{grid-template-columns:repeat(4,minmax(0,1fr));} }
@container (max-width:560px){ .tmain .metrics{grid-template-columns:repeat(2,minmax(0,1fr));} }
+@container (max-width:220px){ .tmain .metrics{grid-template-columns:minmax(0,1fr);} }
.tmain .panel{padding:14px 16px;margin-bottom:13px;}
/* 持仓表 (2026-09-15 重排): 操作列折叠成一枚「⋯」(58 像素), 仍用 fixed="right" 钉住 —— 表格放得下时它就在原位,
中栏比表格窄时其余列横向滚动、它始终可点; 原来三枚按钮钉住 172 像素, 会盖住「状态 · 下一步」。
@@ -1087,15 +1096,27 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
账户总资产?
{{ money(ov.total_asset) }}
-
账户累计盈亏?
-
{{ accountPnlText }}
+
+ {{ accountPnlTip }}
+ 累计盈亏?
+
{{ pnlMoney(accountPnl.profit) }}{{ pnlPercent(accountPnl.profit_pct) }}
+
可用资金 (估算)?
{{ money(ov.cash_source==='ws' ? ov.cash_avail : ov.cash_est) }}
账户持仓市值?
{{ money(ov.account_market_value) }}
主观量化仓位?上限 {{ pct(ov.portfolio_cap) }}
{{ pct(ov.portfolio_pct) }}
-
主观量化持仓盈亏?
-
{{ money(ov.float_pnl) }} {{ ov.float_pnl_pct==null?'':pct(ov.float_pnl_pct) }}
+
+
+
各策略持仓盈亏
+
+ {{ book.name }}{{ pnlMoney(book.profit) }}{{ book.names_count===0 && book.ready ? '暂无持仓' : pnlPercent(book.profit_pct) }}
+
+
{{ holdingPnl.reason || '按当前持仓摊薄成本计算,包含这些持仓此前卖出已实现的盈亏;比例按各策略合计成本计算。' }}
+
+ 持仓盈亏?
+
{{ pnlMoney(holdingPnl.profit) }}{{ pnlPercent(holdingPnl.profit_pct) }}
+
主观量化只数上限 {{ ov.max_names }}
{{ ov.names_count }}
待确认提议
@@ -1261,7 +1282,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
未成交 {{ insLive.length }}
{{ nm(s.row.ts_code) }} {{ s.row.ts_code }}
- {{ tx('action', s.row.action) }} · {{ tx('side', s.row.side) }}
+ {{ instructionAction(s.row) }} · {{ tx('side', s.row.side) }}
{{ s.row.qty }} / {{ s.row.exec_qty||0 }}
{{ s.row.execution_limit||'—' }}
{{ s.row.execution_label || tx('insStatus', s.row.status) }}
@@ -1272,7 +1293,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
已成交 {{ insDone.length }}
{{ nm(s.row.ts_code) }} {{ s.row.ts_code }}
- {{ tx('action', s.row.action) }} · {{ tx('side', s.row.side) }}
+ {{ instructionAction(s.row) }} · {{ tx('side', s.row.side) }}
{{ s.row.qty }} / {{ s.row.exec_qty||0 }}
{{ s.row.execution_label || tx('insStatus', s.row.status) }}
@@ -1281,7 +1302,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
已终止 {{ insEnd.length }}
{{ nm(s.row.ts_code) }} {{ s.row.ts_code }}
- {{ tx('action', s.row.action) }} · {{ tx('side', s.row.side) }}
+ {{ instructionAction(s.row) }} · {{ tx('side', s.row.side) }}
{{ s.row.execution_label || tx('insStatus', s.row.status) }}
@@ -2173,7 +2194,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
- {{ tx('action', s.row.action) }}
+ {{ instructionAction(s.row) }}
@@ -5382,13 +5403,15 @@ createApp({
document.documentElement.style.removeProperty('--pms-' + key);
});
const accountPnl = computed(() => ov.value.account_performance || {profit:null});
- const accountPnlText = computed(() => accountPnl.value.profit == null ? '—' :
- (accountPnl.value.profit > 0 ? '+' : '') + Number(accountPnl.value.profit).toLocaleString('zh-CN', {minimumFractionDigits:2, maximumFractionDigits:2}));
+ const holdingPnl = computed(() => ov.value.holding_performance || {profit:null,profit_pct:null,strategies:[]});
+ const pnlMoney = value => value == null ? '—' : (value > 0 ? '+' : '') + Number(value).toLocaleString('zh-CN', {minimumFractionDigits:2, maximumFractionDigits:2});
+ const pnlPercent = value => value == null ? '—' : (value > 0 ? '+' : '') + (Number(value)*100).toFixed(2) + '%';
+ const pnlColor = value => value == null || value === 0 ? 'muted' : value > 0 ? 'up' : 'down';
const accountPnlTip = computed(() => {
const value = accountPnl.value;
if (!value.ready) return value.reason || '账户累计盈亏暂不可用';
const since = value.started_at ? '自' + String(value.started_at).slice(0,10) + '建立账户收益基线起,' : '';
- return since + '汇总主观量化与微盘轮动的已实现和持仓盈亏,内部划拨不计收益。已扣除入账费用,未回报费用待补。';
+ return since + '汇总各策略已实现和持仓盈亏,比例为累计盈亏除以账户净投入,内部划拨不计收益。已扣除入账费用,未回报费用待补。';
});
// 时间字段各表叫法不一, 取到哪个算哪个; 排序用 HHMMSS, 同一天内够用。
const _at = (r, keys) => { for (const k of keys) { const v = r && r[k]; if (v) return String(v); } return ''; };
@@ -5396,6 +5419,12 @@ createApp({
const _hms = s => { const m = String(s || '').match(/(\d{2}):(\d{2})(?::(\d{2}))?/);
return m ? (m[1] + m[2] + (m[3] || '00')) : ''; };
+ function instructionAction(row) {
+ const progress = row.progress || {};
+ if (progress.stype === 'GRID' && row.origin_type === 'strategy')
+ return row.side === 'sell' ? '网格减仓' : '网格加仓';
+ return tx('action', row.action);
+ }
function insBadge(r) {
if (r.execution_stage==='unknown') return '待核对';
if (r.execution_stage==='cancelling') return '撤单中';
@@ -5431,7 +5460,7 @@ createApp({
const t = _at(r, ['updated_at', 'created_at', 'at', 'dispatched_at']);
out.push({ kind:'order', badge:insBadge(r), time:_hm(t), sort:_hms(t), ts_code:r.ts_code,
book_id:r.book_id, ins_status:r.status,
- cat:tx('action', r.action) + ' · ' + (r.execution_label || tx('insStatus', r.status)),
+ cat:instructionAction(r) + ' · ' + (r.execution_label || tx('insStatus', r.status)),
strong:true, why:instructionBookName(r.book_id) + ' · ' + insWhy(r), goLabel:'看在办', go:'ins' });
}
// 3) 待确认提议 —— 自主档位是「只提议」时, 新提议在这里也提醒一次
@@ -5628,7 +5657,7 @@ createApp({
document.removeEventListener('keydown', _onEsc);
});
- return { headerRef, messagesRef, accountPnl, accountPnlText, accountPnlTip, broad, broadOpen, broadTab, broadDays, broadPeriod, broadSearch, broadSectorId,
+ return { headerRef, messagesRef, accountPnl, holdingPnl, pnlMoney, pnlPercent, pnlColor, accountPnlTip, instructionAction, broad, broadOpen, broadTab, broadDays, broadPeriod, broadSearch, broadSectorId,
broadMarket, broadDate, broadShortDate, broadAmount, broadColor, broadTail, broadRef, broadMetric,
broadIndexes, broadSectorRows, broadSelected, broadRanks, broadRankMax, broadSectorCounts, broadChart, openBroad,
flowShown, flowTotals, flowCoverageIncomplete, tab, loading, err, health, ov, params, catalog, commands, plans, plansOf,
diff --git a/docs/evidence/pnl-summary-ui-20261109/browser-checks.json b/docs/evidence/pnl-summary-ui-20261109/browser-checks.json
new file mode 100644
index 0000000..0a75231
--- /dev/null
+++ b/docs/evidence/pnl-summary-ui-20261109/browser-checks.json
@@ -0,0 +1,20 @@
+{
+ "widths": [
+ 1440,
+ 390,
+ 320
+ ],
+ "amountDigits": 2,
+ "percentDigits": 2,
+ "amountFont": "18px",
+ "percentFont": "12px",
+ "negativeGreen": true,
+ "positiveRed": true,
+ "strategyPopover": true,
+ "emptyStrategy": "0.00 暂无持仓",
+ "cardOverflow": false,
+ "pageOverflow": false,
+ "gridLabelAccurate": true,
+ "consoleErrors": [],
+ "acceptance": "11月9日10:32真实只读响应隔离复现,新统计字段由同一原始账本计算,写请求拒绝"
+}
\ No newline at end of file
diff --git a/docs/evidence/pnl-summary-ui-20261109/desktop.png b/docs/evidence/pnl-summary-ui-20261109/desktop.png
new file mode 100644
index 0000000..649ff17
Binary files /dev/null and b/docs/evidence/pnl-summary-ui-20261109/desktop.png differ
diff --git a/docs/evidence/pnl-summary-ui-20261109/mobile320.png b/docs/evidence/pnl-summary-ui-20261109/mobile320.png
new file mode 100644
index 0000000..fbf97ef
Binary files /dev/null and b/docs/evidence/pnl-summary-ui-20261109/mobile320.png differ
diff --git a/docs/evidence/pnl-summary-ui-20261109/mobile390.png b/docs/evidence/pnl-summary-ui-20261109/mobile390.png
new file mode 100644
index 0000000..6b41994
Binary files /dev/null and b/docs/evidence/pnl-summary-ui-20261109/mobile390.png differ
diff --git a/docs/evidence/sifang_grid_review_20261109.json b/docs/evidence/sifang_grid_review_20261109.json
new file mode 100644
index 0000000..54f611a
--- /dev/null
+++ b/docs/evidence/sifang_grid_review_20261109.json
@@ -0,0 +1,126 @@
+{
+ "checked_at": "2026-11-09T10:45:47.391796+08:00",
+ "scope": "pms-sim-155",
+ "prefix": "",
+ "writes_blocked": 0,
+ "strategy": {
+ "strategy_id": "STR_20261109_601126SH_188403",
+ "type": "GRID",
+ "params": {
+ "center": 31.39,
+ "lower": 30.116,
+ "upper": 32.825,
+ "step_pct": 0.02,
+ "per_lot": 1000,
+ "max_capital": 67730.61
+ },
+ "note": "自动挂载: 明确吸筹(评分 71.4, 结论日 20261106) → 网格 [30.116~32.825] 档距 2.0% 上限 67,731 元",
+ "created_at": "2026-11-09 09:40:04"
+ },
+ "today_instructions": [
+ {
+ "instruction_id": "STR20261109100402_601126SH_g",
+ "origin_type": "strategy",
+ "action": "TRIM",
+ "side": "sell",
+ "qty": 700,
+ "exec_qty": 0,
+ "status": "DISPATCHED",
+ "created_at": "2026-11-09 10:04:02",
+ "reason": "网格卖: 现价 31.38 涨破档1(买价 31.37), 卖 700 股",
+ "children": [
+ {
+ "ymd": 20261109,
+ "at": "10:04:02",
+ "qty": 700,
+ "limit": 31.32,
+ "mode": "ws",
+ "ref": "STR20261109100402_601126SH_g_D01",
+ "valid_until": "15:00",
+ "forced": false,
+ "reason": "分钟行情降级报价(无实时盘口)"
+ }
+ ]
+ },
+ {
+ "instruction_id": "STR20261109094705_601126SH_g",
+ "origin_type": "strategy",
+ "action": "ADD",
+ "side": "buy",
+ "qty": 1000,
+ "exec_qty": 1000,
+ "status": "CONFIRMED",
+ "created_at": "2026-11-09 09:47:06",
+ "reason": "网格买: 现价 31.37 跌破档1(档价 30.744), 买 1000 股",
+ "children": [
+ {
+ "ymd": 20261109,
+ "at": "09:47:05",
+ "qty": 1000,
+ "limit": 31.43,
+ "mode": "ws",
+ "ref": "STR20261109094705_601126SH_g_D01",
+ "valid_until": "15:00",
+ "forced": false,
+ "reason": "分钟行情降级报价(无实时盘口)"
+ }
+ ]
+ }
+ ],
+ "trades": [
+ {
+ "instruction_id": "STR20261109094705_601126SH_g_D01",
+ "trade_no": "T-DESK-5de8a23b10",
+ "side": "buy",
+ "qty": 1000,
+ "price": 31.37,
+ "amount": 31370.0,
+ "fee": null,
+ "trade_time": 1794189161950
+ },
+ {
+ "instruction_id": "INS_20261106_601126SH_OPEN_93200_D01",
+ "trade_no": "T-DESK-54a0bbe984",
+ "side": "buy",
+ "qty": 700,
+ "price": 31.15,
+ "amount": 21805.0,
+ "fee": null,
+ "trade_time": 1793929458535
+ }
+ ],
+ "reproduction": {
+ "isolated_replay": true,
+ "levels": [
+ 30.116,
+ 30.744,
+ 31.372,
+ 31.999,
+ 32.627
+ ],
+ "buy": {
+ "side": "buy",
+ "action": "ADD",
+ "qty": 1000,
+ "leg": "grid_buy:1",
+ "grid_buy_idx": 1,
+ "grid_buy_price": 31.37,
+ "reason": "网格买: 现价 31.37 跌破档1(档价 30.744), 买 1000 股"
+ },
+ "sell": {
+ "side": "sell",
+ "action": "TRIM",
+ "qty": 700,
+ "leg": "grid_sell:1",
+ "grid_sell_idx": 1,
+ "reason": "网格卖: 现价 31.38 涨破档1(买价 31.37), 卖 700 股"
+ },
+ "price_difference": 0.01,
+ "gross_pair_profit_at_trigger": 7.0,
+ "gross_pair_profit_at_sell_limit": -35.0
+ },
+ "worker_image": "pms:rating-priority-38f91d2",
+ "runner_sha256": "a1d8a30162eb9d98ceadf8920f88075d50be232e3ac39241a9195a78f086c37c",
+ "execution_logic_changed": false,
+ "orders_changed": false
+}
diff --git a/docs/多策略盈亏与四方网格核验_2026-11-09.md b/docs/多策略盈亏与四方网格核验_2026-11-09.md
new file mode 100644
index 0000000..5a88736
--- /dev/null
+++ b/docs/多策略盈亏与四方网格核验_2026-11-09.md
@@ -0,0 +1,42 @@
+# 多策略盈亏展示与四方股份网格核验
+
+核验时间:2026年11月9日10:57,北京时间。页面修改完成开发机验证,候选及实际发布结果待后续补齐。四方股份当前运行逻辑、策略和在途订单没有修改。
+
+## 总览展示
+
+累计盈亏与持仓盈亏均采用带正负号的两位金额、两位百分比,同一字号、间距及红盈绿亏样式。零或未知采用中性色;未知数据不显示成零。累计盈亏保持账户双策略账本基线,比例为累计盈亏除以两策略净投入合计,内部划拨不改变账户收益。净投入为零或缺失时不伪造比例。
+
+原“主观量化持仓盈亏”改为“持仓盈亏”,合并主观量化与微盘轮动当前持仓。悬浮显示两策略各自的金额与比例;合计比例按合计摊薄成本计算,不平均两策略收益率。同名股票按各自策略数量分别计算,不去重丢仓。无持仓策略显示0.00与暂无持仓,不展示虚假的0%收益率;部分策略估值不可用时隐藏合计金额及比例,仍展示可用策略明细。已收回全部成本但仍有股票的持仓保留市值对应盈亏,比例因零分母留空。
+
+保留此前消息整体吸顶和同类再次点击收起。320极窄屏在中区不足220像素时采用单列卡片,避免金额挤出;390窄屏及桌面沿用原网格。网格来源指令的动作名称改为网格加仓、网格减仓,仍按原字段显示方向和成交状态,不把底层TRIM动作统一解释为保盈减仓。
+
+## 四方股份实际链路
+
+10:45:47只读核验155模拟实例。原有700股为11月6日31.15元买入;11月9日09:40:04自动挂网格,依据11月6日“明确吸筹·量在价先”、评分71.4、热度0.4887。这是已持仓后的交易打法选择,不是恢复选股的吸筹硬门槛。网格中心31.39、下界30.116、上界32.825、档距2%、每档1000股、增量资金上限67730.61元。
+
+每档数量来自上限除以中枢下方两档、再按价格和100股取整,即1000股;并非继承原700股持仓。实际运行worker仍为pms:rating-priority-38f91d2,strategy_runner、strategy_advisor、strategy_service三个文件摘要与开发机相同。
+
+| 时点 | 实际记录 |
+| --- | --- |
+| 09:47:05 | 31.37元触发网格买入1000股,子单限价31.43元 |
+| 09:52:41 | QMT实际成交1000股,成交价31.37元,费用null;09:53完成正常入账 |
+| 10:04:02 | 31.38元触发网格卖出,受700股T+1可卖量限制,发700股;子单限价31.32元 |
+| 10:45:47 | 卖单ACCEPTED、父指令DISPATCHED、成交0,不能当作已卖或已实现盈利 |
+
+旧页面“保盈减仓”来自TRIM的统一翻译。本次实际origin_type=strategy、stype=GRID、leg=grid_sell:1;不是安全垫峰值回吐规则。该票当时安全垫峰值0.22%,也未达到保垫减仓6%的峰值门槛。
+
+## 根因与盈利边界
+
+运行器生成的实际档位为30.116、30.744、31.372、31.999、32.627。现价从31.39跌到31.37时,所处区间由2变为1;买入分支用last_band-1记为档1,因此理由错误地写成“跌破档1(30.744)”。现价31.38回升穿过同一条31.372边界时,上行分支又卖档1,形成同一边界两侧反复买卖,而不是相隔完整一档。
+
+按原参数在断网、内存环境重现了31.37买1000、31.38卖700,未调用调度、落表或下单。700股仅有7元理论价差,约0.032%,且费用未知;执行报价允许卖单低至31.32,相对本次网格买价反而可能形成35元价差损失。以上是对报价的假设计算,不是已经发生的成交盈亏。当前31.279摊薄成本混合了原700股与新1000股,也不能拿来代替单个网格循环的收益。
+
+这属于网格实现缺陷,不是正常的2%网格兑现。修复应把买入记录与真正穿过的档位对齐,卖出对应相邻上档,并以实际成交记录维护数量、价格和剩余量;执行报价需保留该网格的卖出底价,不能被积极成交报价突破。旧的已买档、已发未成交卖单需逐笔审计承接,不能直接改索引、清空状态或重放成交。此次用户要求交易原因解释,当前发布范围只含展示修正;交易规则修复及存量订单处理留待明确实施安排。
+
+## 验证与发布范围
+
+开发机80批断网隔离回归通过,资金展示专项22例及页面三道护栏通过。新增覆盖双策略加权比例、内部划拨、同名股、缺行情、空仓、零成本、零本金及读取失败。
+
+浏览器使用11月9日10:32真实只读响应隔离复现,新字段从同一账本计算,所有写请求拒绝,区别于真实登录验收。1440、390、320宽度检查金额与比例样式、正负色、策略悬浮、无持仓、分类再次收起及网格名称,卡片和页面无横向溢出、控制台错误0。[桌面](evidence/pnl-summary-ui-20261109/desktop.png)、[390窄屏](evidence/pnl-summary-ui-20261109/mobile390.png)、[320窄屏](evidence/pnl-summary-ui-20261109/mobile320.png)。
+
+只拟更新155的pms-web;唯一WS、交易worker、beat、观测、采集和其他容器保持,188不操作。回退仅恢复当前页面镜像pms:overview-layout-60a9709。四方股份核验与隔离复现的脱敏证据见[专项记录](evidence/sifang_grid_review_20261109.json)。
diff --git a/docs/开发入口.md b/docs/开发入口.md
index 40e506f..deceacf 100644
--- a/docs/开发入口.md
+++ b/docs/开发入口.md
@@ -6,6 +6,7 @@
| 任务 | 入口 |
| --- | --- |
+| 累计与持仓盈亏比例、策略悬浮明细及四方股份网格原因 | [11月9日多策略盈亏与网格核验](多策略盈亏与四方网格核验_2026-11-09.md),区分页面修复、实际成交及待实施的网格档位问题 |
| 账户累计盈亏、消息分类收起及刷新布局 | [11月9日修复接续](账户盈亏与消息布局修复_2026-11-09.md),含账户收益基线、费用口径、桌面与窄屏验证及仅页面发布 |
| 信号流统一四级、移除观测类别 | [11月6日四级发布](信号流四级统一发布_2026-11-06.md),含全来源计数、筛选与页面定向发布 |
| 宽基每日资金展示、日报入口移除与当天信号完整覆盖 | [11月6日发布接续](宽基每日资金与信号覆盖发布_2026-11-06.md),最终原型、独立日度接入、四路信号覆盖及定向发布 |
diff --git a/scripts/run_tests.py b/scripts/run_tests.py
index 44adb16..7dc5acc 100644
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -26,7 +26,7 @@
test_batch50_units.py QMT限价等待、价格来源故障、用户暂停、配额防重、试算隔离及收盘边界 (17例)
test_batch49_units.py 持仓与指令分组、同名股票及批次归属、撤单账本、未迁移及缺数展示 (14例)
test_batch48_units.py 策略账本隔离、轮换优先级、交易单位、模拟直接启用、读数及微盘50规则换版 (55例)
- test_batch47_units.py 账户资金去重、买入额度、账户展示与双策略累计盈亏 (16 例)
+ test_batch47_units.py 账户资金去重、买入额度、账户展示、双策略盈亏及加权比例 (22 例)
test_batch46_units.py 质地排序切换、档位准入、命令分配与白名单优先 (11 例)
test_batch45_units.py 父指令总量:回放延迟、部分成交、跨日预留、故障守成与影子模式 (16 例)
test_batch43_units.py 逐票来源核验、实际API至SQL事务、故障回滚与幂等 (14 例)
diff --git a/scripts/test_batch47_units.py b/scripts/test_batch47_units.py
index 9ba8cf9..489f5cd 100644
--- a/scripts/test_batch47_units.py
+++ b/scripts/test_batch47_units.py
@@ -128,15 +128,25 @@ class AccountPerformanceTest(unittest.TestCase):
result = self.read()
self.assertTrue(result['ready'])
self.assertEqual(result['profit'], 595)
+ self.assertAlmostEqual(result['profit_pct'], 595 / 15000)
self.assertEqual(result['started_at'], '2026-10-27T15:30:00')
def test_internal_transfer_and_user_scale_do_not_create_profit(self):
rotation_account.transfer(self.capital, 'original', 'micro30', 3000, self.values, 'move')
self.assertEqual(self.read()['profit'], 0)
+ self.assertEqual(self.read()['profit_pct'], 0)
def test_loss_keeps_sign(self):
self.values['original'] = 4321.12
self.assertEqual(self.read()['profit'], -678.88)
+ self.assertAlmostEqual(self.read()['profit_pct'], -678.88 / 15000)
+
+ def test_zero_or_unknown_capital_has_no_fabricated_rate(self):
+ for capital in (0, None):
+ result = self.read(metrics={'account': {'profit': 100},
+ 'original': {'net_capital': capital}, 'micro30': {'net_capital': 0}})
+ self.assertEqual(result['profit'], 100)
+ self.assertIsNone(result['profit_pct'])
def test_missing_quotes_or_baseline_never_become_zero_profit(self):
for changes in ({'ready': False, 'reason': '估值待补'},
@@ -161,5 +171,52 @@ class AccountPerformanceTest(unittest.TestCase):
self.assertIsNone(result['profit'])
+class HoldingPerformanceTest(unittest.TestCase):
+ def view(self, qty, cost, price):
+ install_fakes(positions=[{'ts_code': '600000.SH', 'total_qty': qty, 'avg_cost': cost}],
+ prices={'600000.SH': price} if price else {})
+ return portfolio.positions_view()
+
+ def combine(self, original, micro):
+ with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', True), \
+ patch.object(portfolio, 'positions_view', return_value=micro):
+ return portfolio.holding_performance(portfolio.position_groups(original))
+
+ def test_two_books_same_stock_count_separately_and_rate_is_weighted(self):
+ result = self.combine(self.view(1000, 10, 11), self.view(500, 4, 3))
+ self.assertEqual(result['profit'], 500)
+ self.assertAlmostEqual(result['profit_pct'], 500 / 12000)
+ self.assertEqual([r['profit'] for r in result['strategies']], [1000, -500])
+
+ def test_missing_quote_hides_total_but_preserves_available_strategy(self):
+ result = self.combine(self.view(1000, 10, 11), self.view(500, 4, None))
+ self.assertFalse(result['ready'])
+ self.assertIsNone(result['profit'])
+ self.assertIsNone(result['profit_pct'])
+ self.assertEqual(result['strategies'][0]['profit'], 1000)
+ self.assertIsNone(result['strategies'][1]['profit'])
+
+ def test_empty_holdings_have_zero_amount_and_no_rate(self):
+ result = self.combine(self.view(0, 0, None), self.view(0, 0, None))
+ self.assertTrue(result['ready'])
+ self.assertEqual(result['profit'], 0)
+ self.assertIsNone(result['profit_pct'])
+ self.assertTrue(all(r['names_count'] == 0 for r in result['strategies']))
+
+ def test_recovered_cost_holding_still_has_profit_but_no_cost_rate(self):
+ result = self.combine(self.view(100, 0, 10), self.view(0, 0, None))
+ self.assertEqual(result['profit'], 1000)
+ self.assertIsNone(result['profit_pct'])
+
+ def test_strategy_read_failure_is_not_zero_profit(self):
+ original = self.view(100, 10, 11)
+ with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', True), \
+ patch.object(portfolio, 'positions_view', side_effect=ValueError('test only')):
+ result = portfolio.holding_performance(portfolio.position_groups(original))
+ self.assertFalse(result['ready'])
+ self.assertEqual(result['strategies'][0]['profit'], 100)
+ self.assertIsNone(result['strategies'][1]['profit'])
+
+
if __name__ == '__main__':
unittest.main()