新增模块

src/pages/MainSec/OrderTable.vue

@@ -0,0 +1,11 @@
+<template>
+    <div>
+
+    </div>
+</template>
+<script>
+import {secondTradeColumns} from '../prePages/js/columns'
+export default {
+    
+}
+</script>

src/pages/MainSec/index.vue

@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <el-tabs value="1">
+      <el-tab-pane name="1" label="概况"> </el-tab-pane>
+      <el-tab-pane name="2" label="交易清单"> </el-tab-pane>
+      <el-tab-pane name="3" label="信号日志"> </el-tab-pane>
+      <el-tab-pane name="4" label="资金日志"> </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {};
+</script>

src/pages/ReCheck/index.vue

@@ -147,6 +147,12 @@
               <base-checkbox inline v-model="vTForm.IsEnableAdditionalQuantity">
                 启用增购
               </base-checkbox>
+              <base-checkbox
+                inline
+                v-model="vTForm.IsEnableRemedyForErrorCrossSignal"
+              >
+                是否开启错误信号补救
+              </base-checkbox>
             </div>
           </div>
           <!-- <top-end-policy v-else v-model="policyFormData" /> -->
@@ -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
               }
             : {

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",

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",