统一提议当前分析与交易员操作表达
This commit is contained in:
parent
a290447530
commit
e4a77bff34
|
|
@ -3053,3 +3053,7 @@ a44c994于10:53:29仅发布155的web,镜像pms:proposal-copy-a44c994。开发
|
|||
## 2026年11月12日12:00 提议与执行面板按交易员视角复核
|
||||
|
||||
结合11:10只读样本和代码确认:提议扫描与研究详情的技术取数及有效期处理不同;择时等待、无有效事件和分析不可用缺少完整区分;人工采纳实际批准条件计划,页面却没有清楚交代后续限制。纯合议检查证明补入技术看多可能改变原人工确认去向,不能只替换标签。已提出统一当前依据、重新核对建议、主界面表达实际操作结果、历史按需追溯的方案,保留已有规则与授权边界。仅分析及文档,未改业务代码、未部署、未读取新的真机快照。详见[审视记录](docs/交易员视角下的提议与执行面板审视_2026-11-12.md)。
|
||||
|
||||
## 2026年11月12日12:21 提议当前分析与确认含义修复
|
||||
|
||||
按用户指令统一普通候选、关注和详情的有效技术依据,待确认提议附当前分析,实质变化交正常扫描重评并在确认接口拦旧依据。页面去除“当时未取得”“待信号”,保留真实中性,分别解释买入依据不足与多空分歧;确认操作说明条件计划含义,执行等待原因按实际情况拆开。读取故障不退旧建仓路径,原始历史与已采纳计划不重写。开发机85组全量、17专项、页面三护栏和1440/390隔离浏览器通过;候选断网和发布结果见[发布接续](docs/提议当前分析与交易员表达修复_2026-11-12.md)。
|
||||
|
|
|
|||
|
|
@ -60,7 +60,9 @@ def needs_new_judgement(hard, previous):
|
|||
|
||||
def confirmation_revision(qty, hard, verdict):
|
||||
"""确认针对可见的建议内容;后台检查时间、名次及无关版本不让确认失效。"""
|
||||
from app.core.proposal_analysis import decision_basis
|
||||
return fingerprint({'qty': qty, 'basis': hard.get('plan_basis'),
|
||||
'analysis': decision_basis(hard),
|
||||
'advice': hard.get('advice'), 'reason': hard.get('reason'),
|
||||
'verdict': verdict.get('verdict'), 'judge_reason': verdict.get('reason'),
|
||||
'confidence': verdict.get('confidence')})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
"""提议当前分析的业务表达与实质变化判断,不改变合议规则。"""
|
||||
|
||||
|
||||
def timing_view(timing):
|
||||
t = timing or {}
|
||||
stance = t.get('stance')
|
||||
event = t.get('event') or t.get('intraday_event') or {}
|
||||
if stance in ('看多', '看空', '中性'):
|
||||
return {'label': stance, 'reason': event.get('reason') or {
|
||||
'看多': '当前择时支持买入,仍需满足限价和资金条件',
|
||||
'看空': '当前择时不支持买入', '中性': '暂无明确多空倾向'}[stance]}
|
||||
signs = {g.get('direction') for g in (event.get('groups') or {}).values()
|
||||
if g.get('state') == 'VALID'}
|
||||
if 1 in signs and -1 in signs:
|
||||
return {'label': '多空分歧', 'reason': '有效看多与看空证据并存,当前不支持买入'}
|
||||
return {'label': '买入依据不足', 'reason': '有效择时证据尚不足以支持买入'}
|
||||
|
||||
|
||||
def decision_basis(hard):
|
||||
"""只比较影响建议的判断,不因证据刷新时间或事件标识变化反复打断确认。"""
|
||||
h = hard or {}
|
||||
con, tech, timing = h.get('consensus') or {}, h.get('tech') or {}, h.get('timing') or {}
|
||||
votes = con.get('votes') or {}
|
||||
return {'fund': (h.get('fund_stance') or {}).get('stance') or votes.get('fund'),
|
||||
'tech': {k: tech.get(k) for k in ('stance', 'phase', 'data_date', 'sar_side')},
|
||||
'timing': timing.get('stance') or votes.get('timing'),
|
||||
'timing_label': timing_view(timing)['label'],
|
||||
'consensus': {k: con.get(k) for k in ('direction', 'strength', 'route', 'route_reason')}}
|
||||
|
||||
|
||||
def changed(old, current):
|
||||
return decision_basis(old) != decision_basis(current)
|
||||
|
|
@ -110,7 +110,8 @@ def hard_keys(blocks) -> dict:
|
|||
"tech": tech,
|
||||
"tech_text": tech.get("reason") or tech.get("no_read_why"),
|
||||
"timing": {"stance": tm["stance"], "nightly": tm.get("nightly"),
|
||||
"flip_at": tm.get("intraday_flip_at"), "event": tm.get('intraday_event')},
|
||||
"flip_at": tm.get("intraday_flip_at"), "event": tm.get('intraday_event'),
|
||||
"fresh": tm.get('fresh'), "no_read_why": tm.get('no_read_why')},
|
||||
"consensus": {"direction": con["direction"], "votes": con["votes"],
|
||||
"strength": con.get("strength"), "reason": con.get("reason"),
|
||||
"route": con.get("route"), "route_reason": con.get("route_reason")},
|
||||
|
|
@ -127,6 +128,33 @@ def state_map():
|
|||
return {}
|
||||
|
||||
|
||||
def decorate_proposals(rows, now=None):
|
||||
"""只读当前分析,旧提议审计保持原样;判断改变时关闭旧确认入口,交自然扫描更新。"""
|
||||
from datetime import datetime
|
||||
from app.core import proposal_analysis
|
||||
from app.services import proposal_service
|
||||
pairs = []
|
||||
for row in rows:
|
||||
h = row.get('hard_numbers') or {}
|
||||
if (row.get('status') == 'WAIT_USER' and row.get('action') == 'OPEN'
|
||||
and h.get('kind') not in ('strategy', 'daily_review') and h.get('consensus')):
|
||||
candidate = dict(h.get('plan_basis') or h, ts_code=row['ts_code'])
|
||||
pairs.append((row, candidate))
|
||||
if not pairs:
|
||||
return
|
||||
proposal_service._attach_consensus([c for _, c in pairs], now=now or datetime.now())
|
||||
for row, candidate in pairs:
|
||||
analysis = candidate.get('consensus_hard')
|
||||
row['analysis'] = analysis or {}
|
||||
if not analysis:
|
||||
row.update(accept_ready=False, prepare_reason='分析暂不可用,当前建议不能确认')
|
||||
else:
|
||||
row['analysis_changed'] = proposal_analysis.changed(row['hard_numbers'], analysis)
|
||||
row['timing_view'] = proposal_analysis.timing_view(analysis.get('timing'))
|
||||
if row['analysis_changed']:
|
||||
row.update(accept_ready=False, prepare_reason='当前分析已变化,正在重新评估建仓建议')
|
||||
|
||||
|
||||
def holding_buy_consensus(code, *, now=None):
|
||||
"""自动网格新增买入也使用持仓的现行三源意见,不由吸筹标签单独开关。"""
|
||||
from app.services import logic_state_service
|
||||
|
|
|
|||
|
|
@ -22,8 +22,15 @@ def cache_reason(progress, now=None):
|
|||
if timing_fusion.enabled():
|
||||
basis = cache.get('basis') or {}
|
||||
state = timing_state.latest((basis.get('timing_fusion') or {}).get('ts_code', ''), now)
|
||||
if not state or state['action'] != 'BUY' or state['key'] != basis.get('timing_version'):
|
||||
return '合成择时未转多或执行依据版本已变化,等待刷新'
|
||||
if not state:
|
||||
return '有效择时证据不足,暂不买入;条件满足后按限价执行'
|
||||
if state['action'] != 'BUY':
|
||||
from app.core.proposal_analysis import timing_view
|
||||
if state['action'] == 'SELL':
|
||||
return '当前择时看空,暂停买入'
|
||||
return timing_view({'event': state})['reason'] + ';条件满足后按限价执行'
|
||||
if state['key'] != basis.get('timing_version'):
|
||||
return '择时已转多,正在核对最新买入条件,核对完成前不下单'
|
||||
return policy.basis_reason(cache.get('basis'), now,
|
||||
max_source_days=max(0, param_store.get_int('PMS_EXEC_BASIS_SOURCE_MAX_DAYS', 7)))
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,14 @@ def current_basis(hard, code, proposal_id=None, *, record=True):
|
|||
changed = {'research_changed': result == 'material',
|
||||
'params_changed': hard.get('scan_params_hash') != ph,
|
||||
'portfolio_changed': hard.get('portfolio_context_hash') != context}
|
||||
if hard.get('consensus'):
|
||||
from app.core import proposal_analysis
|
||||
# 与自然扫描使用同一分析路径;仅读已有资料,不发模型请求、不落指令。
|
||||
ps._attach_consensus([current], now=datetime.now())
|
||||
analysis = current.get('consensus_hard')
|
||||
if not analysis:
|
||||
return {'ok': False, 'error': '分析暂不可用,当前建议不能确认', 'stage': 'source'}
|
||||
changed['analysis_changed'] = proposal_analysis.changed(hard, analysis)
|
||||
material = any(changed.values())
|
||||
return {'ok': not material, 'material': material, **changed,
|
||||
'error': '建议依据已变化,后台正在更新' if material else None,
|
||||
|
|
@ -161,8 +169,8 @@ def before_accept(p, expected_revision):
|
|||
return _failed_recheck(p, {'rejected': [{'by': 'qualification', 'why': check['error']}]})
|
||||
if not check.get('view'):
|
||||
return _pending_response(p, check.get('error') or '建议资料暂不可用', check.get('stage', 'source'))
|
||||
if check.get('research_changed') or check.get('params_changed') or hard.get('last_accept_check'):
|
||||
return _pending_response(p, '建议依据已变化,后台更新完成后可确认', 'changed')
|
||||
if check.get('research_changed') or check.get('params_changed') or check.get('analysis_changed') or hard.get('last_accept_check'):
|
||||
return _pending_response(p, '当前分析已变化,建仓建议更新后再确认', 'changed')
|
||||
reason = fast_checks(p, check)
|
||||
if reason:
|
||||
return _pending_response(p, reason, 'execution')
|
||||
|
|
@ -227,7 +235,7 @@ def refresh_one(p, *, now=None, deadline=None):
|
|||
if not check.get('view'):
|
||||
return _pending_response(p, check.get('error') or '建议资料暂不可用', check.get('stage', 'source'))
|
||||
if ((hard.get('preparation') or {}).get('status') == 'ready' and not hard.get('last_accept_check')
|
||||
and not check.get('research_changed') and not check.get('params_changed')):
|
||||
and not check.get('research_changed') and not check.get('params_changed') and not check.get('analysis_changed')):
|
||||
# 其他持仓/现金读数变化不等于本建议失效。原数量仍满足当前闸门就保留,
|
||||
# 否则报价写进新扫描的说明会让相同500股每分钟变成另一份待确认内容。
|
||||
if check.get('ok') or not fast_checks(p, check):
|
||||
|
|
@ -237,7 +245,7 @@ def refresh_one(p, *, now=None, deadline=None):
|
|||
and hard.get('consumption_id') and hard.get('proposal_revision')
|
||||
and hard.get('prepared_judgement') and hard.get('plan_basis') is not None
|
||||
and not hard.get('last_accept_check') and not check.get('research_changed')
|
||||
and not check.get('params_changed') and not fast_checks(p, check)):
|
||||
and not check.get('params_changed') and not check.get('analysis_changed') and not fast_checks(p, check)):
|
||||
restored = ready_hard(hard, _judgement(p), now)
|
||||
candidate = {'qty': p['qty'], 'hard_numbers': restored}
|
||||
if pms_repo.publish_prepared_proposal(p, candidate, _judgement(p)):
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@ def _attach_consensus(cands, out=None, now=None) -> None:
|
|||
consensus_blocks —— 四块意见 (fund / tech / timing / consensus), scan_open 定档时取 fund/tech 喂 advise_v2;
|
||||
consensus_hard —— 提议硬数字六键 (方案附录丁), 进评审账本与提议卡, 不进送研判名单。
|
||||
批量取一次昨夜定性与技术面映射; 盘中转多留痕从候选自带的 sig_buy 取时刻。任何一步失败都不抛 ——
|
||||
装不上就当这只票没有合议 (scan_open 里 con 为 None 自然退回旧路), 合议是加不改。
|
||||
取数或计算失败则保留观察,不因技术故障退回旧建仓路径。
|
||||
|
||||
盘中确认 (2026-09-14 盘中确认包): 装配完四块后, 若总闸开着且传了 now, 对收口等待/开口向上的
|
||||
候选跑一遍 intraday_confirm —— 收口突破改立场重新合议, 开口未确认/时段外把路由改观察带 wait_confirm。
|
||||
|
|
@ -592,13 +592,14 @@ def _attach_consensus(cands, out=None, now=None) -> None:
|
|||
try:
|
||||
codes = [c.get("ts_code") for c in cands if c.get("ts_code")]
|
||||
nightly = consensus_service.nightly_map(codes)
|
||||
tech_states = consensus_service.state_map()
|
||||
missing_user = [r['ts_code'] for r in cands if r.get('user_candidate') and r['ts_code'] not in tech_states]
|
||||
if missing_user:
|
||||
from app.services import tech_service
|
||||
tech_states = dict(tech_states, **tech_service.read_states_for(missing_user))
|
||||
# 所有候选使用相同的已有日线与有效期;盘前映射不能遗漏盘中新入榜的普通候选。
|
||||
from app.services import tech_service
|
||||
tech_states = tech_service.read_states_for(codes)
|
||||
except Exception as e: # noqa: BLE001
|
||||
logger.warning("[合议] 批量取数失败, 本轮候选不装配合议: %s", e)
|
||||
for c in cands:
|
||||
c['consensus'] = {'direction': None, 'route': '观察',
|
||||
'route_reason': '分析暂不可用,暂不建仓'}
|
||||
return
|
||||
icfg = _intraday_cfg() if now is not None else None
|
||||
icache: dict = {}
|
||||
|
|
@ -628,6 +629,8 @@ def _attach_consensus(cands, out=None, now=None) -> None:
|
|||
seen.append(rec)
|
||||
except Exception as e: # noqa: BLE001
|
||||
logger.warning("[合议] 装配失败 %s (本票按无合议): %s", code, e)
|
||||
c['consensus'] = {'direction': None, 'route': '观察',
|
||||
'route_reason': '分析暂不可用,暂不建仓'}
|
||||
|
||||
|
||||
# 候选一只都不剩时, 这一栏要说清是被哪几道筛掉的。键名是代码里的, 翻成人话再显示。
|
||||
|
|
|
|||
|
|
@ -410,18 +410,12 @@ def research_feed(ts_code: str) -> dict:
|
|||
return {"tech": None, "error": "代码认不出"}
|
||||
if not enabled():
|
||||
return {"tech": None, "note": "PMS_TECH_ENABLED 关着"}
|
||||
p = _params()
|
||||
try:
|
||||
dd = tech_repo.latest_date()
|
||||
since = tradedays.ymd(tradedays.prev_trade_day(dd, tech_rules.CHOPPY_WINDOW + 5)) if dd else 0
|
||||
rows = tech_repo.history(code, since=since, limit=tech_rules.CHOPPY_WINDOW + 5)
|
||||
tech = read_states_for([code]).get(code)
|
||||
except Exception as e: # noqa: BLE001
|
||||
return {"tech": None, "error": f"{type(e).__name__}: {e}"}
|
||||
if not rows:
|
||||
return {"tech": None, "note": "这只票没有技术面读数"}
|
||||
st = tech_rules.synthesize(rows, params=p["rules"])
|
||||
return {"tech": {**_compact(st), "latest": _row_view(rows[-1]),
|
||||
"flips": tech_rules.count_sar_flips(rows), "bars": len(rows)}}
|
||||
logger.warning('技术分析读取失败 %s: %s', code, type(e).__name__)
|
||||
return {"tech": None, "error": "技术分析暂不可用"}
|
||||
return {"tech": tech, "note": None if tech else "缺少有效日线,暂不能确认技术方向"}
|
||||
|
||||
|
||||
def status() -> dict:
|
||||
|
|
@ -447,8 +441,9 @@ def status() -> dict:
|
|||
|
||||
|
||||
def read_states_for(codes):
|
||||
"""盘中新加入的股票读取已有日线,按原规则合成立场,不重算行情或改写整份映射。"""
|
||||
codes = list(dict.fromkeys(codes))
|
||||
"""扫描与详情共同读取已有日线;沪深范围、日期与时效标准一致,不调用模型。"""
|
||||
codes = list(dict.fromkeys(normalize_code(c) for c in codes))
|
||||
codes = [c for c in codes if c and c.endswith(('.SH', '.SZ'))]
|
||||
if not codes or not enabled():
|
||||
return {}
|
||||
p = _params()
|
||||
|
|
@ -457,5 +452,7 @@ def read_states_for(codes):
|
|||
return {}
|
||||
since = tradedays.ymd(tradedays.prev_trade_day(dd, tech_rules.CHOPPY_WINDOW + 5))
|
||||
history = tech_repo.history_multi(codes, since=since)
|
||||
return {code: _compact(tech_rules.synthesize(rows, params=p['rules']))
|
||||
for code, rows in history.items() if rows and int(rows[-1].get('data_date') or 0) == dd}
|
||||
return {code: {**_compact(tech_rules.synthesize(rows, params=p['rules'])),
|
||||
'latest': _row_view(rows[-1]), 'flips': tech_rules.count_sar_flips(rows), 'bars': len(rows)}
|
||||
for code, rows in history.items()
|
||||
if code in codes and rows and int(rows[-1].get('data_date') or 0) == dd}
|
||||
|
|
|
|||
|
|
@ -518,6 +518,8 @@ def api_proposals(status: str = Query("WAIT_USER"), limit: int = 100,
|
|||
preparation = h.get('preparation') or {}
|
||||
row['accept_ready'] = preparation.get('status') == 'ready' and bool(h.get('consumption_id'))
|
||||
row['prepare_reason'] = preparation.get('reason') or '建议正在准备,完成后可采纳'
|
||||
from app.services import consensus_service
|
||||
consensus_service.decorate_proposals(rows)
|
||||
return rows
|
||||
return ok(_list)
|
||||
|
||||
|
|
@ -997,15 +999,17 @@ def api_research(ts_code: str):
|
|||
# 合议也用现读的这份 (2026-09-15): 早上映射只覆盖相关票, 不在映射里的票合议会按技术面无读数算,
|
||||
# 而抽屉又显示现读的立场, 两处对不上 (实见 300750: 技术面看空却判「只有基本面一路看多」)。
|
||||
# 扫描那条路仍用映射, 这里只管显示自洽。
|
||||
if tfeed.get("tech"):
|
||||
tech_states = {**(tech_states or {}), code: tfeed["tech"]}
|
||||
# 详情与提议采用同一有效期;不能在现读已过期时退回旧映射。
|
||||
tech_states = {code: tfeed['tech']} if tfeed.get('tech') else {}
|
||||
blocks = consensus_service.assemble({"ts_code": code, "company_review": cr},
|
||||
nightly=nightly, tech_states=tech_states)
|
||||
tech = tfeed.get("tech") or blocks["tech"]
|
||||
tm = blocks["timing"]
|
||||
timing = {"stance": tm.get("stance"), "nightly": tm.get("nightly"),
|
||||
"trade_date": (nightly or {}).get("trade_date"),
|
||||
"flip_at": tm.get("intraday_flip_at")} # 转多时刻点击不回扫, 留昨夜定性带的
|
||||
"flip_at": tm.get("intraday_flip_at"), "event": tm.get('intraday_event')}
|
||||
from app.core.proposal_analysis import timing_view
|
||||
timing['view'] = timing_view(tm)
|
||||
fund = blocks["fund"]
|
||||
sources = {
|
||||
"company": ("ok" if company else ("无读数" if src != "none" else "不在持仓也不在候选")),
|
||||
|
|
|
|||
|
|
@ -1371,7 +1371,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<span class="n">· {{ proposals.length }} 条</span><span class="car">{{ sectClosed.prop?'▸':'▾' }}</span></div>
|
||||
<div class="sectb">
|
||||
<div class="muted" v-if="!proposals.length">暂无待确认提议。</div>
|
||||
<div v-if="proposals.length" class="rail-note">采纳后生成待执行指令;驳回后今日不再提议。</div>
|
||||
<div v-if="proposals.length" class="rail-note">确认后生成交易计划,满足执行条件才下单;驳回后今日不再提议。</div>
|
||||
<div v-for="p in proposals" :key="p.proposal_id" class="mini">
|
||||
<div class="top"><b class="lk" title="查看个股详情" @click="openCodeSignals(p.ts_code)">{{ nm(p.ts_code) }}</b>
|
||||
<span class="muted mono lk" style="font-size:11px" title="查看个股详情" @click="openCodeSignals(p.ts_code)">{{ p.ts_code }}</span>
|
||||
|
|
@ -1419,7 +1419,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
最近核验未通过。<button class="research-link" @click="decide(p,'ACCEPTED')">查看原因</button>
|
||||
</div>
|
||||
<div class="prop-actions">
|
||||
<el-button type="success" size="small" @click="decide(p,'ACCEPTED')">采纳</el-button>
|
||||
<el-button type="success" size="small" @click="decide(p,'ACCEPTED')">{{ p.action==='OPEN' ? '确认建仓计划' : '确认计划' }}</el-button>
|
||||
<el-button type="danger" size="small" @click="decide(p,'DECLINED')">驳回</el-button>
|
||||
<button class="research-link" v-if="propResized(p) || propSizeMismatch(p)" @click="openPropDetail(p,'size')">数量说明</button>
|
||||
</div>
|
||||
|
|
@ -1577,7 +1577,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<!-- 裁决弹窗 (2026-09-14 台账 015): 采纳/驳回从预设理由里选, 选其他再补一句。 -->
|
||||
<el-dialog v-model="decideDlg.visible" width="460px" :z-index="3200"
|
||||
:close-on-click-modal="!decideDlg.busy" :close-on-press-escape="!decideDlg.busy" :show-close="!decideDlg.busy"
|
||||
:title="(decideDlg.withdrawn?'提议已撤下':(decideDlg.decision==='ACCEPTED'?'采纳':'驳回')) + ' · ' + (decideDlg.row ? nm(decideDlg.row.ts_code) : '') + (decideDlg.row ? ' ' + tx('action', decideDlg.row.action) : '')">
|
||||
:title="(decideDlg.withdrawn?'提议已撤下':(decideDlg.decision==='ACCEPTED'?'确认交易计划':'驳回')) + ' · ' + (decideDlg.row ? nm(decideDlg.row.ts_code) : '') + (decideDlg.row ? ' ' + tx('action', decideDlg.row.action) : '')">
|
||||
<div v-if="decideDlg.row && !decideDlg.withdrawn" class="prop-order" style="margin-bottom:10px">
|
||||
<b>{{ decideDlg.row.qty }} 股</b><span>预计金额 <b>{{ propAmount(decideDlg.row) }}</b></span>
|
||||
</div>
|
||||
|
|
@ -1588,7 +1588,8 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
正在确认交易条件,请勿重复提交。
|
||||
</div>
|
||||
<template v-if="!decideDlg.withdrawn">
|
||||
<div class="muted" style="margin-bottom:8px;font-size:12px">选一个理由记进评审账本。选「其他」时补充必填。</div>
|
||||
<div class="muted" v-if="decideDlg.decision==='ACCEPTED'" style="margin-bottom:8px;font-size:12px">确认的是交易计划;满足择时、价格和资金条件后才会下单。</div>
|
||||
<div class="muted" style="margin-bottom:8px;font-size:12px">请选择确认理由。选「其他」时请补充说明。</div>
|
||||
<el-radio-group v-model="decideDlg.code" style="display:flex;flex-direction:column;gap:6px;align-items:flex-start">
|
||||
<el-radio v-for="(label,code) in decideCodes" :key="code" :label="code">{{ label }}</el-radio>
|
||||
</el-radio-group>
|
||||
|
|
@ -1598,7 +1599,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<template #footer>
|
||||
<el-button :disabled="decideDlg.busy" @click="decideDlg.visible=false">关闭</el-button>
|
||||
<el-button v-if="!decideDlg.withdrawn" :type="decideDlg.decision==='ACCEPTED'?'success':'danger'" :loading="decideDlg.busy" :disabled="decideDlg.uncertain || decideDlg.pending" @click="submitDecide">
|
||||
{{ decideDlg.busy ? '正在处理' : (decideDlg.updated ? '确认更新后的建议' : (decideDlg.decision==='ACCEPTED' ? '确认采纳' : '确认驳回')) }}</el-button>
|
||||
{{ decideDlg.busy ? '正在处理' : (decideDlg.updated ? '确认更新后的建议' : (decideDlg.decision==='ACCEPTED' ? '确认计划' : '确认驳回')) }}</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
|
|
@ -2182,7 +2183,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<h3>待确认队列(现在是{{ tx('autonomy', ov.autonomy) }})</h3>
|
||||
<div class="muted" style="margin-bottom:8px">
|
||||
propose_only 档位下, 增持类自主动作全部在此等待裁决; 减持方向不设确认门槛。
|
||||
采纳后先落指令表 (先记账后动作), 由择时执行器分日下单。
|
||||
确认后生成交易计划,系统按执行条件分日下单。
|
||||
</div>
|
||||
<el-alert v-if="dm.judge && !dm.judge.available" type="warning" effect="dark" show-icon
|
||||
:closable="false" style="margin-bottom:10px"
|
||||
|
|
@ -2386,16 +2387,9 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
</template>
|
||||
|
||||
<template v-else-if="propDetailKind==='tech'">
|
||||
<div class="cs-sect">
|
||||
<div class="h">提议形成时</div>
|
||||
<span class="ptag" :class="propTechTag(propDetailP).cls">{{ propTechTag(propDetailP).text }}</span>
|
||||
<span class="st">{{ propTechSub(propDetailP) }}</span>
|
||||
<div class="st muted">{{ hasStance(propTechSnapshot(propDetailP).stance) ? (propTechSnapshot(propDetailP).reason || '仅保留了当时的技术结论') : '这份提议当时未取得技术结论。下方是当前查询结果,不代表当时已经采用。' }}</div>
|
||||
<div class="st muted" v-if="propTechSnapshot(propDetailP).data_date">读数日 {{ propTechSnapshot(propDetailP).data_date }}</div>
|
||||
</div>
|
||||
<div class="cs-sect"><div class="h">当前技术读数</div></div>
|
||||
<div class="cs-sect"><div class="h">技术分析</div></div>
|
||||
<div class="muted" v-if="propTechErr">{{ propTechErr }}</div>
|
||||
<div class="muted" v-else-if="!propTechFull">正在读技术面…</div>
|
||||
<div class="muted" v-else-if="!propTechFull">正在加载技术分析…</div>
|
||||
<template v-else>
|
||||
<div style="display:flex;align-items:center;gap:8px;margin-bottom:8px;flex-wrap:wrap">
|
||||
<span class="ptag" :class="dimCls(propTechFull.stance)">{{ proposalStance(propTechFull.stance, '暂不可用') }}<template v-if="propTechFull.strength"> · {{ propTechFull.strength }}</template></span>
|
||||
|
|
@ -2414,18 +2408,18 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
</template>
|
||||
|
||||
<template v-else-if="propDetailKind==='consensus'">
|
||||
<div class="st muted" v-if="!propCon(propDetailP) && !(propDetailP.hard_numbers||{}).timing">这份提议未保存择时依据和合议记录,无法确认当时的判断。</div>
|
||||
<div class="st muted" v-if="!propCon(propDetailP) && !(propDetailP.hard_numbers||{}).timing">分析暂不可用,当前建议不能确认。</div>
|
||||
<template v-else>
|
||||
<div class="cs-sect"><div class="h">提议形成时</div></div>
|
||||
<div class="cs-sect"><div class="h">择时分析</div></div>
|
||||
<div style="display:flex;align-items:center;gap:8px;margin-bottom:10px;flex-wrap:wrap" v-if="propTimingTag(propDetailP)">
|
||||
<span class="ptag" :class="propTimingTag(propDetailP).cls">{{ propTimingTag(propDetailP).text }}</span>
|
||||
<span class="st">{{ propTimingSub(propDetailP) || '该提议未取得有效择时方向' }}</span>
|
||||
<span class="st">{{ propTimingSub(propDetailP) }}</span>
|
||||
</div>
|
||||
<div class="research-copy"><p>{{ propTimingReason(propDetailP) }}</p></div>
|
||||
<div class="cs-sect"><div class="h">当时的三路意见</div>
|
||||
<div class="cs-sect"><div class="h">三路分析</div>
|
||||
<div class="prop-metric">
|
||||
<div class="m"><span class="nm">基本面</span><span class="ptag" :class="dimCls(((propCon(propDetailP)||{}).votes||{}).fund)">{{ proposalStance(((propCon(propDetailP)||{}).votes||{}).fund, '缺少评析') }}</span></div>
|
||||
<div class="m"><span class="nm">技术面</span><span class="ptag" :class="dimCls(((propCon(propDetailP)||{}).votes||{}).tech)">{{ proposalStance(((propCon(propDetailP)||{}).votes||{}).tech, '当时未取得') }}</span></div>
|
||||
<div class="m"><span class="nm">技术面</span><span class="ptag" :class="dimCls(((propCon(propDetailP)||{}).votes||{}).tech)">{{ proposalStance(((propCon(propDetailP)||{}).votes||{}).tech, '分析暂不可用') }}</span></div>
|
||||
<div class="m"><span class="nm">择时</span><span class="ptag" :class="dimCls(((propCon(propDetailP)||{}).votes||{}).timing)">{{ propTimingTag(propDetailP).text }}</span></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -3952,20 +3946,21 @@ createApp({
|
|||
if (!c || !c.overall) return null;
|
||||
return { text: '质地' + c.overall, cls: c.overall === '好' ? 'accent' : (c.overall === '差' ? 'warn' : 'neutral') };
|
||||
};
|
||||
// 提议与另外两票统一使用形成时保存的依据,不能由当前映射覆盖或隐藏。
|
||||
// 当前分析与确认内容一并核验,原始依据仍保存在 hard_numbers 中。
|
||||
const propAnalysis = p => p && p.analysis != null ? p.analysis : ((p && p.hard_numbers) || {});
|
||||
const propTechSnapshot = (p) => {
|
||||
const h = (p && p.hard_numbers) || {};
|
||||
const h = propAnalysis(p);
|
||||
if (h.tech && typeof h.tech === 'object') return h.tech;
|
||||
const stance = ((h.consensus || {}).votes || {}).tech;
|
||||
return stance ? { stance, reason: h.tech_text } : {};
|
||||
};
|
||||
const propTechTag = (p) => {
|
||||
const t = propTechSnapshot(p);
|
||||
return { text: proposalStance(t.stance, '当时未取得'), cls: dimCls(t.stance) };
|
||||
return { text: proposalStance(t.stance, '分析暂不可用'), cls: dimCls(t.stance) };
|
||||
};
|
||||
const propTechSub = (p) => {
|
||||
const t = propTechSnapshot(p), bits = [];
|
||||
if (!hasStance(t.stance)) return '详情可查看当前分析';
|
||||
if (!hasStance(t.stance)) return '暂不能确认技术方向';
|
||||
if (t.phase) bits.push(t.phase);
|
||||
if (t.sar_side) bits.push('SAR ' + t.sar_side);
|
||||
return bits.join(' · ');
|
||||
|
|
@ -3981,7 +3976,7 @@ createApp({
|
|||
const dimTip = (name, st, extra) => name + ' ' + (st || '无读数') + (extra ? ' · ' + (NIGHT_CN2[extra] || extra) : '');
|
||||
// 基本面行: 立场取硬数字里的 fund_stance (合议六键), 没有就按质地档推; 副文案给质地与估值。
|
||||
const propFundTag = (p) => {
|
||||
const fs = ((p.hard_numbers || {}).fund_stance || {}).stance, c = cr(p);
|
||||
const fs = (propAnalysis(p).fund_stance || {}).stance, c = cr(p);
|
||||
const st = fs || (c && c.overall ? (c.overall === '好' ? '看多' : (c.overall === '差' ? '看空' : '中性')) : null);
|
||||
return { text: proposalStance(st, '缺少评析'), cls: dimCls(st) };
|
||||
};
|
||||
|
|
@ -3994,44 +3989,40 @@ createApp({
|
|||
};
|
||||
// 展示用词与合议原始枚举分开;未知不能改称中性,也不改变规则输入。
|
||||
const hasStance = (st) => ['看多', '看空', '中性'].includes(st);
|
||||
const proposalStance = (st, missing='未取得') => hasStance(st) ? st : missing;
|
||||
const proposalStance = (st, missing='分析暂不可用') => hasStance(st) ? st : missing;
|
||||
const propTimingSnapshot = (p) => {
|
||||
const h = (p && p.hard_numbers) || {}, t = h.timing || {};
|
||||
const h = propAnalysis(p), t = h.timing || {};
|
||||
return {...t, stance:t.stance || ((h.consensus || {}).votes || {}).timing};
|
||||
};
|
||||
const NIGHT_CN = { BUY: '建议买入', WATCH: '观望', SELL: '建议卖出', AVOID: '回避', DROPPED: '已剔除' };
|
||||
const propTimingTag = (p) => {
|
||||
const t = propTimingSnapshot(p), e = t.event || {};
|
||||
if (hasStance(t.stance)) return {text:t.stance, cls:dimCls(t.stance)};
|
||||
if (e.action === 'WAIT') {
|
||||
const signs = Object.values(e.groups || {}).filter(g => g.state === 'VALID').map(g => g.direction);
|
||||
return {text:signs.includes(1) && signs.includes(-1) ? '方向分歧' : '证据不足', cls:'na'};
|
||||
}
|
||||
return {text:'待信号', cls:'na'};
|
||||
if (p.timing_view) return {text:p.timing_view.label, cls:'na'};
|
||||
const signs = Object.values(e.groups || {}).filter(g => g.state === 'VALID').map(g => g.direction);
|
||||
return {text:signs.includes(1) && signs.includes(-1) ? '多空分歧' : '买入依据不足', cls:'na'};
|
||||
};
|
||||
const propTimingSub = (p) => {
|
||||
const t = propTimingSnapshot(p), bits = [];
|
||||
if (!hasStance(t.stance)) return t.event && t.event.action === 'WAIT' ? '尚未形成一致方向' : '当时无有效方向信号';
|
||||
if (t.nightly) bits.push('昨夜定性 ' + (NIGHT_CN[t.nightly] || t.nightly));
|
||||
if (t.flip_at) bits.push('盘中 ' + t.flip_at + ' 判转多');
|
||||
return bits.join(' · ') || (t.stance === '中性' ? '暂无多空倾向' : '提议形成时的判断');
|
||||
const t = propTimingSnapshot(p);
|
||||
if (!hasStance(t.stance)) return '当前不支持买入';
|
||||
return t.stance === '看多' ? '仍需满足限价和资金条件' : (t.stance === '看空' ? '当前不支持买入' : '暂无明确多空倾向');
|
||||
};
|
||||
const propTimingReason = (p) => {
|
||||
if (p.timing_view) return readableReason(p.timing_view.reason);
|
||||
const t = propTimingSnapshot(p), e = t.event || {};
|
||||
if (hasStance(t.stance)) return readableReason(e.reason || t.reason || propTimingSub(p));
|
||||
if (e.action === 'WAIT') return readableReason(e.reason || '有效证据尚不足以形成一致的择时方向。');
|
||||
return '提议形成时未取得有效择时信号。已有分析报告不等于已形成可用于执行的方向,也不能将信号缺失视为中性。';
|
||||
return readableReason(e.reason || (hasStance(t.stance) ? propTimingSub(p) :
|
||||
(propTimingTag(p).text === '多空分歧' ? '有效看多与看空证据并存,当前不支持买入' : '有效择时证据尚不足以支持买入')));
|
||||
};
|
||||
// 系统结论 (择时详情用): 把路由翻成用户看得懂的一句话, 与抽屉判断卡同一套措辞。
|
||||
const propConclusion = (p) => {
|
||||
const c = propCon(p) || {};
|
||||
if (c.route === '放行') return c.strength === '强' ? '三路意见一致看多,研判通过即建仓' : '多数意见看多,研判通过即建仓';
|
||||
if (c.route === '观察') return '观察中:' + csPlainRoute(c.route_reason);
|
||||
if (c.route === '交人') return '试探仓候选:' + csPlainRoute(c.route_reason) + ';研判通过后再定';
|
||||
if (c.route === '放行') return '当前分析支持建仓,仍需满足限价、资金等执行条件';
|
||||
if (c.route === '观察') return '暂不建仓:' + csPlainRoute(c.route_reason);
|
||||
if (c.route === '交人') return '建仓计划需人工确认:' + csPlainRoute(c.route_reason) +
|
||||
(propTimingSnapshot(p).stance === '看多' ? ';确认后按执行条件下单' : ';确认后仍需满足买入条件');
|
||||
if (c.route === '跳过') return '不建仓:' + csPlainRoute(c.route_reason);
|
||||
return c.route_reason || '';
|
||||
};
|
||||
const propCon = (p) => (p && p.hard_numbers && p.hard_numbers.consensus) || null;
|
||||
const propCon = p => propAnalysis(p).consensus || null;
|
||||
const propConsensusTag = (p) => {
|
||||
const c = propCon(p);
|
||||
if (!c || !c.direction) return null;
|
||||
|
|
@ -4054,7 +4045,12 @@ createApp({
|
|||
function openPropDetail(p, kind) {
|
||||
propDetailP.value = p; propDetailKind.value = kind; propDetailOpen.value = true;
|
||||
propTechFull.value = null; propTechErr.value = '';
|
||||
if (kind === 'tech') loadPropTech(p);
|
||||
if (kind === 'tech') {
|
||||
const tech = propTechSnapshot(p);
|
||||
if (tech.latest) propTechFull.value = tech;
|
||||
else if (p.analysis != null) propTechErr.value = '缺少有效日线,暂不能确认技术方向';
|
||||
else loadPropTech(p);
|
||||
}
|
||||
}
|
||||
function closePropDetail() { propDetailOpen.value = false; }
|
||||
async function loadPropTech(p) {
|
||||
|
|
@ -4700,17 +4696,18 @@ createApp({
|
|||
// ---- 系统判断 (2026-09-15 抽屉重做): 结论一句白话 + 三路意见各一行, 内部设计词不上页面 ----
|
||||
const csDetail = reactive({ fund: false, tech: false, timing: false });
|
||||
function csToggle(k) { csDetail[k] = !csDetail[k]; }
|
||||
const csStanceTag = (st) => ({ text: st || '无读数', cls: st === '看多' ? 'up' : (st === '看空' ? 'down' : 'neutral') });
|
||||
const csStanceTag = (st) => ({ text: proposalStance(st, '分析暂不可用'), cls: dimCls(st) });
|
||||
const csYmd = (v) => { const x = String(v || ''); return /^\d{8}$/.test(x) ? x.slice(0, 4) + '-' + x.slice(4, 6) + '-' + x.slice(6) : x; };
|
||||
const csVoteLine = (f) => [['基本面', f.fund], ['技术面', f.tech], ['择时', f.timing]]
|
||||
.map(([k, b]) => k + ((b && b.stance) || '无读数')).join('、');
|
||||
.map(([k, b]) => k + (k === '择时' ? propTimingTag({analysis:{timing:b || {}}}).text : proposalStance(b && b.stance, '分析暂不可用'))).join('、');
|
||||
// 后端的路由原因是给复盘看的, 这里翻成用户看得懂的一句话。
|
||||
function csPlainRoute(r) {
|
||||
r = String(r || '');
|
||||
if (r.includes('没有买方评析')) return '没有买方评析,不建仓';
|
||||
if (r.startsWith('方向看空')) return '多数意见看空,不建仓';
|
||||
if (r.includes('只有一方表态')) return '只有一路意见看多,其余没有明确意见,最多按试探仓小仓建';
|
||||
if (r.includes('只有一方表态')) return '只有一路分析看多,支持力度有限';
|
||||
if (r.includes('基本面看空') && r.includes('技术面看多')) return '基本面偏弱但技术面走强,最多按试探仓小仓建';
|
||||
if (r.includes('等待新的有效合成择时')) return '有效择时证据不足,当前不支持买入';
|
||||
if (r.includes('等择时转多')) return '基本面与技术面看多,等择时系统转多';
|
||||
if (r.includes('择时')) return '择时系统有异议,等其转多';
|
||||
if (r.includes('等技术面开口')) return '布林带仍在收口,等开口后再评估';
|
||||
|
|
@ -4730,7 +4727,7 @@ createApp({
|
|||
}
|
||||
const route = con.route;
|
||||
if (!route) return { cls: 'wait', label: '暂无判断', text: '意见不全,等数据到齐', votes };
|
||||
if (route === '放行') return { cls: 'done', label: '符合建仓条件', text: con.strength === '强' ? '三路意见一致看多,研判通过即建仓' : '多数意见看多,研判通过即建仓', votes };
|
||||
if (route === '放行') return { cls: 'done', label: '符合建仓条件', text: con.strength === '强' ? '三路意见一致看多,仍需通过建仓及执行检查' : '多数意见看多,仍需通过建仓及执行检查', votes };
|
||||
if (route === '观察') return { cls: 'wait', label: '观察中', text: csPlainRoute(con.route_reason), votes };
|
||||
if (route === '交人') return { cls: 'queue', label: '试探仓候选', text: csPlainRoute(con.route_reason) + ';研判通过后再定', votes };
|
||||
if (route === '跳过') return { cls: 'deny', label: '不建仓', text: csPlainRoute(con.route_reason), votes };
|
||||
|
|
@ -4772,13 +4769,13 @@ createApp({
|
|||
});
|
||||
const csTimingRow = computed(() => {
|
||||
const f = techFeed.value || {}, m = f.timing || {};
|
||||
const tag = csStanceTag(m.stance);
|
||||
const tag = m.view ? {text:m.view.label, cls:dimCls(m.stance)} : propTimingTag({analysis:{timing:m}});
|
||||
const NIGHT = { BUY: '建议买入', WATCH: '观望', SELL: '建议卖出', AVOID: '回避', DROPPED: '停止自动覆盖(历史)' };
|
||||
const bits = [];
|
||||
if (m.nightly) bits.push('最近每日定性 ' + (NIGHT[m.nightly] || m.nightly) + (m.trade_date ? '(' + csYmd(m.trade_date) + ')' : ''));
|
||||
if (m.flip_at) bits.push('盘中 ' + m.flip_at + ' 判转多');
|
||||
const sub = bits.length ? bits.join(' · ') : ((f.sources || {}).timing || '决策系统昨夜没有这只票的结论');
|
||||
return { tag, sub, lines: bits, empty: (f.sources || {}).timing || '暂无择时读数' };
|
||||
const sub = m.view ? readableReason(m.view.reason) : (bits.length ? bits.join(' · ') : '有效择时证据尚不足以支持买入');
|
||||
return { tag, sub, lines: bits, empty: sub };
|
||||
});
|
||||
// 信号说明里的裸英文码 (如 money_flow_in_intensity) 不当句子显示。
|
||||
const csPlainReason = (r) => { const s = String(r || '').trim(); return (!s || /^[A-Za-z0-9_.:\-]+$/.test(s)) ? '' : readableReason(s); };
|
||||
|
|
@ -5197,7 +5194,7 @@ createApp({
|
|||
proposal_revision: (dd.row.hard_numbers || {}).proposal_revision || null },
|
||||
{ timeout: decideTimeoutMs });
|
||||
if (d.ok) {
|
||||
ElementPlus.ElMessage.success(dd.decision === 'ACCEPTED' ? '已采纳,请查看当日指令' : '已驳回');
|
||||
ElementPlus.ElMessage.success(dd.decision === 'ACCEPTED' ? '交易计划已确认,请查看执行条件与进度' : '已驳回');
|
||||
if (d.warning) ElementPlus.ElMessage.warning(d.warning);
|
||||
dd.visible = false;
|
||||
await Promise.all([loadProposals(), loadInstructions(), loadLedger()]);
|
||||
|
|
@ -5790,7 +5787,7 @@ createApp({
|
|||
propScale, propAmount, propExpiry, propSizePct, propAdviceTier, propSizeMismatch, propResized, propJudgeShort,
|
||||
propMoreOpen, togglePropMore,
|
||||
// 2026-09-12 提议卡重构: 来源结论标签 + 详情弹窗
|
||||
cr, propPlanTag, propPlanSub, propJudgeTag, propJudgeSub, propCompanyTag, propTechSnapshot, propTechTag, propTechSub,
|
||||
cr, propAnalysis, propPlanTag, propPlanSub, propJudgeTag, propJudgeSub, propCompanyTag, propTechSnapshot, propTechTag, propTechSub,
|
||||
propCon, propConsensusTag, propConsensusSub,
|
||||
hasStance, proposalStance, propFundTag, propFundSub, propTimingTag, propTimingSub, propTimingReason, propConclusion, dimCls, dimsOf, dimTip,
|
||||
readableReason, researchParagraphs, propDetailOpen, propDetailKind, propDetailP, propTechFull, propTechErr, PROP_SRC_LABEL,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
# 开发资料入口
|
||||
|
||||
11月12日按用户“直接修复”统一提议与详情的当前分析、旧建议确认保护及交易员文案,见[实施与发布接续](提议当前分析与交易员表达修复_2026-11-12.md)。开发机已验证,实际候选和发布状态以文末续记为准。
|
||||
|
||||
11月12日按用户要求重新审视提议、技术面、择时与人工确认,见[交易员视角分析](交易员视角下的提议与执行面板审视_2026-11-12.md)。上一轮“当时未取得”“待信号”设计未获用户认可;已确认取数路径与操作含义存在问题,本轮仅分析,未再次部署。
|
||||
|
||||
11月12日11:25:24已仅在155发布web的提议状态展示修复,见[11月12日状态说明](提议中性与缺失状态展示_2026-11-12.md),不把缺少有效证据改成中性;发布状态见文末。
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
# 提议当前分析与交易员表达修复
|
||||
|
||||
2026年11月12日12:21,北京时间。按用户“直接修复”实施;开发机验证完成,候选镜像与155发布结果在文末续记。前置分析见[交易员视角审视](交易员视角下的提议与执行面板审视_2026-11-12.md)。
|
||||
|
||||
## 改动
|
||||
|
||||
- 普通候选、人工关注和单票技术详情共用已有日线读取及有效期。普通候选不再因盘前映射遗漏而缺失技术判断,单票详情不再使用过期日线形成当前结论。取数入口排除非沪深代码;没有新增采集或模型调用。
|
||||
- 待确认提议只读附带当前分析,原始提议依据保持。当前分析实质变化时,关闭旧确认入口并展示更新原因;后台原扫描重新评估建议,确认接口也独立核对,不能靠旧页面绕过。分析判断纳入确认内容标识,普通刷新时间和信号标识变化不打断确认。
|
||||
- 技术面展示当前有效结论及同一份指标详情;移除“当时未取得”。择时区分明确方向、中性、有效多空分歧和买入依据不足,未形成有效事件不推断为服务故障或中性。保留事件有效性信息,原始证据仍可审计。
|
||||
- 主操作明确为确认交易计划,确认弹窗说明满足择时、价格和资金条件后才下单。执行原因区分证据不足、择时看空、看多后正在核对条件,取消合并的“未转多或版本变化,等待刷新”。
|
||||
- 数据读取故障时,已启用的三源分析不会退回缺少分析的旧建仓路径;该轮观察并保留实际故障。人工关注缺基本面豁免、各路权重、合议规则、限价及风控门槛不变。
|
||||
|
||||
已采纳计划不因页面刷新重新生成或改写;历史提议与原始成交均保留。分析变化后的重评沿用原规则和正常调度,不人工点击采纳、不注入信号或测试委托。
|
||||
|
||||
## 开发机验证
|
||||
|
||||
Python 3.11隔离入口85组全量通过,新增17项专项覆盖技术数据与详情一致、数据过期、沪深范围、真实中性与缺失、证据分歧、旧依据不能确认、后台不能跳过重评、只读不改历史、已采纳不重建及等待原因。最后页面调整重跑三道护栏和17项专项通过。新增读取补有内存日线桩,所有单测禁网。
|
||||
|
||||
1440×1000与390×844浏览器使用11:10真实只读响应和本次纯规则组合做隔离复现,验证苏试中性卡片与技术详情、择时依据不足、确认计划弹窗、旧德赛提议退出确认区及其当前技术看多。未点击最终确认,页面无横向溢出、无JavaScript错误,详情和弹窗可关闭。预览中的其他区域为桩,不属于155实际运行证据。本机证据目录:`/private/tmp/pms-trader-panel-20261112`。
|
||||
|
||||
## 发布边界与回退
|
||||
|
||||
目标仅155模拟PMS的web、worker;唯一WS、beat、行情采集、微盘监控和其他系统保持。部署前复核真实配置、任务和资金对账,先提交代码、构建候选并断网全量,再温和等完在途任务后定向重建。原目录源码和私有.env不变。
|
||||
|
||||
回退只恢复本次两个服务的原镜像配置,不回退提议、历史依据、账本或回报。自然重评可能依法将旧建议转为观察,不应为恢复旧卡片重新改写提议。
|
||||
|
|
@ -203,6 +203,7 @@ HERE = os.path.dirname(os.path.abspath(__file__))
|
|||
ROOT = os.path.dirname(HERE)
|
||||
# 退出纪律专项:两次独立清仓信号、评级下降、事务、双策略隔离及撤单收尾。
|
||||
SUITES = [
|
||||
"test_proposal_trader_view.py", # 当前分析、旧确认保护及交易员操作含义(17例)
|
||||
"test_watch_missing_fund.py",
|
||||
"test_timing_fusion.py", # 三组证据契约、二次清仓与恢复(14例)
|
||||
"test_signal_recovery.py", # 最新方向、停买恢复、网格合议、关注入口与负净成本(16例)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,116 @@
|
|||
"""交易员面板:当前依据一致、缺失不等于中性、旧确认与执行条件隔离(17例)。"""
|
||||
import unit_test_guard
|
||||
import os
|
||||
import sys
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
import copy
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
from datetime import datetime
|
||||
from app.core import proposal_analysis as pa, plan_revision
|
||||
from app.services import tech_service as tech, consensus_service as cs, proposal_service as ps
|
||||
from app.services import plan_recheck as rc, execution_basis as eb, timing_fusion, timing_state
|
||||
from app.repo import tech_repo, pms_repo
|
||||
|
||||
CODE='002920.SZ'
|
||||
NOW=datetime(2026,11,12,11,10)
|
||||
|
||||
def hard(stance='看多'):
|
||||
return {'fund_stance':{'stance':'看多'}, 'tech':{'stance':stance,'phase':'开口向上','data_date':20261111},
|
||||
'timing':{'stance':'无读数'}, 'consensus':{'direction':'看多','route':'交人','strength':'弱'},
|
||||
'preparation':{'status':'ready'},'consumption_id':'saved','proposal_revision':'shown'}
|
||||
|
||||
def proposal():
|
||||
return {'ts_code':CODE,'action':'OPEN','status':'WAIT_USER','proposal_id':'p','qty':100,'hard_numbers':hard()}
|
||||
|
||||
class TraderViewTests(unittest.TestCase):
|
||||
def test_neutral_remains_neutral(self):
|
||||
self.assertEqual(pa.timing_view({'stance':'中性'})['label'],'中性')
|
||||
def test_missing_does_not_claim_neutral_or_fault(self):
|
||||
self.assertEqual(pa.timing_view({})['label'],'买入依据不足')
|
||||
self.assertNotIn('故障',pa.timing_view({})['reason'])
|
||||
def test_valid_conflict_explains_buy_restriction(self):
|
||||
t={'event':{'action':'WAIT','groups':{'a':{'state':'VALID','direction':1},'b':{'state':'VALID','direction':-1}}}}
|
||||
self.assertEqual(pa.timing_view(t)['label'],'多空分歧')
|
||||
t['event']['groups']['b']['state']='EXPIRED'
|
||||
self.assertEqual(pa.timing_view(t)['label'],'买入依据不足')
|
||||
def test_missing_tech_becomes_available_changes_confirmation(self):
|
||||
a,b=hard('无读数'),hard('看多')
|
||||
self.assertTrue(pa.changed(a,b))
|
||||
self.assertNotEqual(plan_revision.confirmation_revision(100,a,{}),plan_revision.confirmation_revision(100,b,{}))
|
||||
def test_transport_time_and_evidence_key_alone_do_not_change_confirmation(self):
|
||||
a=hard();b=copy.deepcopy(a)
|
||||
b['timing'].update(event={'key':'refreshed','verified_at':'new'},fresh=True)
|
||||
b['tech']['latest']={'close':23.4}
|
||||
self.assertFalse(pa.changed(a,b))
|
||||
self.assertEqual(plan_revision.confirmation_revision(100,a,{}),plan_revision.confirmation_revision(100,b,{}))
|
||||
def test_readonly_current_analysis_disables_stale_confirmation_preserves_history(self):
|
||||
p=proposal();p['hard_numbers']['tech']['stance']='无读数';original=copy.deepcopy(p['hard_numbers'])
|
||||
def attach(rows,**kw):
|
||||
rows[0]['consensus_hard']=hard()
|
||||
with patch.object(ps,'_attach_consensus',side_effect=attach),patch.object(pms_repo,'record_proposal_check',side_effect=AssertionError('只读不得写')):
|
||||
cs.decorate_proposals([p],now=NOW)
|
||||
self.assertFalse(p['accept_ready']);self.assertEqual(p['analysis']['tech']['stance'],'看多')
|
||||
self.assertEqual(p['hard_numbers'],original)
|
||||
def test_read_failure_cannot_fall_back_to_unreviewed_open(self):
|
||||
rows=[{'ts_code':CODE}]
|
||||
with patch.object(cs,'nightly_map',return_value={}),patch.object(tech,'read_states_for',side_effect=RuntimeError('read failed')):
|
||||
ps._attach_consensus(rows,now=NOW)
|
||||
self.assertEqual(rows[0]['consensus']['route'],'观察')
|
||||
self.assertNotIn('consensus_hard',rows[0])
|
||||
def test_accepted_plan_is_not_recreated_or_relabelled(self):
|
||||
p=proposal();p['status']='ACCEPTED';original=copy.deepcopy(p)
|
||||
with patch.object(ps,'_attach_consensus',side_effect=AssertionError('已采纳不重评')):
|
||||
cs.decorate_proposals([p],now=NOW)
|
||||
self.assertEqual(p,original)
|
||||
def test_analysis_failure_blocks_confirmation(self):
|
||||
p=proposal()
|
||||
with patch.object(ps,'_attach_consensus',return_value=None):cs.decorate_proposals([p],now=NOW)
|
||||
self.assertFalse(p['accept_ready']);self.assertIn('分析暂不可用',p['prepare_reason'])
|
||||
def test_before_accept_rechecks_analysis_without_model_or_order(self):
|
||||
p=proposal()
|
||||
with patch.object(ps,'is_expired',return_value=False),patch.object(rc,'current_basis',return_value={'view':{'held':[]},'analysis_changed':True}),patch.object(pms_repo,'record_proposal_check',return_value=1),patch.object(rc,'fast_checks',side_effect=AssertionError('不可确认旧分析')):
|
||||
out=rc.before_accept(p,'shown')
|
||||
self.assertFalse(out['ok']);self.assertTrue(out['pending']);self.assertIn('分析已变化',out['error'])
|
||||
def test_refresh_rechecks_changed_analysis_instead_of_ready_shortcut(self):
|
||||
p=proposal()
|
||||
check={'ok':False,'view':{},'analysis_changed':True}
|
||||
# 明确给出有效非空 view,变化须进入既有重扫流程。
|
||||
check.update(view={'held':[]},params={},stock={})
|
||||
with patch.object(rc,'current_basis',return_value=check),patch.object(pms_repo,'record_proposal_check',return_value=1),patch.object(ps,'_scan_open',return_value=[]) as scan,patch.object(rc,'_failed_recheck',return_value={'ok':False}):
|
||||
rc.refresh_one(p,now=NOW)
|
||||
scan.assert_called_once()
|
||||
def test_absent_timing_and_version_refresh_have_different_reasons(self):
|
||||
with patch.object(timing_fusion,'enabled',return_value=True),patch.object(timing_state,'latest',return_value=None):
|
||||
reason=eb.cache_reason({'execution_basis_cache':{'basis':{}}},NOW)
|
||||
self.assertIn('证据不足',reason);self.assertNotIn('版本',reason)
|
||||
with patch.object(timing_fusion,'enabled',return_value=True),patch.object(timing_state,'latest',return_value={'action':'BUY','key':'new'}):
|
||||
reason=eb.cache_reason({'execution_basis_cache':{'basis':{'timing_version':'old'}}},NOW)
|
||||
self.assertIn('择时已转多',reason);self.assertIn('不下单',reason)
|
||||
def test_sell_keeps_buy_block(self):
|
||||
with patch.object(timing_fusion,'enabled',return_value=True),patch.object(timing_state,'latest',return_value={'action':'SELL'}):
|
||||
self.assertEqual(eb.cache_reason({},NOW),'当前择时看空,暂停买入')
|
||||
|
||||
class TechnicalCoverageTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.ps=[]
|
||||
for obj,name,kw in [(tech,'enabled',{'return_value':True}),(tech,'_params',{'return_value':{'stale_tdays':2,'rules':{}}}),
|
||||
(tech,'_tdays_elapsed',{'return_value':1}),(tech_repo,'latest_date',{'return_value':20261111}),
|
||||
(tech.tradedays,'prev_trade_day',{'return_value':20261020}),(tech.tradedays,'ymd',{'side_effect':lambda *a:20261020 if a else 20261112}),
|
||||
(tech.tech_rules,'synthesize',{'return_value':{'stance':'看多','phase':'开口向上','data_date':20261111}})]:
|
||||
p=patch.object(obj,name,**kw);p.start();self.addCleanup(p.stop)
|
||||
def test_candidate_and_detail_share_same_valid_data(self):
|
||||
with patch.object(tech_repo,'history_multi',return_value={CODE:[{'data_date':20261111}]}):
|
||||
self.assertEqual(tech.read_states_for([CODE])[CODE],tech.research_feed(CODE)['tech'])
|
||||
def test_stale_detail_cannot_fall_back_to_old_bullish_map(self):
|
||||
with patch.object(tech,'_tdays_elapsed',return_value=3),patch.object(tech_repo,'history_multi',side_effect=AssertionError('过期不取历史')):
|
||||
self.assertEqual(tech.read_states_for([CODE]),{});self.assertIsNone(tech.research_feed(CODE)['tech'])
|
||||
def test_missing_latest_day_is_not_replaced_with_previous_day(self):
|
||||
with patch.object(tech_repo,'history_multi',return_value={CODE:[{'data_date':20261110}]}):
|
||||
self.assertEqual(tech.read_states_for([CODE]),{})
|
||||
def test_non_mainland_excluded_before_reading(self):
|
||||
with patch.object(tech_repo,'history_multi',return_value={}) as read:
|
||||
tech.read_states_for([CODE,'920000.BJ'])
|
||||
self.assertEqual(read.call_args.args[0],[CODE])
|
||||
|
||||
if __name__=='__main__':unittest.main()
|
||||
|
|
@ -692,10 +692,14 @@ class FakeConsensusStatRepo:
|
|||
|
||||
def install_fakes(prices=None, positions=None, params=None, high5=None, prev_close=None):
|
||||
"""把内存桩装到各模块上, 返回 FakeRepo 实例 (ws 通道桩挂在 .qmt 上)。"""
|
||||
from app.repo import consensus_stat_repo, downstream_repo, pms_repo, qmt_repo
|
||||
from app.repo import consensus_stat_repo, downstream_repo, pms_repo, qmt_repo, tech_repo
|
||||
from app.services import industry, market, param_store, portfolio
|
||||
|
||||
fake = FakeRepo()
|
||||
# 候选与详情共用日线读取,新增入口默认无数据;各专项可注入内存行情。
|
||||
fake.tech_rows = {}
|
||||
tech_repo.latest_date = lambda: max((int(r['data_date']) for rows in fake.tech_rows.values() for r in rows), default=None)
|
||||
tech_repo.history_multi = lambda codes, since=0: {c: [r for r in fake.tech_rows.get(c, []) if int(r['data_date']) >= since] for c in codes}
|
||||
fake.qmt = FakeQmtRepo()
|
||||
fake.consensus_stats = FakeConsensusStatRepo()
|
||||
for name in ("upsert_many", "delete_day_kind", "list_range", "count_by_kind"):
|
||||
|
|
|
|||
Loading…
Reference in New Issue