Align dashboard PnL columns with monitor; add back-to-dashboard button.

Co-authored-by: Cursor <cursoragent@cursor.com>

manual_trading_hub/static/app.js

@@ -2528,6 +2528,17 @@
               renderMonitorGrid(lastMonitorRows);
             };
           });
+          fsInner.querySelectorAll(".btn-expand-dashboard").forEach((btn) => {
+            btn.onclick = (ev) => {
+              ev.stopPropagation();
+              closeExchangeFullscreen();
+              if (window.hubNavigateTo) window.hubNavigateTo("/dashboard");
+              else {
+                history.pushState({}, "", "/dashboard");
+                setActiveNav();
+              }
+            };
+          });
         } catch (err) {
           console.error("renderFullscreenExchange", err);
           closeExchangeFullscreen();
@@ -4000,6 +4011,7 @@
       </div>
       <div class="fs-head-actions">
         <button type="button" class="ghost btn-expand-back">返回监控</button>
+        <button type="button" class="ghost btn-expand-dashboard">返回数据看板</button>
         ${flaskOpen ? `<a class="btn-link btn-open-instance btn-open-trade" href="#" data-ex-id="${esc(row.id)}" data-next="/trade" data-new-tab="1">打开实例</a>` : ""}
         ${flaskOpen ? `<a class="btn-link btn-open-instance" href="#" data-ex-id="${esc(row.id)}" data-next="/trade">下单</a>` : ""}
         ${flaskOpen ? `<a class="btn-link btn-open-instance" href="#" data-ex-id="${esc(row.id)}" data-next="/key_monitor">监控位</a>` : ""}

manual_trading_hub/static/dashboard.css

@@ -273,6 +273,11 @@ body.hub-page-dashboard .page#page-dashboard {
   color: color-mix(in srgb, var(--dash-accent) 80%, #fff);
 }
 
+.dash-tp-profit {
+  color: var(--dash-accent);
+  font-variant-numeric: tabular-nums;
+}
+
 .dash-empty-inline {
   padding: 8px 0 4px;
   font-size: 0.78rem;

manual_trading_hub/static/dashboard.js

@@ -130,14 +130,16 @@
     return "—";
   }
 
-  function floatPctText(pnl, notional) {
-    const n = Number(pnl);
-    const notion = Number(notional);
-    if (!Number.isFinite(n) || !Number.isFinite(notion) || Math.abs(notion) < 1e-8) return "—";
-    const pct = (n / Math.abs(notion)) * 100;
-    const abs = Math.abs(pct).toFixed(2);
-    if (Math.abs(pct) < 1e-9) return "0.00%";
-    return `${pct > 0 ? "+" : "-"}${abs}%`;
+  function tpProfitCell(ln) {
+    const n = ln && ln.reward_at_tp_usdt != null ? Number(ln.reward_at_tp_usdt) : NaN;
+    if (!Number.isFinite(n)) return "—";
+    return `<span class="dash-tp-profit">${fmt(n, 2)}U</span>`;
+  }
+
+  function floatPnlCell(ln) {
+    const pnl = ln && ln.pnl != null ? Number(ln.pnl) : NaN;
+    if (!Number.isFinite(pnl)) return "—";
+    return `<span class="${pnlClass(pnl)}">${fmt(pnl, 2)}</span>`;
   }
 
   function collectUnifiedPositions(accounts) {
@@ -184,8 +186,6 @@
         const side = esc((ln && ln.side) || "—");
         const contracts =
           ln && ln.contracts != null && ln.contracts !== "" ? esc(String(ln.contracts)) : "—";
-        const pnl = ln && ln.pnl != null ? Number(ln.pnl) : NaN;
-        const pct = floatPctText(pnl, ln && ln.notional_usdt);
         return `<tr>
           <td>${exchangeLinkCell(ac)}</td>
           <td>${sourceTypeCell(source)}</td>
@@ -194,8 +194,8 @@
           <td>${priceCell(ln && ln.entry_price_fmt, ln && ln.entry_price)}</td>
           <td>${priceCell(ln && ln.mark_price_fmt, ln && ln.mark_price)}</td>
           <td>${contracts}</td>
-          <td class="${pnlClass(pnl)}">${Number.isFinite(pnl) ? pnlSigned(pnl, 2) : "—"}</td>
-          <td class="${pnlClass(pnl)}">${pct}</td>
+          <td>${tpProfitCell(ln)}</td>
+          <td>${floatPnlCell(ln)}</td>
         </tr>`;
       })
       .join("");

manual_trading_hub/static/index.html

@@ -20,7 +20,7 @@
   <link rel="stylesheet" href="/assets/trade_stats_calendar.css?v=4" />
   <link rel="stylesheet" href="/assets/account_risk_badge.css?v=4" />
   <script src="/assets/account_risk_badge.js?v=4"></script>
-  <link rel="stylesheet" href="/assets/dashboard.css?v=20260720-dash-pos-type" />
+  <link rel="stylesheet" href="/assets/dashboard.css?v=20260720-dash-pnl-align" />
 </head>
 <body>
   <div class="app-bg" aria-hidden="true"></div>
@@ -1385,7 +1385,7 @@
   <script src="/assets/archive.js?v=20260717-archive-cal-chart"></script>
   <script src="/assets/quotes.js?v=20260717-quotes-feed"></script>
   <script src="/assets/funds.js?v=20260717-funds-scroll-fix"></script>
-  <script src="/assets/dashboard.js?v=20260720-dash-pos-type"></script>
+  <script src="/assets/dashboard.js?v=20260720-dash-pnl-align"></script>
   <script src="/assets/strategy.js?v=8"></script>
   <script src="/assets/help.js?v=1"></script>
   <script src="/assets/logs.js?v=1"></script>
@@ -1394,6 +1394,6 @@
   <script src="/assets/options_expiry_countdown.js?v=1"></script>
   <script src="/assets/options_position_cards.js?v=2"></script>
   <script src="/assets/backup.js?v=1"></script>
-  <script src="/assets/app.js?v=20260720-autofill"></script>
+  <script src="/assets/app.js?v=20260720-dash-back"></script>
 </body>
 </html>