diff --git a/src/pages/MainSec/OrderTable.vue b/src/pages/MainSec/OrderTable.vue
index 5a3cd5c..a5d6a0d 100644
--- a/src/pages/MainSec/OrderTable.vue
+++ b/src/pages/MainSec/OrderTable.vue
@@ -1,13 +1,24 @@
- {{
- scope.row.PurchaseKLineId
- ? moment(scope.row.PurchaseKLineId * 1000).format(
- "YYYY-MM-DD HH:mm:ss"
- )
- : "-"
- }}
+ {{ scope.row.LastPurchaseTradeTime || "-" }}
- {{
- scope.row.SaleKLineId
- ? moment(scope.row.SaleKLineId * 1000).format(
- "YYYY-MM-DD HH:mm:ss"
- )
- : "-"
- }}
+ {{ scope.row.LastSaleTradeTime || "-" }}
市价单 {{ scope.row.PurchasePrice }} {{ scope.row.SalePrice }} {{ scope.row.PurchaseCoinCount || "-" }} {{ scope.row.SaleCoinCount || "-" }}
+ {{ scope.row.PurchaseCoinCount || "-" }}
+
+ {{ scope.row.SaleCoinCount || "-" }}
+ {{ scope.row.LoanRatio.toFixed(2) || "-" }}%
+ {{
+ OrderStatus.filter(i => i.value == scope.row.Status)[0].title
+ }}
+ {{ scope.row.MaxLossPrice || "-" }} - {{ scope.row[i.prop] }} {{ scope.row[i.prop] }}
胜率: {{ accountInfo.WinningProbability }}%
购买交易数: {{ accountInfo.PurchaseTradeCount }}
卖出交易数: {{ accountInfo.SaleTradeCount }}
-持仓成本: {{ accountInfo.TotalPurchasePrice }}
波段盈亏 :{{ accountInfo.HistoryProfit }}
币本位盈亏: {{ accountInfo.BBWProfit }}
diff --git a/src/pages/prePages/js/columns.js b/src/pages/prePages/js/columns.js index fbf0679..0e46c28 100644 --- a/src/pages/prePages/js/columns.js +++ b/src/pages/prePages/js/columns.js @@ -283,9 +283,9 @@ export const secondTradeColumns = [ }, { name: "委托数量", - prop: "Count", - key: "Count", - customSlot: "Count", + prop: "WCount", + key: "WCount", + customSlot: "WCount", width: 80 }, { @@ -320,7 +320,7 @@ export const secondTradeColumns = [ name: "借币金额", prop: "BorrowAmount", key: "BorrowAmount", - customSlot: "BorrowAmount", + customSlot: "LoanAmount", width: 80 }, @@ -328,14 +328,14 @@ export const secondTradeColumns = [ name: "借币比例", prop: "BorrowRatio", key: "BorrowRatio", - customSlot: "BorrowRatio", + customSlot: "LoanRatio", width: 80 }, { name: "借币利息", prop: "BorrowFee", key: "BorrowFee", - customSlot: "BorrowFee", + customSlot: "LoanFee", width: 80 }, { @@ -355,10 +355,9 @@ export const secondTradeColumns = [ }, { name: "波段总盈亏", - prop: "TotalProfit", + prop: "HistoryTotalProfit", fixed: true, - key: "TotalProfit", - customSlot: "TotalProfit", + key: "HistoryTotalProfit", width: 100 }, { @@ -383,7 +382,8 @@ export const secondTradeColumns = [ name: "时间", prop: "purchaseKLineId", key: "purchaseKLineId", - customSlot: "KLineId" + customSlot: "KLineId", + width: 150 } ]; diff --git a/src/pages/prePages/js/selectoptions.js b/src/pages/prePages/js/selectoptions.js index 6714ce2..c6bf9c1 100644 --- a/src/pages/prePages/js/selectoptions.js +++ b/src/pages/prePages/js/selectoptions.js @@ -140,3 +140,18 @@ export const LogTypes = [ { title: "空交叉", value: 11 }, { title: "订单回调", value: 100 } ]; + +export const OrderStatus = [ + { title: "已挂买单市价", value: 0 }, + { title: "已挂买单限价", value: 1 }, + { title: "部分购买", value: 2 }, + { title: "已购买", value: 3 }, + { title: "部分购买被撤销", value: 4 }, + { title: "购买被撤销", value: 5 }, + { title: "已挂卖单市价", value: 6 }, + { title: "已挂卖单限价", value: 7 }, + { title: "部分卖出", value: 8 }, + { title: "已卖出", value: 9 }, + { title: "部分卖出已撤销", value: 10 }, + { title: "卖出已撤销", value: 11 } +];