remove: 全面移除「错过机会」功能与文案

删除手动记录表单与 /add_miss；停止自动生成错过类交易记录；列表/统计/顶栏不再展示；复盘卡片改为整行。 Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 22:21:30 +08:00
parent 88fe4bbe56
commit 7bb6ee1154
11 changed files with 87 additions and 313 deletions
@@ -58,25 +58,21 @@ def trade_records_summary(conn, start_bj: str, end_bj: str, tr_ts: str) -> dict[
        f"""
        SELECT
            COUNT(*) AS total,
-            SUM(CASE WHEN result = '错过' THEN 1 ELSE 0 END) AS miss_count,
-            SUM(CASE WHEN {pnl_sql} > 0 THEN 1 ELSE 0 END) AS wins,
-            SUM(CASE WHEN result = '错过' AND COALESCE(miss_reason,'') LIKE '%持仓占用%' THEN 1 ELSE 0 END) AS occupied_miss
+            SUM(CASE WHEN {pnl_sql} > 0 THEN 1 ELSE 0 END) AS wins
        FROM trade_records
        WHERE {tr_ts} >= ? AND {tr_ts} <= ?
+          AND COALESCE(result, '') != '错过'
+          AND COALESCE(reviewed_result, '') != '错过'
        """,
        (start_bj, end_bj),
    ).fetchone()
    total = int(row["total"] or 0) if row else 0
-    miss_count = int(row["miss_count"] or 0) if row else 0
    wins = int(row["wins"] or 0) if row else 0
-    occupied_miss_total = int(row["occupied_miss"] or 0) if row else 0
    rate = round(wins / total * 100, 2) if total else 0
    return {
        "records": [],
        "total": total,
-        "miss_count": miss_count,
        "rate": rate,
-        "occupied_miss_total": occupied_miss_total,
    }


@@ -208,7 +208,7 @@

        {% if page == 'records' %}
        <div class="card full records-card">
-            <h2>交易记录 & 错过机会</h2>
+            <h2>交易记录</h2>
            <div class="form-row" style="margin-bottom:10px;gap:8px">
                <label style="display:flex;align-items:center;gap:6px;font-size:.82rem;color:#cfd3ef">
                    <input id="review-mode-toggle" type="checkbox">
@@ -241,7 +241,7 @@
                        {% if effective_result in ["止盈","保本止盈","移动止盈"] %}<span class="badge profit">{{ effective_result }}</span>
                        {% elif effective_result in ["止损","强制清仓","手动平仓"] %}<span class="badge loss">{{ effective_result }}</span>
                        {% elif effective_result == "时间平仓" %}<span class="badge miss">{{ effective_result }}</span>
-                        {% else %}<span class="badge miss">{{ effective_result }}</span>{% endif %}
+                        {% else %}<span class="badge">{{ effective_result or '-' }}</span>{% endif %}
                    </td>
                    <td>
                        <button
@@ -288,27 +288,7 @@
            </div>
        </div>

-        <div class="card miss-card" style="opacity:.78">
-            <h2>记录错过机会</h2>
-            <form action="/add_miss" method="post" class="form-row">
-                <input name="symbol" placeholder="品种" required>
-                <select name="type" required>
-                    <option value="箱体突破">箱体突破</option>
-                    <option value="收敛突破">收敛突破</option>
-                    <option value="关键支撑阻力">关键支撑阻力</option>
-                </select>
-                <select name="direction" required>
-                    <option value="">方向</option><option value="long">做多</option><option value="short">做空</option>
-                </select>
-                <input name="tp" step="0.0001" placeholder="入场价" required>
-                <input name="sl" step="any" placeholder="止损" required>
-                <input name="tgt" step="any" placeholder="止盈" required>
-                <input name="reason" placeholder="错过原因" required>
-                <button type="submit">记录</button>
-            </form>
-        </div>
-
-        <div class="card journal-card">
+        <div class="card full journal-card">
            <h2>交易复盘记录上传（含截图）</h2>
            <form id="journal-form" action="/add_journal" method="post" enctype="multipart/form-data">
                <input type="hidden" name="risk_amount_hint" id="risk-amount-hint">
@@ -439,9 +419,6 @@
            <button type="button" class="stats-toggle" id="stats-toggle-btn" onclick="toggleStatsCard()">折叠</button>
        </div>
        <div class="stats-content" id="stats-content">
-            <div class="stat-box" style="margin-bottom:10px">
-                <div class="stat-item"><div class="label">持仓占用导致错过(累计)</div><div class="value">{{ occupied_miss_total }}</div></div>
-            </div>
            <div class="sub" style="margin-bottom:12px;color:#8892b0;font-size:.82rem">
                统计分析按<strong>北京时间 {{ stats_bundle.stats_reset_hour }}:00</strong>切日计入（与顶栏 UTC 列表窗无关）。历史总开仓（累计）：
                <strong style="color:#cfd3ef">{{ stats_bundle.total_opens_all }}</strong> 次
@@ -83,7 +83,6 @@
    <div class="stat-box instance-desktop-only">
        <div class="stat-item"><div class="label">交易所</div><div class="value">{{ exchange_display }}</div></div>
        <div class="stat-item"><div class="label">总交易</div><div class="value" id="stat-total">{{ total }}</div></div>
-        <div class="stat-item"><div class="label">错过次数</div><div class="value" id="stat-miss">{{ miss_count }}</div></div>
        <div class="stat-item"><div class="label">胜率</div><div class="value" id="stat-rate">{{ rate }}%</div></div>
        <div class="stat-item"><div class="label">资金账户(USDT)</div><div class="value" id="total-capital">{% if funding_usdt is not none %}{{ funds_fmt(funding_usdt) }}U{% else %}—{% endif %}</div></div>
        <div class="stat-item"><div class="label">交易日</div><div class="value">{{ trading_day }}</div></div>
@@ -28,6 +28,22 @@ def count_winning_trades(trades) -> int:
    return sum(1 for r in trades or [] if is_winning_pnl(r.get("effective_pnl_amount")))


+MISS_TRADE_RESULT = "错过"
+
+
+def is_miss_trade_result(result) -> bool:
+    return (result or "").strip() == MISS_TRADE_RESULT
+
+
+def filter_trade_records_excluding_miss(records):
+    """列表/统计：不展示、不计入「错过」类交易记录。"""
+    return [
+        r
+        for r in (records or [])
+        if not is_miss_trade_result(r.get("effective_result") or r.get("result"))
+    ]
+
+
 def normalize_result_with_pnl(result, pnl_amount):
    """
    非手动平仓且实际盈利时，不应记为「止损」。