From e4a7424978d4a6b12653204f0f79027f5e4bff49 Mon Sep 17 00:00:00 2001 From: baobao Date: Thu, 5 Nov 2026 10:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=A1=AE=E8=AE=A4=E5=8E=9F=E5=9E=8B?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=8D=95=E8=A1=8C=E7=9C=9F=E5=AE=9E=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/web/AGENTS.md | 2 +- app/web/static/index.html | 167 ++++++------------------ docs/信号流格式与选股恢复_2026-11-05.md | 12 +- 3 files changed, 52 insertions(+), 129 deletions(-) diff --git a/app/web/AGENTS.md b/app/web/AGENTS.md index c17226c..8ab9604 100644 --- a/app/web/AGENTS.md +++ b/app/web/AGENTS.md @@ -8,7 +8,7 @@ - 使用真实只读响应重放页面时,明确这是浏览器复现,不称为真实登录验收。检查展示不得误触发写接口。 - 用交易员能理解的短句。统一称基本面、技术面、择时,必要说明放悬停;表格操作列在页面内可见,不堆内部实现词。 - 后续页面修改沿用现有布局、字号、间距、配色、组件和交互习惯。新增信息优先融入原有区域,不另起一套视觉样式;整体改版以用户明确要求为准。 -- 信号流统一按“时间 → 持仓标签或关注标签 → 可点击股票名称 → 信号发出系统 → 信号内容”展示,沿用现有信息流和个股详情交互。持仓标签优先,用户关注并入原持仓信号分类,不另设关注卡片、分区或摘要行。发出系统须来自真实来源,分析类型不能代替系统名称;每日与盘中真实结果保留结论及理由,长文在原行展开。缺时间不得编造,等待状态留在原详情,原有效期及其他规则不变。 +- 信号流按已确认原型保持完整单行,顺序为时间、持仓或关注标签、可点击股票名称、原信号系统名称、原信号短内容、原级别。保留“决策系统”“资金分布”等用户可理解的现有名称,不改为内部项目名。持仓标签优先,关注与持仓共用现有信号入口、排序、上限和分类,不另设关注区;无真实信号不占行。研究观察、每日完成、等待和超时均留在原个股详情,不生成信号行。不增加原始读数、长理由、行内折叠或展开按钮;原有效期和其他信号规则保持。 - 看多红、看空绿、中性灰、无读数虚框。指标的冷暖阈值柱图沿用现有蓝、金、灰,不把阈值高低强行解释成看多看空。 - 策略展示为“主观量化”和“微盘轮动”,持仓分别用标签页。数量和阈值来自当前规则,不能把30或50写死;策略详情新标签页打开,不替换当前管理页。 - 明确区分计划数量、实际委托、受理、成交与入账。没有出口委托不能显示“已下单”,请求失败或旧行情不能显示成正常完成。 diff --git a/app/web/static/index.html b/app/web/static/index.html index 894f6ff..ea7250a 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -400,16 +400,15 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} .sigrow2 .cat{color:var(--muted);font-size:11.5px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:34%;} .sigrow2 .dim,.sigrow2 .disp{flex:none;white-space:nowrap;} .sigrow2 .sp{flex:1;} -.sigrow2.flowrow{align-items:baseline;} -.sigrow2.flowrow.expanded{flex-wrap:wrap;row-gap:2px;} -.sigrow2.flowrow .t{width:auto;min-width:36px;white-space:nowrap;} -.sigrow2.flowrow .nm{flex:none;overflow:visible;} -.sigrow2.flowrow .system{font-size:11.5px;color:var(--muted);white-space:nowrap;} -.flow-copy{display:flex;align-items:flex-start;gap:4px;flex:1;min-width:0;} -.sigrow2.flowrow.expanded .flow-copy{flex-basis:100%;} -.flow-content{flex:1;min-width:0;line-height:1.5;white-space:pre-wrap;overflow-wrap:anywhere;} -.flow-content.folded{display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} -.flow-more{flex:none;border:0;background:none;padding:0;color:var(--accent);font:inherit;font-size:11px;cursor:pointer;} +/* 速览与决策列表沿用原单行:身份只占一个标签,内容只放原信号短句。 */ +.sigrow2.signal-flow{gap:4px;white-space:nowrap;} +.sigrow2.signal-flow .t{width:32px;} +.sigrow2.signal-flow .nm,.sigrow2.signal-flow .cat{flex:none;max-width:none;overflow:visible;text-overflow:clip;} +.sigrow2.signal-flow .direction{flex:none;white-space:nowrap;} +.sigrow2.signal-flow .disp{font-size:11px;padding:0 6px;} +.sigrow2.signal-flow.history-row{gap:3px;} +.sigrow2.signal-flow.history-row .t{width:auto;} +@media(max-width:360px){#railL.open{left:8px;max-width:calc(100vw - 16px);}} .sigrow2.old{opacity:.5;} .sigrow2.clk{cursor:pointer;border-radius:4px;} .sigrow2.clk:hover{background:rgba(64,120,220,.08);} @@ -812,7 +811,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} 信号流 今天 {{ sigBriefHeld.length + sigBriefOther.length }} 条 · 持仓 {{ sigBriefHeldCount }}
- + @@ -822,7 +821,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} - +
今天暂无信号。
@@ -937,16 +930,14 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} · {{ sigDecisionRows.length }} 条 · 读取失败
-
+
{{ flowTime(r) }} {{ flowLabel(r) }} - {{ flowSystem(r) }} -
- {{ flowHeadline(r) }}{{ flowRemainder(r) }} - -
- {{ lvLabel(r.level) }} + {{ r.cat }} + {{ r.direction }} + + {{ lvLabel(r.level) }}
读取失败:{{ srcFail('intraday').error }}
暂无信息
@@ -4342,76 +4333,10 @@ createApp({ const flowSort = rows => rows.sort((a,b)=>flowStamp(b)-flowStamp(a)); const flowTime = row => row.ymd && row.ymd!==flowDay() ? row.ymd.slice(5)+' '+(hm(row.time)||'—') : (hm(row.time)||'—'); - function flowDateValid(value) { - if(!/^\d{4}-\d{2}-\d{2}$/.test(value||''))return false; - const date=new Date(value+'T00:00:00Z'); - return Number.isFinite(date.getTime())&&date.toISOString().slice(0,10)===value; - } const flowLabel = row => (row.held ?? heldCodeSet.value.has(code6(row.ts_code))) ? '持仓' : (row.watched ?? watchedCodeSet.value.has(code6(row.ts_code))) ? '关注' : (row.plan ?? planCodeSet.value.has(code6(row.ts_code))) ? '计划' : ''; - // 与 upstream_signals 的只读源分流一致;未知类别不猜发出系统。 - const flowSystem = (row,kind) => (kind||row.flowKind)==='alerts' ? (row.cat_label||row.cat||'盘中择时') : - ({research:'Bionic',decision:'Bionic',sell:'Bionic',timing:'盘中择时'}[kind||row.flowKind]||'来源待核实'); - const flowSystemTitle = row => row.flowKind==='alerts' ? '盘中择时系统 · '+flowSystem(row) : flowSystem(row); - function flowContent(row,kind) { - kind=kind||row.flowKind; - const text=[]; - if(kind==='research') { - text.push(row.direction+'('+(row.kind==='daily'?'每日':'盘中')+')'); - if(row.reason)text.push((row.kind==='daily'?'状态说明:':'')+row.reason); - text.push('行情数据日:'+row.dataDate); - } else if(kind==='sell') { - text.push(row.dominant_signal==='take_profit'?'建议止盈':'建议卖出'); - if(row.reason)text.push(row.reason); - if(confPct(row.confidence)!=null)text.push('把握 '+confPct(row.confidence)); - } else if(kind==='decision'||kind==='timing') { - text.push(kind==='timing'?'买入时机':row.action==='SELL'?'建议卖出':row.action==='BUY'?'建议买入':'方向待核实'); - if(row.reason)text.push(row.reason); - if(row.price!=null)text.push('参考价 '+row.price); - if(row.target!=null)text.push('目标价 '+row.target); - if(confPct(row.confidence)!=null)text.push('把握 '+confPct(row.confidence)); - if(row.entry_score!=null)text.push('入场评分 '+row.entry_score); - } else { - text.push(row.direction&&row.direction!=='—'?row.direction:'方向未提供'); - if(row.value!=null)text.push('读数 '+row.value); - if(row.reason)text.push(row.reason); - } - return text.join(';'); - } - const flowHeadline = (row,kind) => flowContent(row,kind).split(';')[0]; - const flowRemainder = (row,kind) => flowContent(row,kind).slice(flowHeadline(row,kind).length); - const flowTone = (row,kind) => row.research ? techStanceCls(row.direction) : - dirCls(row.direction||row.action||((kind||row.flowKind)==='sell'?'SELL':(kind||row.flowKind)==='timing'?'BUY':'')); - const flowOpen = ref(new Set()); - const flowKey = (row,kind) => [row.ts_code,kind||row.flowKind,row.kind,row.token||'',row.time||'',row.ymd||'',flowContent(row,kind)].join('|'); - const flowExpanded = (row,kind) => flowOpen.value.has(flowKey(row,kind)); - function toggleFlow(row,kind) { - const key=flowKey(row,kind),next=new Set(flowOpen.value); - if(next.has(key))next.delete(key);else next.add(key); - flowOpen.value=next; - } - // 每个真实完成阶段各留一条;不以等待记录替代信号,也不被同股的其他来源吞掉。 - const watchResearchRows = computed(() => { - const seen=new Set(); - return planUserActiveRows.value.flatMap(r => { - if(r.review_status!=='completed')return []; - const base={ts_code:normCode(r.ts_code||r.code),research:true,watched:true,flowKind:'research', - held:heldCodeSet.value.has(code6(r.ts_code||r.code)),plan:planCodeSet.value.has(code6(r.ts_code||r.code))}; - return ['daily','intraday'].flatMap(kind=>{ - const stage=(r.analysis_coverage||{})[kind]||{},stamp=Date.parse(stage.completed_at||''); - if(stage.state!=='COMPLETE'||!T.watchObservation[stage.observation]||!flowDateValid(stage.data_date) - ||stage.data_date>flowDay()||!Number.isFinite(stamp)||stamp>Date.now()+30000)return []; - const key=[base.ts_code,kind,stage.token||[stage.review_ref||r.review_ref||'',stage.completed_at].join(':')].join('|'); - if(seen.has(key))return []; - seen.add(key); - const at=new Date(stamp),ymd=new Intl.DateTimeFormat('en-CA',{timeZone:'Asia/Shanghai',year:'numeric',month:'2-digit',day:'2-digit'}).format(at); - return [{...base,kind,token:stage.token||'',time:at.toLocaleTimeString('en-GB',{timeZone:'Asia/Shanghai',hour12:false}),ymd,sortAt:stamp, - stale:ymd!==flowDay(),cat:kind==='daily'?'每日判断':'盘中观察',direction:T.watchObservation[stage.observation], - reason:stage.reason||'',dataDate:stage.data_date}]; - }); - }); - }); + // 关注只扩大原信号的归类范围;研究观察、完成回执和等待状态不生成信号行。 const sigBrief = computed(() => { const held = heldCodeSet.value; const out = []; @@ -4423,7 +4348,7 @@ createApp({ } const s = SIG.value; for (const r of (s.sell || [])) out.push({ - ...r, flowKind:'sell', ts_code: r.ts_code, time: r.time || '', cat: '建议卖出', + ...r, flowKind:'sell', ts_code: r.ts_code, time: r.time || '', cat: '决策系统', direction: '卖出', level: 'DANGER', held: held.has(code6(r.ts_code)), ymd: r.ymd || '', today: r.today !== false }); for (const r of (s.decision || [])) out.push({ @@ -5382,26 +5307,14 @@ createApp({ // 昨天以前的, 页面又只显示 HH:MM —— 昨天 14:49 的旧条目会挂在今天 13:20 的页面上冒充 // 新消息。今天的照常按持仓分两段; 更早的收进底部折叠区, 带日期、置灰 —— 不丢信息也不吵人。 const sigToday = computed(() => sigBrief.value.filter(x => x.today !== false)); - const sigDisplayToday = computed(() => flowSort([...sigToday.value,...watchResearchRows.value])); - const sigDecisionRows = computed(() => flowSort([ - ...SIG.value.decision.slice(0,16).map(r=>({...r,flowKind:'decision',cat:'买卖广播',direction:r.action==='SELL'?'建议卖出':'建议买入'})), - ...watchResearchRows.value])); + const sigDisplayToday = computed(() => flowSort([...sigToday.value])); + const sigDecisionRows = computed(() => flowSort(SIG.value.decision.slice(0,16).map(r=>({ + ...r,cat:'决策系统',direction:r.action==='SELL'?'卖出':'买入'})))); const sigOld = computed(() => sigBrief.value.filter(x => x.today === false)); const showOldSig = ref(false); - // 原信号限数不变;关注与持仓共用一段,同股不同来源和两个研究阶段分别保留。 - function flowRowsFor(held) { - const originals=sigToday.value.filter(x=>Boolean(x.held||x.watched)===held),shown=originals.slice(0,60); - if(held){ - for(const row of planUserActiveRows.value){ - const code=code6(row.ts_code||row.code); - if(!shown.some(x=>code6(x.ts_code)===code)){ - const original=originals.find(x=>code6(x.ts_code)===code); - if(original)shown.push(original); - } - } - shown.push(...watchResearchRows.value); - } - return flowSort(shown); + // 持仓和关注使用同一信号入口、时间排序和数量上限;无信号不生成占位。 + function flowRowsFor(primary) { + return flowSort(sigToday.value.filter(x=>Boolean(x.held||x.watched)===primary)).slice(0,60); } const sigBriefHeld = computed(() => flowRowsFor(true)); const sigBriefOther = computed(() => flowRowsFor(false)); @@ -5560,7 +5473,7 @@ createApp({ showAlerts, alertItems, alertLatest, alertLevelClass, alertGroups, alertStripItems, alertStripCount, alertTotalCount, catShown, toggleCat, ageText, alertRowClass, alertItemsF, levelShown, toggleLevel, sellOpen, toggleSell, levelCount, ALERT_LEVELS, lvLabel, lvClass, alertGridFixed, passLevel, flowText, flowClass, - sigBrief, sigBriefHeldCount, heldSigOf, openSigCenter, sigToday, sigDisplayToday, sigDecisionRows, flowTime, flowLabel, flowSystem, flowSystemTitle, flowContent, flowHeadline, flowRemainder, flowTone, flowExpanded, toggleFlow, sigOld, showOldSig, + sigBrief, sigBriefHeldCount, heldSigOf, openSigCenter, sigToday, sigDisplayToday, sigDecisionRows, flowTime, flowLabel, sigOld, showOldSig, SIG, moneyCn, zBand, zBars, dirUp, dirCls, confPct, eventsQuiet, MSG_KINDS, kindLabel, hm, msgOpen, msgKind, msgFeed, msgCounts, msgShown, msgLatest, msgLevelClass, setMsgKind, msgGo, diff --git a/docs/信号流格式与选股恢复_2026-11-05.md b/docs/信号流格式与选股恢复_2026-11-05.md index 5be1161..9fed45c 100644 --- a/docs/信号流格式与选股恢复_2026-11-05.md +++ b/docs/信号流格式与选股恢复_2026-11-05.md @@ -2,7 +2,17 @@ 2026年11月5日,北京时间。本记录承接[人工关注后续跟进](人工关注后续跟进与信号融合_2026-11-04.md)。用户本次明确要求关注股票使用原单行信息流,顺序为时间、持仓或关注标签、可点击股票名称、发出系统、实际信号内容,并入原持仓分类,过期时间及其他规则保持。本次要求取代旧文档中“不显示关注身份”的描述。 -## 信号流实现 +## 已确认原型的后续修正 + +10:27版本随后被用户指出仍偏离要求:研究观察占据真实信号位置,长理由导致截断和无意义展开,内部项目名替换原“决策系统”。该版虽通过当时测试,不能视为用户设计验收通过。下方原实现及发布保留为历史,后续以本节用户确认的原型为准。 + +用户先确认原型,再授权实施。关注与持仓共用现有信号入口,只在时间后增加一个身份标签,持仓优先。显示顺序为时间、身份、可点击股票名、原系统或类别名称、原信号短内容、原级别。恢复“决策系统”“资金分布”等现有名称,行内不放原始读数、研究说明、长理由和展开按钮。每天及盘中研究、买方评析仍保留在原个股详情和分析流程中,不生成“观察”或“完成”占位信号。 + +同组按真实信号时间倒序,持仓与关注共用60条上限,不再给关注单独追加研究或兜底行。关注到期、原信号置灰、旧日记录默认折叠及真实时间保持。没有信号时不占行。本轮不改后端、调度、回执、参数或交易行为,仅更新网页。极窄屏只收紧左侧浮层外边距,给旧信号的完整日期留足空间,不缩小股票字号或截断正文。 + +10:44:02取得155真实只读响应:6只关注尚未命中当前既有信号快照,因此新流不显示其研究回执。真实信号按原规则复现,另以明确标注的离线边界夹具核验关注有信号时的同类展示、持仓优先、到期标签、无信号不占行以及统一60条上限。开发机隔离全量ALL SUITES PASS,最终三道页面护栏通过;最终浏览器及155候选、发布证据后附。 + +## 10:27信号流实现(历史,已被上方原型取代) 持仓标签优先于关注标签。关注与持仓共用原置顶段,不增加独立关注分区、进度卡片或摘要行。股票名称进入原个股详情;默认保持原单行密度,长内容悬停可读,行内展开后展示全文。原级别标签仍在末尾,原资金分布等信号保留类别与看涨、看跌信息,研究显示Bionic真实观察结论及每日或盘中阶段。每日回执原固定完成说明仍明确为状态说明,不声称其是模型理由。