将股汇和微盘悬浮框改为趋势图展示

This commit is contained in:
baobao 2026-10-28 10:27:48 +08:00
parent 378af8f16d
commit c9ad9f3d5e
7 changed files with 172 additions and 59 deletions

View File

@ -532,6 +532,7 @@ def status() -> dict:
continue
latest = rows[0] if rows else None
item["history"] = [{"ymd": int(r["trade_date"]),
"data_ymd": (r.get("detail") or {}).get("zs_last"),
"value": (None if r.get("value") is None
else float(r["value"])),
"zone": r.get("zone")} for r in reversed(rows)]

View File

@ -82,6 +82,37 @@ def activation_errors():
return errors
def signal_history(end, limit=60):
"""只读展示历史,来自监控同一公式;不参与轮换决策。"""
day = dt.date.fromisoformat(end)
if day > dt.datetime.now(TZ).date():
raise ValueError('趋势日期不能晚于今天')
url = configuration()['url']
if not url:
raise ValueError('监控地址未配置')
n = max(1, min(120, int(limit)))
response = requests.get(url+'/v1/history', params={'end': end, 'limit': n}, timeout=(3, 8))
response.raise_for_status()
if len(response.content) > 512*1024:
raise ValueError('趋势数据超过大小限制')
value = response.json()
rows = value.get('records')
if value.get('rule_version') != core.RULE or not isinstance(rows, list) or len(rows) > n:
raise ValueError('趋势规则或格式不符')
previous = ''
for row in rows:
date = row.get('date', '')
dt.date.fromisoformat(date)
if date <= previous or date > end:
raise ValueError('趋势日期重复、乱序或超出范围')
previous = date
values = [row.get(k) for k in ('activity', 'activity_percentile', 'low_threshold', 'high_threshold')]
values += list((row.get('group_percentiles') or {}).values())
if any(v is not None and (isinstance(v, bool) or not isinstance(v, (int, float)) or not math.isfinite(v)) for v in values):
raise ValueError('趋势数值无效')
return value
def status():
config = configuration()
out = {'mode': config['mode'], 'control': config['control'], 'rule_version': core.RULE,

View File

@ -52,6 +52,12 @@ def rotation_status():
return ok(status)
@app.get('/api/rotation/history')
def rotation_history(end: str, limit: int = 60):
from app.services.rotation_service import signal_history
return ok(signal_history, end=end, limit=limit)
@app.post('/api/ops/rotation/control')
def rotation_control(request: Request, payload: dict = Body(...)):
from app.services.rotation_service import control

View File

@ -43,8 +43,20 @@ body{margin:0;background:var(--plane);color:var(--ink);
.hst.entry{background:var(--up-weak);color:var(--up);}
.hst.exit{background:var(--down-weak);color:var(--down);}
.hst.missing{background:transparent;color:var(--muted);outline:1px dashed var(--muted);outline-offset:-1px;}
.micro-readings{display:grid;grid-template-columns:1fr auto;gap:5px 18px;margin:8px 0;}
.micro-popover{max-width:min(440px,calc(100vw - 40px));line-height:1.8;}
.market-popover{width:min(440px,calc(100vw - 44px));font-size:12px;line-height:1.5;}
.market-popover .trend-heading{display:flex;justify-content:space-between;align-items:center;gap:8px;margin-bottom:5px;}
.market-popover .trend-heading b{font-size:13px;}
.market-popover .trend-value{font-size:19px;font-weight:650;}
.market-popover .trend-meta{color:var(--muted);font-size:11px;display:flex;justify-content:space-between;gap:8px;flex-wrap:wrap;}
.market-popover .trend-section+.trend-section{border-top:1px solid var(--hair);padding-top:9px;margin-top:8px;}
.market-popover .trend-legend{display:flex;gap:12px;flex-wrap:wrap;font-size:11px;margin:3px 0;}
.market-popover .trend-key{display:inline-flex;align-items:center;gap:4px;}
.market-popover .trend-key i{display:inline-block;width:14px;border-top:2px solid;}
.market-popover .trend-key i.dashed{border-top-style:dashed;}
.market-popover svg{display:block;width:100%;height:auto;overflow:visible;}
.market-popover svg text{font-size:10px;fill:var(--muted);font-family:inherit;}
.market-popover .trend-foot{margin-top:6px;font-size:11px;color:var(--ink-2);}
.market-popover .trend-empty{padding:25px 0;text-align:center;color:var(--muted);border:1px dashed var(--hair);margin:6px 0;}
.hd .tbtn{padding:4px 11px;}
.hd-menu .car{margin-left:5px;font-size:10px;color:var(--muted);}
.hd-menu:focus,.hd-menu:focus-visible{outline:none;}
@ -585,70 +597,58 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
所以正常显示的是上一交易日; 拉取时刻按持仓系统自己记的时间戳显示。全文见悬停。 -->
<span class="hst hd-plan" :class="planStatus.ok===false?'warn':'ok'" :title="planTagTip">计划 {{ planTagText }}</span>
<span class="hst hd-tech" :class="techChipCls" :title="'技术面读数日 ' + techChipText + '。每晚算的技术面读数(布林线、多空布林线、SAR)是哪天的。蓝=今天的映射新鲜;黄=读不到或已过期;灰=技术面这一层没开。'">技术面 {{ techChipText }}</span>
<el-tooltip placement="bottom-start" effect="light" :show-after="120">
<el-tooltip placement="bottom-start" effect="light" :show-after="120" :enterable="true">
<template #content>
<div style="max-width:360px;font-size:12px;line-height:1.75">
<template v-if="macro.enabled===false"><b>大盘冷热这一层没开</b><div class="muted">可在运维视图启用大盘冷热分析</div></template>
<template v-else-if="!mzSig"><b>大盘冷热</b>:还没有数据(今天还没扫描过,交易日 09:35 自动跑)</template>
<template v-else>
<div v-if="mzPublished.ready"><b>股汇对冲指数 · 已发布值</b> <b class="mono">{{ microNumber(mzPublished.value) }}</b><div class="muted">数据日期 {{ mzDate(mzPublished.data_ymd) }} · 来源 gp_stock_fx_hedge_index</div></div>
<div v-else style="color:var(--warn)">{{ mzPublished.error || '已发布指数待核实' }}</div>
<div v-if="mzDifferent" style="color:var(--warn);margin:5px 0">已发布值与PMS计算值不一致,当前交易判断使用下方PMS计算值。</div>
<div style="margin-top:7px"><b>PMS择时计算</b>
<span class="mono" style="font-weight:700" :style="{color: mzColor(mzSig.zone)}">{{ microNumber(mzSig.value) }}</span>
<span class="mz-zone" :style="{background: mzColor(mzSig.zone)}">{{ mzLabel(mzSig.zone) }}</span>
</div><div class="muted">数据 {{ mzDate(mzSig.data_ymd) }} · 扫描 {{ mzDate(mzSig.ymd) }}</div>
<div class="muted" v-if="mzSig.e_now>0">偏离深度 {{ mzSig.e_now }}<template v-if="mzSig.streak"> · 区内第 {{ mzSig.streak }} 天</template></div>
<div class="muted" v-if="mzSig.note">{{ mzSig.note }}</div>
<div class="mz-bars" v-if="(mzSig.history||[]).length">
<span v-for="(h,i) in mzSig.history" :key="i" class="mz-bar" :style="mzBarStyle(h)"
:title="h.ymd + ' · ' + (h.value==null ? '不可用' : h.value) + ' · ' + mzLabel(h.zone)"></span>
<div class="market-popover macro-popover">
<div class="trend-heading"><b>股汇对冲指数</b><span>{{ macro.enabled===false ? '未启用' : mzSig ? mzLabel(mzSig.zone) : '暂无数据' }}</span></div>
<template v-if="mzSig">
<div class="trend-heading"><span>执行值 <b class="trend-value mono">{{ microNumber(mzSig.value) }}</b></span><span class="muted">发布值 {{ mzPublished.ready ? microNumber(mzPublished.value) : '待核实' }}</span></div>
<div class="trend-meta"><span>数据 {{ mzDate(mzSig.data_ymd) }}</span><span>发布 {{ mzPublished.ready ? mzDate(mzPublished.data_ymd) : '未知' }}</span></div>
<div v-for="chart in [macroChart]" :key="chart.title" class="trend-section">
<div class="trend-legend"><span v-for="line in chart.lines.filter(l => !l.hideLegend)" :key="line.name" class="trend-key"><i :class="{dashed:line.dash}" :style="{borderColor:line.color}"></i>{{ line.name }}</span></div>
<svg v-if="chart.available" viewBox="0 0 440 148" role="img" :aria-label="chart.title + '趋势'">
<g v-for="tick in chart.ticks" :key="tick.label"><line x1="40" x2="426" :y1="tick.y" :y2="tick.y" stroke="var(--hair)"></line><text x="33" :y="tick.y+3" text-anchor="end">{{ tick.label }}</text></g>
<path v-for="line in chart.lines" :key="line.name" :d="line.path" fill="none" :stroke="line.color" :stroke-width="line.dash ? 1 : 2" :stroke-dasharray="line.dash ? '4 4' : null" stroke-linejoin="round"></path>
<g v-for="point in chart.dots" :key="point.key"><circle :cx="point.x" :cy="point.y" r="2.4" :fill="point.color"></circle></g>
<rect v-for="point in chart.hover" :key="point.date" :x="point.x" y="12" :width="point.width" height="110" fill="transparent"><title>{{ point.text }}</title></rect>
<text x="40" y="141">{{ chart.first }}</text><text x="233" y="141" text-anchor="middle">{{ chart.middle }}</text><text x="426" y="141" text-anchor="end">{{ chart.last }}</text>
</svg>
<div v-else class="trend-empty">暂无有效趋势数据</div>
</div>
<div class="muted" style="font-size:11px">执行信号近 {{ (mzSig.history||[]).length }} 个交易日 · 热 +{{ (macro.params||{}).hot_th }} / 冷 {{ (macro.params||{}).cold_th }} / 退出带 ±{{ (macro.params||{}).exit_band }} · 档位 {{ macro.autonomy==='full' ? '全自动' : (macro.autonomy==='propose_only' ? '只出建议' : '只算不动') }}</div>
<div v-if="macroGateOn" style="color:var(--warn)">大盘偏热,系统已经停掉自身发起的买入,以及策略里的买入动作。卖出不受影响,人工下的命令也不受影响。</div>
<div v-if="mzSig.advice && !mzSig.advice.adopted" style="margin-top:4px">
<b>今日建议:{{ mzSig.advice.direction==='REDUCE' ? '降仓' : '升仓' }} {{ (mzSig.advice.pct*100).toFixed(1) }}%</b>
<button class="tbtn pri" style="margin-left:8px" @click="macroAdopt(mzSig.key)">采纳并下命令</button>
<div class="muted" style="font-size:11px">{{ mzSig.advice.why }} · 当日有效,隔日作废</div>
</div>
<div class="muted" v-if="mzSig.last_command" style="font-size:11px">最近一条大盘冷热命令 {{ mzSig.last_command.command_id }} · {{ mzSig.last_command.cmd_type==='REDUCE_EXPOSURE' ? '降仓' : '升仓' }} · {{ mzSig.last_command.status }}</div>
<div v-show="mode==='ops'" style="margin-top:5px">
<button class="tbtn" @click="macroScan(true)">试算一遍</button>
<button class="tbtn" @click="macroScan(false)">立即扫描</button>
</div>
<div style="color:var(--warn)" v-if="mzSig.error">读取失败: {{ mzSig.error }}</div>
<div class="trend-foot">冷 {{ (macro.params||{}).cold_th }} · 热 +{{ (macro.params||{}).hot_th }} · 退出 ±{{ (macro.params||{}).exit_band }}<span v-if="mzDifferent"> · 两值有差异,按执行值择时</span></div>
<div v-if="macroGateOn" class="trend-foot" style="color:var(--warn)">偏热,自动买入暂停</div>
<div v-if="mzAdvicePending" class="trend-foot"><b>{{ mzSig.advice.direction==='REDUCE' ? '降仓' : '升仓' }}建议 {{ (mzSig.advice.pct*100).toFixed(1) }}%</b> <button class="tbtn pri" @click="macroAdopt(mzSig.key)">采纳并下命令</button></div>
<div v-show="mode==='ops'" class="trend-foot"><button class="tbtn" @click="macroScan(true)">试算一遍</button> <button class="tbtn" @click="macroScan(false)">立即扫描</button></div>
<div v-if="mzSig.error" class="trend-foot" style="color:var(--warn)">趋势读取失败</div>
</template>
</div>
</template>
<span class="hst hd-macro" :class="mzChipCls" :style="mzAdvicePending ? 'cursor:pointer' : ''" @click="macroChipClick" title="股汇指数:悬停查看已发布读数、PMS择时计算、数据日期与执行信号。">大盘 {{ mzChipText }}</span>
<span class="hst hd-macro" :class="mzChipCls" :style="mzAdvicePending ? 'cursor:pointer' : ''" @click="macroChipClick">大盘 {{ mzChipText }}</span>
</el-tooltip>
<el-tooltip placement="bottom" effect="light" :show-after="200" :enterable="true">
<template #content>
<div class="micro-popover">
<b>微盘轮动 · 入场与退出</b>
<div class="muted" v-if="microSnapshot.data_date">数据 {{ microSnapshot.data_date }} · 执行 {{ microSnapshot.effective_date }} · {{ microSnapshot.frozen ? '已冻结' : '未冻结' }}</div>
<div v-if="microError" style="color:var(--warn)">{{ microError }}</div>
<template v-if="microReady">
<div class="micro-readings">
<span>微盘活跃度</span><b class="mono">{{ microNumber(microSignal.activity) }}</b>
<span>活跃度历史分位</span><b class="mono">{{ microPercent(microSignal.activity_percentile) }}</b>
<span>低位入场线(历史5%)</span><span class="mono">{{ microNumber(microSignal.low_threshold) }} · {{ microSignal.low ? '已触发' : '未触发' }}</span>
<span>高位退出线(历史95%)</span><span class="mono">{{ microNumber(microSignal.high_threshold) }} · {{ microSignal.high ? '已触发' : '未触发' }}</span>
<span>成长主线瓦解入场</span><b>{{ microSignal.growth_break ? '已触发' : '未触发' }}</b>
<span>成长近60日曾过热</span><span>{{ microSignal.growth_recent_hot == null ? '—' : microSignal.growth_recent_hot ? '是' : '否' }}</span>
<span>成长距前20日最高收盘</span><span class="mono">{{ microPercent(microSignal.growth_price_damage) }}</span>
</div>
<div class="muted">活跃度历史分位:白马 {{ microPercent((microSignal.group_percentiles||{}).large) }} · 成长 {{ microPercent((microSignal.group_percentiles||{}).growth) }} · 微盘 {{ microPercent((microSignal.group_percentiles||{}).small) }}</div>
<div class="muted">活跃度为中证2000近5日平均成交额与此前252日成交额中位数之比,历史分位使用此前756个交易日。</div>
<div class="muted">成长主线瓦解或活跃度低于低位线时入场,高于高位线时退出。价格回落本身不等于成长主线瓦解。</div>
</template>
<div class="muted" v-if="microSnapshot.signal_ready && !microSnapshot.basket_ready">目标名单尚未就绪,暂停新增和换仓。</div>
<div class="muted">{{ microPhaseText }} · {{ microModeText }}</div>
<div v-if="(microState.blocked||[]).length" style="color:var(--warn)">{{ (microState.blocked||[]).join(';') }}</div>
<a href="/rotation">查看目标名单、资金与执行进度</a>
<div class="market-popover micro-popover">
<div class="trend-heading"><b>微盘轮动</b><span>{{ microReady ? microSignal.high ? '退出信号' : microSignal.low || microSignal.growth_break ? '入场信号' : '未触发' : '数据待核实' }}</span></div>
<div class="trend-meta"><span>数据 {{ microSnapshot.data_date || '未知' }}</span><span>执行 {{ microSnapshot.effective_date || '未知' }}</span></div>
<div v-if="microError" class="trend-foot" style="color:var(--warn)">{{ microError }}</div>
<div v-for="chart in microCharts" :key="chart.title" class="trend-section">
<div class="trend-heading"><b>{{ chart.title }}</b><span class="mono">{{ chart.current }}</span></div>
<div class="trend-legend"><span v-for="line in chart.lines.filter(l => !l.hideLegend)" :key="line.name" class="trend-key"><i :class="{dashed:line.dash}" :style="{borderColor:line.color}"></i>{{ line.name }}</span></div>
<svg v-if="chart.available" viewBox="0 0 440 148" role="img" :aria-label="chart.title + '趋势'">
<g v-for="tick in chart.ticks" :key="tick.label"><line x1="40" x2="426" :y1="tick.y" :y2="tick.y" stroke="var(--hair)"></line><text x="33" :y="tick.y+3" text-anchor="end">{{ tick.label }}</text></g>
<path v-for="line in chart.lines" :key="line.name" :d="line.path" fill="none" :stroke="line.color" :stroke-width="line.dash ? 1 : 2" :stroke-dasharray="line.dash ? '4 4' : null" stroke-linejoin="round"></path>
<g v-for="point in chart.dots" :key="point.key"><circle :cx="point.x" :cy="point.y" r="2.4" :fill="point.color"></circle></g>
<rect v-for="point in chart.hover" :key="point.date" :x="point.x" y="12" :width="point.width" height="110" fill="transparent"><title>{{ point.text }}</title></rect>
<text x="40" y="141">{{ chart.first }}</text><text x="233" y="141" text-anchor="middle">{{ chart.middle }}</text><text x="426" y="141" text-anchor="end">{{ chart.last }}</text>
</svg>
<div v-else class="trend-empty">暂无有效趋势数据</div>
</div>
<div v-if="microHistoryError" class="trend-foot" style="color:var(--warn)">{{ microHistoryError }}</div>
<div class="trend-foot">低于5%入场 · 高于95%退出 · 成长瓦解 {{ microReady ? microSignal.growth_break ? '已触发' : '未触发' : '待核实' }}</div>
<div class="trend-meta" style="margin-top:6px"><span>历史按当前数据计算</span><a href="/rotation">策略详情 →</a></div>
</div>
</template>
<a class="hst hd-micro" :class="microChipClass" href="/rotation" style="text-decoration:none" title="微盘轮动:悬停查看入场指标,点击查看策略轮换。">微盘 {{ microChipText }}</a>
<a class="hst hd-micro" :class="microChipClass" href="/rotation" style="text-decoration:none">微盘 {{ microChipText }}</a>
</el-tooltip>
<span class="hst" :class="dm.shadow?'idle':'ok'" v-show="mode==='ops'" title="下发模式。实盘=真的发到 QMT 下单;影子=只记录,不真下单,用来观察。">下发 {{ dm.mode || '-' }}</span>
</div>
@ -4352,6 +4352,7 @@ createApp({
}
// 读取执行使用的每日快照;数据失败时清除旧值,不把未知判断显示为未触发。
const micro = ref({});
const microHistory = ref([]), microHistoryError = ref('');
const microSnapshot = computed(() => micro.value.snapshot || {});
const microSignal = computed(() => microSnapshot.value.signal || {});
const microState = computed(() => micro.value.state || {});
@ -4380,8 +4381,56 @@ createApp({
const d = await call('get','/api/rotation');
micro.value = d && d.ok !== false ? (d.data || d) : {error:(d && d.error) || '接口未返回有效数据'};
} catch (e) { micro.value = {error:'接口暂不可用'}; }
microHistory.value = []; microHistoryError.value = '';
const day = microSnapshot.value.data_date;
if (!day) return;
try {
const d = await call('get','/api/rotation/history?end='+encodeURIComponent(day)+'&limit=60');
const h = d && d.ok !== false ? (d.data || d) : null;
if (!h || !Array.isArray(h.records) || !h.records.length) throw new Error('no history');
microHistory.value = h.records;
} catch (e) { microHistoryError.value = '历史趋势暂不可用'; }
}
// 统一画出真实正负值与缺口,不把空值变成零,不截断极值。
function trendChart(title, rows, specs, percent=false, domain=null) {
const valid = v => v != null && v !== '' && Number.isFinite(Number(v));
const fmt = v => valid(v) ? (percent ? Number(v).toFixed(1)+'%' : Number(v).toFixed(2)) : '缺失';
const values = specs.flatMap(l => rows.map(l.value).filter(valid).map(Number));
let lo = domain ? domain[0] : Math.min(0,...values), hi = domain ? domain[1] : Math.max(0,...values);
if (hi===lo) hi=lo+1;
if (!domain) { const step=Math.pow(10,Math.floor(Math.log10(hi-lo)))/2;lo=Math.floor(lo/step)*step;hi=Math.ceil(hi/step)*step;if(hi===lo)hi=lo+step; }
const x = i => rows.length===1 ? 233 : 40+i*386/(rows.length-1), y = v => 122-(Number(v)-lo)/(hi-lo)*110;
const dots=[],lines=specs.map(l => {
let path='',pen=false;
rows.forEach((r,i)=>{ const v=l.value(r);if(!valid(v)){pen=false;return;}path+=(pen?' L':' M')+x(i).toFixed(2)+' '+y(v).toFixed(2);pen=true;
if(!l.dash && (i===rows.length-1 || rows.length===1))dots.push({key:l.name+i,x:x(i),y:y(v),color:l.color}); });
return {...l,path};
});
const labels=[lo,(lo+hi)/2,hi], dates=rows.map(r=>String(r.date||''));
const width=rows.length>1 ? 386/(rows.length-1) : 386;
return {title,lines,dots,available:rows.some(r=>specs.some(l=>!l.dash && valid(l.value(r)))),
ticks:labels.map(v=>({y:y(v),label:fmt(v)})),first:dates[0]||'',middle:dates[Math.floor(dates.length/2)]||'',last:dates[dates.length-1]||'',
hover:rows.map((r,i)=>({date:r.date,x:Math.max(40,x(i)-width/2),width:Math.min(426,x(i)+width/2)-Math.max(40,x(i)-width/2),text:r.date+'\n'+specs.map(l=>l.name+' '+fmt(l.value(r))).join('\n')}))};
}
const macroChart = computed(() => {
const p=macro.value.params||{}, rows=((mzSig.value||{}).history||[]).map(r=>({...r,date:mzDate(r.data_ymd||r.ymd)}));
return trendChart('股汇执行值',rows,[{name:'执行值',color:'#397bcc',value:r=>r.value},
{name:'冷/热线',color:'#b78538',dash:true,value:()=>p.hot_th}, {name:'冷线',hideLegend:true,color:'#b78538',dash:true,value:()=>p.cold_th},
{name:'退出带',color:'#a7aaa6',dash:true,value:()=>p.exit_band}, {name:'退出下沿',hideLegend:true,color:'#a7aaa6',dash:true,value:()=>p.exit_band==null?null:-p.exit_band}]);
});
const microCharts = computed(() => {
const rows=microHistory.value, g=microSignal.value;
const a=trendChart('微盘活跃度',rows,[{name:'活跃度',color:'#397bcc',value:r=>r.activity},
{name:'5%低位线',color:'#d06458',dash:true,value:r=>r.low_threshold}, {name:'95%高位线',color:'#379068',dash:true,value:r=>r.high_threshold}]);
a.current=microReady.value?microNumber(g.activity):'—';
const pc=(r,k)=>{const v=(r.group_percentiles||{})[k];return v==null?null:Number(v)*100;};
const b=trendChart('活跃度历史分位',rows,[{name:'微盘',color:'#397bcc',value:r=>r.activity_percentile==null?null:r.activity_percentile*100},
{name:'成长',color:'#b48b44',value:r=>pc(r,'growth')},{name:'白马',color:'#9a9ea7',value:r=>pc(r,'large')},
{name:'5%',color:'#d06458',dash:true,value:()=>5},{name:'95%',color:'#379068',dash:true,value:()=>95}],true,[0,100]);
b.current=microReady.value?microPercent(g.activity_percentile):'—';return [a,b];
});
// 首行徽标 (2026-08-19 用户要求由大面板改为首行紧凑显示, 详情进悬浮提示)
const mzSig = computed(() => (((macro.value || {}).signals) || [])[0] || null);
const mzPublished = computed(() => (mzSig.value || {}).published || {});
@ -5127,7 +5176,7 @@ createApp({
techFeed, techFeedErr, techStanceCls,
macro, macroGateOn, macroUnavailable, mzLabel, mzColor, mzBarStyle,
loadMacro, macroScan, macroAdopt,
microSnapshot, microSignal, microState, microError, microReady, microPhaseText, microModeText, microNumber, microPercent, microChipClass, microChipText,
macroChart, microCharts, microHistoryError, microSnapshot, microSignal, microState, microError, microReady, microPhaseText, microModeText, microNumber, microPercent, microChipClass, microChipText,
mzSig, mzPublished, mzDifferent, mzDate, mzAdvicePending, mzChipCls, mzChipText, macroChipClick,
showAlerts, alertItems, alertLatest, alertLevelClass, alertGroups, alertStripItems,
alertStripCount, alertTotalCount, catShown, toggleCat, ageText, alertRowClass,

View File

@ -6,7 +6,7 @@
包含 (例数按 2026-10-26 隔离回归实跑校正):
test_batch49_units.py 持仓分组、同名股票与批次归属、未迁移及缺数展示 (8例)
test_batch48_units.py 策略账本隔离、微盘轮换优先级、真实交易单位、模拟直接启用及市场读数 (44例)
test_batch48_units.py 策略账本隔离、微盘轮换优先级、真实交易单位、模拟直接启用及市场读数 (47例)
test_batch47_units.py 账户资金去重、买入额度与账户展示和策略估值分离 (9 例)
test_batch46_units.py 质地排序切换、档位准入、命令分配与白名单优先 (11 例)
test_batch45_units.py 父指令总量:回放延迟、部分成交、跨日预留、故障守成与影子模式 (16 例)

View File

@ -270,6 +270,32 @@ class BoundaryTests(unittest.TestCase):
class MarketReadingsTests(unittest.TestCase):
def test_micro_history_is_read_only_and_keeps_missing_values(self):
from app.services import rotation_service as rs
from unittest.mock import Mock
rows = [{'date':'2026-10-26','activity':0,'activity_percentile':0}, {'date':'2026-10-27','activity':None}]
response = Mock(content=b'{}');response.json.return_value = {'rule_version':m.RULE,'records':rows}
with patch.object(rs, 'configuration', return_value={'url':'http://monitor'}), patch.object(rs.requests, 'get', return_value=response) as get, patch.object(rs.store,'put_once') as write:
self.assertEqual(rs.signal_history('2026-10-27')['records'], rows)
self.assertEqual(get.call_args.kwargs['params'], {'end':'2026-10-27','limit':60})
write.assert_not_called()
def test_micro_history_rejects_wrong_rule_future_duplicates_and_nan(self):
from app.services import rotation_service as rs
from unittest.mock import Mock
for value in ({'rule_version':'old','records':[]},
{'rule_version':m.RULE,'records':[{'date':'2026-10-28'}]},
{'rule_version':m.RULE,'records':[{'date':'2026-10-27'}]*2},
{'rule_version':m.RULE,'records':[{'date':'2026-10-27','activity':float('nan')}]}):
response=Mock(content=b'{}');response.json.return_value=value
with patch.object(rs,'configuration',return_value={'url':'http://monitor'}), patch.object(rs.requests,'get',return_value=response):
with self.assertRaises(ValueError):rs.signal_history('2026-10-27')
def test_micro_history_failure_is_not_an_empty_success(self):
from app.services import rotation_service as rs
with patch.object(rs,'configuration',return_value={'url':'http://monitor'}), patch.object(rs.requests,'get',side_effect=RuntimeError('offline')):
with self.assertRaises(RuntimeError):rs.signal_history('2026-10-27')
def test_published_value_and_execution_date_are_not_confused(self):
from app.services import macro_service as ms
from app.repo import macro_repo

View File

@ -748,7 +748,7 @@ def _():
def _():
from app.web.main import app
paths = {r.path for r in app.routes}
need = ["/", "/health", "/rotation", "/api/rotation", "/api/ops/rotation/control", "/api/overview", "/api/params", "/api/commands",
need = ["/", "/health", "/rotation", "/api/rotation", "/api/rotation/history", "/api/ops/rotation/control", "/api/overview", "/api/params", "/api/commands",
"/api/commands/catalog", "/api/commands/active", "/api/commands/{command_id}",
"/api/commands/{command_id}/cancel", "/api/plans", "/api/positions",
"/api/positions/{ts_code}/lots", "/api/instructions", "/api/ledger", "/api/report",