Merge remote-tracking branch 'origin/glms/feature/1.4.2' into glms/feature/1.4.2

2026-07-17 13:17:39 +08:00
parent 7fac6e13a8 42602055de
commit c41e677042
8 changed files with 423 additions and 12 deletions
@@ -140,10 +140,10 @@ const vue = new Vue({
        },
        // 按"占期初口径(A)"的 ClosePercent 反算平仓数量：CloseQty = PositionQty × (ClosePercent / oriClosePercent)
        // 多次部分平仓后必须这样转换，否则全部↔部分切换时 ClosePercent 没变但 CloseQty 会变（不自洽）
+        // 使用 swapCalc.calcCloseQtyByOriginalPercent 的 roundHalfAwayFromZero 避免 JS 浮点精度偏差
+        // （如 32500000*(0.5/0.65)=24999999.999999996 而非 25000000）
        calcCloseQtyByPercent(closePercent) {
-            var ori = parseFloat(this.oriClosePercent) || 0;
-            var ratio = ori > 0 ? parseFloat(closePercent) / ori : 0;
-            return otcformat.trading.notional(parseFloat(this.deal.PositionQty) * ratio);
+            return SwapCalc.calcCloseQtyByOriginalPercent(closePercent, this.oriClosePercent, this.deal.PositionQty);
        },
        calcTradingFeePending() {
            this.floatPosition.TradingFeePending = this.floatPosition.BeforeCloseFee * parseFloat(this.deal.ClosePercent);