diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js index 4aed132e..0fd13952 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js @@ -143,7 +143,7 @@ const vue = new Vue({ calcCloseAmount() {//计算平仓总额=浮动收取+利息收取-浮动支付-利息支付 var floatRatio = this.floatPosition.PayDirection == 1 ? 1 : -1; var thisObj = this; - let pnl = parseFloat(this.floatPosition.MarkClosePnl); + let pnl = parseFloat(this.floatPosition.FloatPnlSum); let TradingFee = thisObj.floatPosition.TradingFee == "" ? 0 : parseFloat(thisObj.floatPosition.TradingFee); thisObj.deal.SwapCloseAmount = pnl; thisObj.deal.SwapRealizedPnL = pnl; diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js index 60fa9028..18ae3706 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js @@ -224,7 +224,7 @@ const vue = new Vue({ let floatRatio = this.floatPosition.PayDirection == 1 ? 1 : -1; let ratio = this.floatPosition.PositionType == 1 ? 1 : -1; let thisObj = this; - let pnl = parseFloat(this.floatPosition.MarkClosePnl); + let pnl = parseFloat(this.floatPosition.FloatPnlSum); let TradingFee = thisObj.floatPosition.TradingFee == "" ? 0 : parseFloat(thisObj.floatPosition.TradingFee); thisObj.deal.SwapCloseAmount = pnl; thisObj.deal.SwapRealizedPnL = pnl;