diff --git a/src/pages/MainSec/OrderTable.vue b/src/pages/MainSec/OrderTable.vue new file mode 100644 index 0000000..aa61bc1 --- /dev/null +++ b/src/pages/MainSec/OrderTable.vue @@ -0,0 +1,11 @@ + + \ No newline at end of file diff --git a/src/pages/MainSec/SignalTable.vue b/src/pages/MainSec/SignalTable.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/MainSec/Summary.vue b/src/pages/MainSec/Summary.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/MainSec/index.vue b/src/pages/MainSec/index.vue new file mode 100644 index 0000000..3a4694e --- /dev/null +++ b/src/pages/MainSec/index.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/pages/ReCheck/index.vue b/src/pages/ReCheck/index.vue index faf5d74..8dadbc3 100644 --- a/src/pages/ReCheck/index.vue +++ b/src/pages/ReCheck/index.vue @@ -147,6 +147,12 @@ 启用增购 + + 是否开启错误信号补救 + @@ -273,7 +279,8 @@ export default { TradeCoinCount: 10, IsEnableAdditionalQuantity: false, Balance: 10000, - MaxBorrowRatio: 20 + MaxBorrowRatio: 20, + IsEnableRemedyForErrorCrossSignal: false }, logData: [], PositionFund: 1, @@ -792,6 +799,8 @@ export default { .IsEnableAdditionalQuantity, MaxBorrowRatio: this.vTForm.MaxBorrowRatio, Balance: this.vTForm.Balance, + IsEnableRemedyForErrorCrossSignal: this.vTForm + .IsEnableRemedyForErrorCrossSignal, SymbolList: newExcelData } : { diff --git a/src/pages/prePages/js/columns.js b/src/pages/prePages/js/columns.js index d1584b8..b963d13 100644 --- a/src/pages/prePages/js/columns.js +++ b/src/pages/prePages/js/columns.js @@ -260,6 +260,121 @@ export const tradeColumns = [ } ]; +export const secondTradeColumns = [ + { + name: "ID", + prop: "Id", + + width: 150, + key: "Id" + }, + { + name: "类型", + prop: "OrderType", + + key: "OrderType", + width: 80, + customSlot: "OrderType" + }, + { + name: "下单方式", + prop: "OrderWay", + key: "OrderWay", + customSlot: "OrderWay" + }, + { + name: "委托数量", + prop: "Count", + key: "Count", + customSlot: "Count" + }, + { + name: "成交数量", + prop: "Count", + key: "Count", + customSlot: "Count" + }, + { + name: "成交均价", + prop: "Count", + key: "Count", + customSlot: "Count" + }, + { + name: "信号价", + prop: "SignalPrice", + key: "SignalPrice", + customSlot: "SignalPrice" + }, + { + name: "成交总价", + prop: "Total", + key: "Total", + customSlot: "Total" + }, + { + name: "借币金额", + prop: "BorrowAmount", + key: "BorrowAmount", + customSlot: "BorrowAmount" + }, + + { + name: "借币比例", + prop: "BorrowRatio", + key: "BorrowRatio", + customSlot: "BorrowRatio" + }, + { + name: "借币利息", + prop: "BorrowFee", + key: "BorrowFee", + customSlot: "BorrowFee" + }, + { + name: "手续费", + prop: "Fee", + key: "Fee", + customSlot: "Fee" + }, + + { + name: "波段盈亏", + prop: "Profit", + key: "Profit", + customSlot: "Profit" + }, + { + name: "波段总盈亏", + prop: "TotalProfit", + fixed: true, + key: "TotalProfit", + customSlot: "TotalProfit" + }, + { + name: "持币盈亏", + prop: "PriceGap", + key: "PriceGap" + }, + { + name: "持币总盈亏", + prop: "HistoryTotalPriceGap", + key: "HistoryTotalPriceGap" + }, + { + name: "状态", + prop: "Status", + key: "Status", + customSlot: "Status" + }, + { + name: "时间", + prop: "purchaseKLineId", + key: "purchaseKLineId", + customSlot: "KLineId" + } +]; + export const logColumns = [ { name: "订单ID", diff --git a/src/router/routes.js b/src/router/routes.js index eb82352..3f0223a 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -19,6 +19,8 @@ const Capital = () => import("@/pages/Profit"); const Prev = () => import("@/pages/Prev"); const RobotSec = () => import("@/pages/RobotSec"); const AccountSec = () => import("@/pages/RobotSec/Account"); +const MainSec = () => import("@/pages/MainSec"); + const routes = [ { path: "/", @@ -43,6 +45,12 @@ const routes = [ meta: { auth: true }, component: Edit }, + { + path: "editt/:id", + name: "editt", + meta: { auth: true }, + component: MainSec + }, { path: "winRate", name: "winRate",