diff --git a/backend/app/services/paper_trading_service.py b/backend/app/services/paper_trading_service.py index f8e3c60..fbc663a 100644 --- a/backend/app/services/paper_trading_service.py +++ b/backend/app/services/paper_trading_service.py @@ -1679,7 +1679,8 @@ class PaperTradingService: losing_trades = len([o for o in orders if o.pnl_amount < 0]) total_pnl = sum(o.pnl_amount for o in orders) - total_pnl_percent = sum(o.pnl_percent for o in orders) + # 正确的账户总收益率：(总盈亏 / 初始资金) * 100 + total_pnl_percent = (total_pnl / self.initial_balance * 100) if self.initial_balance > 0 else 0 wins = [o.pnl_amount for o in orders if o.pnl_amount > 0] losses = [abs(o.pnl_amount) for o in orders if o.pnl_amount < 0] diff --git a/frontend/trading.html b/frontend/trading.html index cf164fe..274c3f1 100644 --- a/frontend/trading.html +++ b/frontend/trading.html @@ -518,59 +518,6 @@ - -
-
-
- 交易详情 -
-
-
- 总交易数 - {{ stats.total_trades || 0 }} -
-
- 盈利交易 - {{ stats.winning_trades || 0 }} -
-
- 亏损交易 - {{ stats.losing_trades || 0 }} -
-
- 最佳交易 - {{ stats.best_trade ? stats.best_trade.toFixed(2) : '0.00' }}% -
-
- 最差交易 - {{ stats.worst_trade ? stats.worst_trade.toFixed(2) : '0.00' }}% -
-
-
- -
-
- 收益分析 -
-
-
- 平均盈利 - ${{ stats.average_win ? stats.average_win.toFixed(2) : '0.00' }} -
-
- 平均亏损 - ${{ stats.average_loss ? stats.average_loss.toFixed(2) : '0.00' }} -
-
- 收益率 - - {{ stats.return_percent >= 0 ? '+' : '' }}{{ stats.return_percent ? stats.return_percent.toFixed(2) : '0.00' }}% - -
-
-
-
-