From c9ad9f3d5e106752fd378ddc832d6311f54f50e5 Mon Sep 17 00:00:00 2001 From: baobao Date: Wed, 28 Oct 2026 10:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=82=A1=E6=B1=87=E5=92=8C=E5=BE=AE?= =?UTF-8?q?=E7=9B=98=E6=82=AC=E6=B5=AE=E6=A1=86=E6=94=B9=E4=B8=BA=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E5=9B=BE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/macro_service.py | 1 + app/services/rotation_service.py | 31 ++++++ app/web/main.py | 6 ++ app/web/static/index.html | 163 ++++++++++++++++++++----------- scripts/run_tests.py | 2 +- scripts/test_batch48_units.py | 26 +++++ scripts/test_wiring.py | 2 +- 7 files changed, 172 insertions(+), 59 deletions(-) diff --git a/app/services/macro_service.py b/app/services/macro_service.py index 72cd933..88836b7 100644 --- a/app/services/macro_service.py +++ b/app/services/macro_service.py @@ -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)] diff --git a/app/services/rotation_service.py b/app/services/rotation_service.py index c2107aa..a1ae168 100644 --- a/app/services/rotation_service.py +++ b/app/services/rotation_service.py @@ -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, diff --git a/app/web/main.py b/app/web/main.py index f4a2404..18aab30 100644 --- a/app/web/main.py +++ b/app/web/main.py @@ -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 diff --git a/app/web/static/index.html b/app/web/static/index.html index 2534607..5c5d3c6 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -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;} 所以正常显示的是上一交易日; 拉取时刻按持仓系统自己记的时间戳显示。全文见悬停。 --> 计划 {{ planTagText }} 技术面 {{ techChipText }} - +