From 2ad976ee2570b905d7512ebcd9a8b2713fad5cdb Mon Sep 17 00:00:00 2001
From: lizhixin <382352532@qq.com>
Date: Sun, 30 May 2021 02:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Collapse/index.js         |  74 +++++
 src/layout/dashboard/DashboardLayout.vue |  77 ++++-
 src/main.js                              |  10 +-
 src/pages/Account/index.vue              |  43 +--
 src/pages/ReCheck/MoveTrend.vue          |   5 +-
 src/pages/ReCheck/index.vue              | 150 ++++++----
 src/pages/Robot/index.vue                |  39 ++-
 src/pages/prePages/ReCheck.vue           | 352 ++++++++++++-----------
 src/router/routes.js                     |   6 +-
 9 files changed, 488 insertions(+), 268 deletions(-)
 create mode 100644 src/components/Collapse/index.js

diff --git a/src/components/Collapse/index.js b/src/components/Collapse/index.js
new file mode 100644
index 0000000..8b3a321
--- /dev/null
+++ b/src/components/Collapse/index.js
@@ -0,0 +1,74 @@
+const elTransition = '0.3s height ease-in-out, 0.3s padding-top ease-in-out, 0.3s padding-bottom ease-in-out'
+const Transition = {
+  'before-enter'(el) {
+    el.style.transition = elTransition
+    if (!el.dataset) el.dataset = {}
+
+    el.dataset.oldPaddingTop = el.style.paddingTop
+    el.dataset.oldPaddingBottom = el.style.paddingBottom
+
+    el.style.height = 0
+    el.style.paddingTop = 0
+    el.style.paddingBottom = 0
+  },
+
+  enter(el) {
+    el.dataset.oldOverflow = el.style.overflow
+    if (el.scrollHeight !== 0) {
+      el.style.height = el.scrollHeight + 'px'
+      el.style.paddingTop = el.dataset.oldPaddingTop
+      el.style.paddingBottom = el.dataset.oldPaddingBottom
+    } else {
+      el.style.height = ''
+      el.style.paddingTop = el.dataset.oldPaddingTop
+      el.style.paddingBottom = el.dataset.oldPaddingBottom
+    }
+
+    el.style.overflow = 'hidden'
+  },
+
+  'after-enter'(el) {
+    el.style.transition = ''
+    el.style.height = ''
+    el.style.overflow = el.dataset.oldOverflow
+  },
+
+  'before-leave'(el) {
+    if (!el.dataset) el.dataset = {}
+    el.dataset.oldPaddingTop = el.style.paddingTop
+    el.dataset.oldPaddingBottom = el.style.paddingBottom
+    el.dataset.oldOverflow = el.style.overflow
+
+    el.style.height = el.scrollHeight + 'px'
+    el.style.overflow = 'hidden'
+  },
+
+  leave(el) {
+    if (el.scrollHeight !== 0) {
+      el.style.transition = elTransition
+      el.style.height = 0
+      el.style.paddingTop = 0
+      el.style.paddingBottom = 0
+    }
+  },
+
+  'after-leave'(el) {
+    el.style.transition = ''
+    el.style.height = ''
+    el.style.overflow = el.dataset.oldOverflow
+    el.style.paddingTop = el.dataset.oldPaddingTop
+    el.style.paddingBottom = el.dataset.oldPaddingBottom
+  }
+}
+
+export default {
+  name: 'collapseTransition',
+  functional: true,
+  render(h, { children }) {
+    const data = {
+      on: Transition
+    }
+    return h('transition', data, children)
+  }
+}
+
diff --git a/src/layout/dashboard/DashboardLayout.vue b/src/layout/dashboard/DashboardLayout.vue
index 000a06d..363ead5 100644
--- a/src/layout/dashboard/DashboardLayout.vue
+++ b/src/layout/dashboard/DashboardLayout.vue
@@ -1,7 +1,55 @@
 <template>
   <div class="wrapper">
     <side-bar :backgroundColor="'#333D54'">
-      <template slot="links">
+      <el-menu
+        class="el-menu-vertical-demo"
+        :default-openeds="['1', '2']"
+        background-color="#333E54"
+        text-color="#fff"
+        active-text-color="#ffd04b"
+      >
+        <el-submenu index="1">
+          <template slot="title">
+            <i class="el-icon-medal-1"></i>
+            <span>动量现货</span>
+          </template>
+          <el-menu-item index="1-1" @click="to('/')">概况</el-menu-item>
+          <el-menu-item index="1-2" @click="to('/account/0')"
+            >账号管理</el-menu-item
+          >
+          <el-menu-item index="1-3" @click="to('/robot/0')"
+            >机器人管理</el-menu-item
+          >
+        </el-submenu>
+        <el-submenu index="2">
+          <template slot="title">
+            <i class="el-icon-medal"></i>
+            <span>动量趋势</span>
+          </template>
+          <el-menu-item index="2-1" @click="to('/')">概况</el-menu-item>
+          <el-menu-item index="2-2" @click="to('/account/1')">
+            账号管理</el-menu-item
+          >
+          <el-menu-item index="2-3" @click="to('/robot/1')"
+            >机器人管理</el-menu-item
+          >
+        </el-submenu>
+        <el-menu-item index="3" @click="to('/reCheck')">
+          <i class="el-icon-bicycle"></i>
+          <span slot="title">回测</span>
+        </el-menu-item>
+        <el-menu-item index="4" @click="to('/winRate')">
+          <i class="el-icon-aim"></i>
+          <span slot="title">短线胜率测试</span>
+        </el-menu-item>
+        <el-menu-item index="5" @click="to('/capital')">
+          <i class="el-icon-trophy"></i>
+          <span slot="title">总资金管理</span>
+        </el-menu-item>
+      </el-menu>
+      <!-- <template slot="links">
+        <span @click="test = !test" class="title">动量现货</span>
+
         <sidebar-link
           to="/robot"
           :name="'策略Robot'"
@@ -27,15 +75,7 @@
           :name="'总资金管理'"
           icon="tim-icons icon-single-02"
         />
-
-        <!-- <sidebar-link to="/icons" :name="$t('sidebar.icons')" icon="tim-icons icon-atom"/>
-        <sidebar-link to="/maps" :name="$t('sidebar.maps')" icon="tim-icons icon-pin"/>
-        <sidebar-link to="/notifications" :name="$t('sidebar.notifications')" icon="tim-icons icon-bell-55"/>
-        <sidebar-link to="/profile" :name="$t('sidebar.userProfile')" icon="tim-icons icon-single-02"/>
-        <sidebar-link to="/table-list" :name="$t('sidebar.tableList')" icon="tim-icons icon-puzzle-10"/>
-        <sidebar-link to="/typography" :name="$t('sidebar.typography')" icon="tim-icons icon-align-center"/>
-        <sidebar-link to="/dashboard?enableRTL=true" :name="$t('sidebar.rtlSupport')" icon="tim-icons icon-world"/> -->
-      </template>
+      </template> -->
     </side-bar>
     <div class="main-panel">
       <top-navbar></top-navbar>
@@ -52,18 +92,26 @@ import TopNavbar from "./TopNavbar.vue";
 import ContentFooter from "./ContentFooter.vue";
 import DashboardContent from "./Content.vue";
 import MobileMenu from "./MobileMenu";
+import Collapse from "../../components/Collapse";
 export default {
   components: {
     TopNavbar,
     ContentFooter,
     DashboardContent,
-    MobileMenu
+    MobileMenu,
+    Collapse
+  },
+  data() {
+    return { test: false };
   },
   methods: {
     toggleSidebar() {
       if (this.$sidebar.showSidebar) {
         this.$sidebar.displaySidebar(false);
       }
+    },
+    to(path) {
+      if (this.$route.path != path.toLowerCase()) this.$router.push({ path });
     }
   }
 };
@@ -73,4 +121,11 @@ export default {
 .off-canvas-sidebar {
   background: linear-gradient(0deg, #333 0%, #333 100%) !important;
 }
+.title {
+  cursor: pointer;
+  margin-left: 20px;
+}
+.el-menu {
+  border-right: none !important;
+}
 </style>
diff --git a/src/main.js b/src/main.js
index 85d158a..1e72cb2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,7 +30,11 @@ import {
   Tabs,
   TabPane,
   Pagination,
-  DatePicker
+  DatePicker,
+  Menu,
+  MenuItem,
+  MenuItemGroup,
+  Submenu
 } from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
 import i18n from "./i18n";
@@ -49,6 +53,10 @@ Vue.use(Tabs);
 Vue.use(TabPane);
 Vue.use(Pagination);
 Vue.use(DatePicker);
+Vue.use(Menu);
+Vue.use(MenuItem);
+Vue.use(MenuItemGroup);
+Vue.use(Submenu);
 /* eslint-disable no-new */
 new Vue({
   router,
diff --git a/src/pages/Account/index.vue b/src/pages/Account/index.vue
index 3a0a998..0e4ebfb 100644
--- a/src/pages/Account/index.vue
+++ b/src/pages/Account/index.vue
@@ -64,9 +64,7 @@
       </card>
     </modal>
 
-    <base-button @click="modal.visible = true"
-      >添加账号</base-button
-    >
+    <base-button @click="modal.visible = true">添加账号</base-button>
 
     <custom-base-table
       :data="tableData"
@@ -100,6 +98,7 @@ export default {
   components: { CustomBaseTable, Modal },
   data() {
     return {
+      type: 0,
       tableData: [],
       form: {},
       accountTypes,
@@ -111,6 +110,7 @@ export default {
     };
   },
   created() {
+    this.type = this.$route.params.type;
     this.getAccountList();
     // this.getAllSymbol();
     // this.getAccountList();
@@ -119,11 +119,13 @@ export default {
   methods: {
     //获取所有的交易所账号
     getAccountList() {
-      this.$http.get("/Api/StockExchangeAccount/GetList").then(res => {
-        if (res.Code == 200) {
-          this.tableData = res.Data;
-        }
-      });
+      this.$http
+        .get(`/Api/StockExchangeAccount/GetList?policyType=${this.type}`)
+        .then(res => {
+          if (res.Code == 200) {
+            this.tableData = res.Data;
+          }
+        });
     },
 
     getMatchTitle(value, sourceArray) {
@@ -137,16 +139,21 @@ export default {
     //请求创建新的账号
     createRobot() {
       this.createLoading = true;
-      this.$http.post("/Api/StockExchangeAccount/Add", this.form).then(res => {
-        this.createLoading = false;
-        if (res.Code == 200) {
-          this.modal.visible = false;
-          this.sMessage("success", "创建成功");
-          this.getAccountList();
-        } else {
-          this.sMessage("danger", res.Message);
-        }
-      });
+      this.$http
+        .post("/Api/StockExchangeAccount/Add", {
+          ...this.form,
+          PolicyType: this.type
+        })
+        .then(res => {
+          this.createLoading = false;
+          if (res.Code == 200) {
+            this.modal.visible = false;
+            this.sMessage("success", "创建成功");
+            this.getAccountList();
+          } else {
+            this.sMessage("danger", res.Message);
+          }
+        });
     },
 
     // 封装showNotification
diff --git a/src/pages/ReCheck/MoveTrend.vue b/src/pages/ReCheck/MoveTrend.vue
index c00ce66..dee7f61 100644
--- a/src/pages/ReCheck/MoveTrend.vue
+++ b/src/pages/ReCheck/MoveTrend.vue
@@ -26,7 +26,10 @@
 export default {
   model: { prop: "form", event: "formChange" },
   props: {
-    form: { type: Object, default: () => {} }
+    form: {
+      type: Object,
+      default: () => {}
+    }
   },
   watch: {
     form() {
diff --git a/src/pages/ReCheck/index.vue b/src/pages/ReCheck/index.vue
index 18668ee..82ca1bc 100644
--- a/src/pages/ReCheck/index.vue
+++ b/src/pages/ReCheck/index.vue
@@ -161,10 +161,13 @@
           <custom-base-table
             size="small"
             :columns="logColumns"
-            :dataSource="logData.filter(logShowCondition)"
+            :data="logData.filter(logShowCondition)"
+            tbodyClasses="cTable"
           >
-            <template slot="LogType" slot-scope="text">
-              {{ LogTypes.filter(item => item.value == text)[0].title }}
+            <template slot="LogType" slot-scope="item">
+              {{
+                LogTypes.filter(i => i.value == item.row.item.LogType)[0].title
+              }}
             </template>
           </custom-base-table>
         </el-tab-pane>
@@ -221,7 +224,12 @@ export default {
       RobotPolicyType,
       policyMode: 0,
       tradeData: [],
-      trendForm: {},
+      trendForm: {
+        NowCapital: 10000,
+        OriginalCapital: 12000,
+        FrozenProfit: 12,
+        TradeAmountRatio: 50
+      },
       startTime: null,
       endTime: null,
       kLineData: {},
@@ -296,25 +304,25 @@ export default {
         this.kLinesFromExcels.some(item => item.name == model)
       ) {
         let result = [];
-        if (this.policyMode == 0) {
-          let data = this.kLinesFromExcels.filter(item => item.name == model)[0]
-            .data;
-          let temp = this.mutateData(data); //分别操作出接口需要的data和图标data
-          result = this.splitData(temp.kLineData); //图表data处理
-          this.kLineDataList = temp.postData;
-          this.kLineData = result;
-        } else {
-          let index = 0;
-          for (let i = 0; i < this.kLinesFromExcels.length; i++) {
-            if (this.kLinesFromExcels[i].name == model) {
-              index = i;
-              break;
-            }
-          }
-          let temp = this.topMutateData(this.topTempDataList[index]);
-          result = this.splitData(temp.kLineData); //图表data处理
-          this.kLineData = result;
-        }
+        // if (this.policyMode == 0) {
+        let data = this.kLinesFromExcels.filter(item => item.name == model)[0]
+          .data;
+        let temp = this.mutateData(data); //分别操作出接口需要的data和图标data
+        result = this.splitData(temp.kLineData); //图表data处理
+        this.kLineDataList = temp.postData;
+        this.kLineData = result;
+        // } else {
+        //   let index = 0;
+        //   for (let i = 0; i < this.kLinesFromExcels.length; i++) {
+        //     if (this.kLinesFromExcels[i].name == model) {
+        //       index = i;
+        //       break;
+        //     }
+        //   }
+        //   let temp = this.topMutateData(this.topTempDataList[index]);
+        //   result = this.splitData(temp.kLineData); //图表data处理
+        //   this.kLineData = result;
+        // }
       }
     },
     excelImport() {
@@ -324,28 +332,28 @@ export default {
       Excel.importExcel(data => {
         that.spinning = false;
         if (data && data[0]) {
-          if (this.policyMode == 1) {
-            this.kLinesFromExcels = data;
-            this.lineSelect = data[0].name;
-            let _data = [];
-            data.forEach(element => {
-              _data.push(element.data);
-            });
-            this.topEndMutateData(_data);
-            console.log("final", _data);
-            this.topTempDataList = _data;
-            let temp = that.topMutateData(_data[0]);
-            result = this.splitData(temp.kLineData); //图表data处理
-            this.kLineData = result;
-          } else {
-            this.kLinesFromExcels = data;
-            this.lineSelect = data[0].name;
-            let temp = that.mutateData(data[0].data); //分别操作出接口需要的data和图标data
-            result = this.splitData(temp.kLineData); //图表data处理
-            console.log("what i got", result);
-            this.kLineDataList = temp.postData;
-            this.kLineData = result;
-          }
+          // if (this.policyMode == 1) {
+          //   this.kLinesFromExcels = data;
+          //   this.lineSelect = data[0].name;
+          //   let _data = [];
+          //   data.forEach(element => {
+          //     _data.push(element.data);
+          //   });
+          //   this.topEndMutateData(_data);
+          //   console.log("final", _data);
+          //   this.topTempDataList = _data;
+          //   let temp = that.topMutateData(_data[0]);
+          //   result = this.splitData(temp.kLineData); //图表data处理
+          //   this.kLineData = result;
+          // } else {
+          this.kLinesFromExcels = data;
+          this.lineSelect = data[0].name;
+          let temp = that.mutateData(data[0].data); //分别操作出接口需要的data和图标data
+          result = this.splitData(temp.kLineData); //图表data处理
+          console.log("what i got", result);
+          this.kLineDataList = temp.postData;
+          this.kLineData = result;
+          // }
         }
       });
     },
@@ -439,6 +447,7 @@ export default {
     },
 
     //动量回测数据处理
+    //5-小趋势 6-中趋势 7-大趋势 8-多交叉 9-空交叉 10-做多 12-做空
     mutateData(data) {
       let result = [];
       let postResult = [];
@@ -453,14 +462,16 @@ export default {
                 this.startTime &&
                 this.endTime &&
                 !moment(data[i][j] * 1000).isBetween(
-                  moment(this.startTime),
-                  moment(this.endTime)
+                  this.startTime.startOf("day"),
+                  this.endTime.endOf("day")
                 )
               ) {
                 break;
               } else if (
                 this.startTime &&
-                !moment(data[i][j] * 1000).isAfter(moment(this.startTime))
+                !moment(data[i][j] * 1000).isAfter(
+                  this.startTime.startOf("day")
+                )
               ) {
                 break;
               }
@@ -485,12 +496,32 @@ export default {
               //close
               subArray[2] = data[i][j];
               postObj.C = data[i][j];
+            } else if (j == 5) {
+              postObj.STP = data[i][j];
+            } else if (j == 6) {
+              postObj.MTP = data[i][j];
             } else if (j == 7) {
-              postObj.TP = data[i][j];
-            } else if (j == 13) {
-              if (data[i][j] != 0) postObj.N = 3;
-            } else if (j == 11) {
+              postObj.BTP = data[i][j];
+            } else if (j == 8) {
+              if (
+                data[i][j] != 0 &&
+                data[i][j] &&
+                data[i][j] != "NaN" &&
+                data[i][j] != NaN
+              )
+                postObj.N = 10;
+            } else if (j == 9) {
+              if (
+                data[i][j] != 0 &&
+                data[i][j] &&
+                data[i][j] != "NaN" &&
+                data[i][j] != NaN
+              )
+                postObj.N = 11;
+            } else if (j == 10) {
               if (data[i][j] != 0) postObj.N = 2;
+            } else if (j == 12) {
+              if (data[i][j] != 0) postObj.N = 3;
             } else if (j == 15) {
               subArray[5] = {};
               if (data[i][j] != 0) {
@@ -692,8 +723,12 @@ export default {
     executeTrendTest() {
       if (this.trendForm && this.kLineDataList.length > 0) {
         this.$http
-          .post("/Api/Simulation/MomentumWaveTest", {
-            Capital: this.trendForm,
+          .post("/Api/Simulation/MomentumTrendTest", {
+            Capital: {
+              ...this.trendForm,
+              FrozenProfit: this.trendForm.FrozenProfit / 100,
+              TradeAmountRatio: this.trendForm.TradeAmountRatio / 100
+            },
             kLineDataList: this.kLineDataList
           })
           .then(res => {
@@ -723,4 +758,9 @@ export default {
 };
 </script>
 
-<style></style>
+<style>
+.cTable {
+  height: 500px;
+  overflow: hidden;
+}
+</style>
diff --git a/src/pages/Robot/index.vue b/src/pages/Robot/index.vue
index ed2033a..9a9fa13 100644
--- a/src/pages/Robot/index.vue
+++ b/src/pages/Robot/index.vue
@@ -225,10 +225,12 @@ export default {
       allSymbol: [],
       modal: { visible: false },
       createLoading: false,
-      columns: tableColumns
+      columns: tableColumns,
+      type: 0 //0-动量现货 1-动量趋势
     };
   },
   created() {
+    this.type = this.$route.params.type;
     this.getRobotList();
     this.getAllSymbol();
     this.getAccountList();
@@ -237,11 +239,13 @@ export default {
   methods: {
     //获取所有的交易所账号
     getAccountList() {
-      this.$http.get("/Api/StockExchangeAccount/GetList").then(res => {
-        if (res.Code == 200) {
-          this.accountList = res.Data;
-        }
-      });
+      this.$http
+        .get(`/Api/StockExchangeAccount/GetList?policyType=${this.type}`)
+        .then(res => {
+          if (res.Code == 200) {
+            this.accountList = res.Data;
+          }
+        });
     },
 
     //获取所有交易对
@@ -256,12 +260,23 @@ export default {
     //获取机器人列表
     getRobotList() {
       //   this.spinning = true;
-      this.$http.get("/Api/Robot/GetMomentumWaveTradeRobotList").then(res => {
-        // this.spinning = false;
-        if (res.Code == 200) {
-          this.tableData = res.Data;
-        }
-      });
+      if (this.type == 0) {
+        this.$http.get("/Api/Robot/GetMomentumWaveTradeRobotList").then(res => {
+          // this.spinning = false;
+          if (res.Code == 200) {
+            this.tableData = res.Data;
+          }
+        });
+      } else {
+        this.$http
+          .get("/Api/Robot/GetMomentumTrendTradeRobotList")
+          .then(res => {
+            // this.spinning = false;
+            if (res.Code == 200) {
+              this.tableData = res.Data;
+            }
+          });
+      }
     },
 
     getMatchTitle(value, sourceArray) {
diff --git a/src/pages/prePages/ReCheck.vue b/src/pages/prePages/ReCheck.vue
index 18b13d8..8d27197 100644
--- a/src/pages/prePages/ReCheck.vue
+++ b/src/pages/prePages/ReCheck.vue
@@ -177,7 +177,7 @@
             :dataSource="logData.filter(logShowCondition)"
           >
             <template slot="LogType" slot-scope="text">
-              {{ LogTypes.filter((item) => item.value == text)[0].title }}
+              {{ LogTypes.filter(item => item.value == text)[0].title }}
             </template>
           </a-table>
         </a-tab-pane>
@@ -257,7 +257,7 @@ import { secToMin } from "../utils/TimeUtils";
 import {
   RobotPolicyType,
   ResetMomentumWaveTest,
-  LogTypes,
+  LogTypes
 } from "./js/selectoptions";
 import MomentumWavePolicy from "../components/MomentumWavePolicy";
 import moment from "moment";
@@ -289,12 +289,12 @@ export default {
       topTempDataList: [],
       buyPointCountList: [],
       salePointCountList: [],
-      logShowCondition: (i) => true,
+      logShowCondition: i => true
     };
   },
   methods: {
     onOk(value) {
-      this.logShowCondition = (item) =>
+      this.logShowCondition = item =>
         moment(item.CreateTime).isBetween(value[0], value[1]);
     },
     changeFilter(value, type) {
@@ -314,9 +314,7 @@ export default {
 
         if (buyKey && JSON.stringify(buyKey) != "{}") {
           keyPoint.push(buyKey);
-          if (
-            !this.buyPointCountList.some((item) => item.value == buyKey.value)
-          )
+          if (!this.buyPointCountList.some(item => item.value == buyKey.value))
             this.buyPointCountList.push(buyKey);
         }
 
@@ -324,7 +322,7 @@ export default {
         if (saleKey && JSON.stringify(saleKey) != "{}") {
           keyPoint.push(saleKey);
           if (
-            !this.salePointCountList.some((item) => item.value == saleKey.value)
+            !this.salePointCountList.some(item => item.value == saleKey.value)
           )
             this.salePointCountList.push(saleKey);
         }
@@ -334,12 +332,12 @@ export default {
       console.log({
         categoryData,
         values,
-        keyPoint,
+        keyPoint
       });
       return {
         categoryData,
         values,
-        keyPoint,
+        keyPoint
       };
     },
     //选择不同的excel表展示
@@ -348,60 +346,59 @@ export default {
       if (
         this.kLinesFromExcels &&
         this.kLinesFromExcels.length > 0 &&
-        this.kLinesFromExcels.some((item) => item.name == model)
+        this.kLinesFromExcels.some(item => item.name == model)
       ) {
         let result = [];
-        if (this.policyMode == 0) {
-          let data = this.kLinesFromExcels.filter(
-            (item) => item.name == model
-          )[0].data;
-          let temp = this.mutateData(data); //分别操作出接口需要的data和图标data
-          result = this.splitData(temp.kLineData); //图表data处理
-          this.kLineDataList = temp.postData;
-          this.kLineData = result;
-        } else {
-          let index = 0;
-          for (let i = 0; i < this.kLinesFromExcels.length; i++) {
-            if (this.kLinesFromExcels[i].name == model) {
-              index = i;
-              break;
-            }
-          }
-          let temp = this.topMutateData(this.topTempDataList[index]);
-          result = this.splitData(temp.kLineData); //图表data处理
-          this.kLineData = result;
-        }
+        // if (this.policyMode == 0 ) {
+        let data = this.kLinesFromExcels.filter(item => item.name == model)[0]
+          .data;
+        let temp = this.mutateData(data); //分别操作出接口需要的data和图标data
+        result = this.splitData(temp.kLineData); //图表data处理
+        this.kLineDataList = temp.postData;
+        this.kLineData = result;
+        // } else {
+        // let index = 0;
+        // for (let i = 0; i < this.kLinesFromExcels.length; i++) {
+        //   if (this.kLinesFromExcels[i].name == model) {
+        //     index = i;
+        //     break;
+        //   }
+        // }
+        // let temp = this.topMutateData(this.topTempDataList[index]);
+        // result = this.splitData(temp.kLineData); //图表data处理
+        // this.kLineData = result;
+        // }
       }
     },
     excelImport() {
       let that = this;
       let result = [];
       this.spinning = true;
-      Excel.importExcel((data) => {
+      Excel.importExcel(data => {
         that.spinning = false;
         if (data && data[0]) {
-          if (this.policyMode == 1) {
-            this.kLinesFromExcels = data;
-            this.lineSelect = data[0].name;
-            let _data = [];
-            data.forEach((element) => {
-              _data.push(element.data);
-            });
-            this.topEndMutateData(_data);
-            console.log("final", _data);
-            this.topTempDataList = _data;
-            let temp = that.topMutateData(_data[0]);
-            result = this.splitData(temp.kLineData); //图表data处理
-            this.kLineData = result;
-          } else {
-            this.kLinesFromExcels = data;
-            this.lineSelect = data[0].name;
-            let temp = that.mutateData(data[0].data); //分别操作出接口需要的data和图标data
-            result = this.splitData(temp.kLineData); //图表data处理
-            console.log("what i got", result);
-            this.kLineDataList = temp.postData;
-            this.kLineData = result;
-          }
+          // if (this.policyMode == 1) {
+          //   this.kLinesFromExcels = data;
+          //   this.lineSelect = data[0].name;
+          //   let _data = [];
+          //   data.forEach(element => {
+          //     _data.push(element.data);
+          //   });
+          //   this.topEndMutateData(_data);
+          //   console.log("final", _data);
+          //   this.topTempDataList = _data;
+          //   let temp = that.topMutateData(_data[0]);
+          //   result = this.splitData(temp.kLineData); //图表data处理
+          //   this.kLineData = result;
+          // } else {
+          this.kLinesFromExcels = data;
+          this.lineSelect = data[0].name;
+          let temp = that.mutateData(data[0].data); //分别操作出接口需要的data和图标data
+          result = this.splitData(temp.kLineData); //图表data处理
+          console.log("what i got", result);
+          this.kLineDataList = temp.postData;
+          this.kLineData = result;
+          // }
         }
       });
     },
@@ -495,6 +492,7 @@ export default {
     },
 
     //动量回测数据处理
+    //5-小趋势 6-中趋势 7-大趋势 8-多交叉 9-空交叉 10-做多 12-做空
     mutateData(data) {
       let result = [];
       let postResult = [];
@@ -543,12 +541,32 @@ export default {
               //close
               subArray[2] = data[i][j];
               postObj.C = data[i][j];
+            } else if (j == 5) {
+              postObj.STP = data[i][j];
+            } else if (j == 6) {
+              postObj.MTP = data[i][j];
             } else if (j == 7) {
-              postObj.TP = data[i][j];
-            } else if (j == 13) {
-              if (data[i][j] != 0) postObj.N = 3;
-            } else if (j == 11) {
+              postObj.BTP = data[i][j];
+            } else if (j == 8) {
+              if (
+                data[i][j] != 0 &&
+                data[i][j] &&
+                data[i][j] != "NaN" &&
+                data[i][j] != NaN
+              )
+                postObj.N = 10;
+            } else if (j == 9) {
+              if (
+                data[i][j] != 0 &&
+                data[i][j] &&
+                data[i][j] != "NaN" &&
+                data[i][j] != NaN
+              )
+                postObj.N = 11;
+            } else if (j == 10) {
               if (data[i][j] != 0) postObj.N = 2;
+            } else if (j == 12) {
+              if (data[i][j] != 0) postObj.N = 3;
             } else if (j == 15) {
               subArray[5] = {};
               if (data[i][j] != 0) {
@@ -559,12 +577,12 @@ export default {
                     `${moment(data[i][0] * 1000).format(
                       "YYYY-MM-DD HH:mm:ss"
                     )}`,
-                    data[i][2],
+                    data[i][2]
                   ],
                   value: "1",
                   itemStyle: {
-                    color: "rgb(23,160,93)",
-                  },
+                    color: "rgb(23,160,93)"
+                  }
                 };
               }
             } else if (j == 14) {
@@ -580,12 +598,12 @@ export default {
                     `${moment(data[i][0] * 1000).format(
                       "YYYY-MM-DD HH:mm:ss"
                     )}`,
-                    data[i][3],
+                    data[i][3]
                   ],
                   value: "0",
                   itemStyle: {
-                    color: "rgb(221,82,70)",
-                  },
+                    color: "rgb(221,82,70)"
+                  }
                 };
               }
             }
@@ -598,105 +616,105 @@ export default {
     },
 
     //订底回测数据处理
-    topMutateData(data) {
-      let result = [];
-      let postResult = [];
-      if (data.length > 1) {
-        for (let i = 0; i < data.length; i++) {
-          if (i == 0) continue;
-          let subArray = [];
-          let postObj = { N: null };
-          for (let j = 0; j < data[i].length; j++) {
-            if (j == 0) {
-              if (
-                this.startTime &&
-                this.endTime &&
-                !moment(data[i][j] * 1000).isBetween(
-                  this.startTime.startOf("day"),
-                  this.endTime.endOf("day")
-                )
-              ) {
-                break;
-              } else if (
-                this.startTime &&
-                !moment(data[i][j] * 1000).isAfter(
-                  this.startTime.startOf("day")
-                )
-              ) {
-                break;
-              }
+    // topMutateData(data) {
+    //   let result = [];
+    //   let postResult = [];
+    //   if (data.length > 1) {
+    //     for (let i = 0; i < data.length; i++) {
+    //       if (i == 0) continue;
+    //       let subArray = [];
+    //       let postObj = { N: null };
+    //       for (let j = 0; j < data[i].length; j++) {
+    //         if (j == 0) {
+    //           if (
+    //             this.startTime &&
+    //             this.endTime &&
+    //             !moment(data[i][j] * 1000).isBetween(
+    //               this.startTime.startOf("day"),
+    //               this.endTime.endOf("day")
+    //             )
+    //           ) {
+    //             break;
+    //           } else if (
+    //             this.startTime &&
+    //             !moment(data[i][j] * 1000).isAfter(
+    //               this.startTime.startOf("day")
+    //             )
+    //           ) {
+    //             break;
+    //           }
 
-              subArray[0] = moment(data[i][j] * 1000).format(
-                "YYYY-MM-DD HH:mm:ss"
-              );
-              postObj.T = data[i][j];
-            } else if (j == 1) {
-              //open
-              subArray[1] = data[i][j];
-              postObj.OpenPrice = data[i][j];
-            } else if (j == 2) {
-              //highest
-              subArray[4] = data[i][j];
-              postObj.H = data[i][j];
-            } else if (j == 3) {
-              //lowest
-              subArray[3] = data[i][j];
-              postObj.L = data[i][j];
-            } else if (j == 4) {
-              //close
-              subArray[2] = data[i][j];
-              postObj.C = data[i][j];
-            } else if (j == 5) {
-              postObj.TP = data[i][j];
-            } else if (j == 6) {
-              if (data[i][j] != 0) postObj.N = 3;
-            } else if (j == 7) {
-              subArray[5] = {};
-              if (data[i][j] && data[i][j] != 0) {
-                postObj.N = 1;
-                subArray[5] = {
-                  name: "买入Point",
-                  coord: [
-                    `${moment(data[i][0] * 1000).format(
-                      "YYYY-MM-DD HH:mm:ss"
-                    )}`,
-                    data[i][3],
-                  ],
-                  value: data[i][j],
-                  itemStyle: {
-                    color: "rgb(23,160,93)",
-                  },
-                };
-              }
-            } else if (j == 8) {
-              subArray[6] = {};
-              if (data[i][j] && data[i][j] != 0) {
-                postObj.N = 0;
-                subArray[6] = {
-                  name: "卖出Point",
-                  symbol: "diamond",
-                  symbolSize: [15, 25],
-                  symbolOffset: [0, 25],
-                  coord: [
-                    `${moment(data[i][0] * 1000).format(
-                      "YYYY-MM-DD HH:mm:ss"
-                    )}`,
-                    data[i][2],
-                  ],
-                  value: data[i][j],
-                  itemStyle: {
-                    color: "rgb(221,82,70)",
-                  },
-                };
-              }
-            }
-          }
-          if (subArray.length > 0) result.push(subArray);
-          if (postObj.T != null) postResult.push(postObj);
-        }
-      }
-      return { kLineData: result, postData: postResult };
-    },
+    //           subArray[0] = moment(data[i][j] * 1000).format(
+    //             "YYYY-MM-DD HH:mm:ss"
+    //           );
+    //           postObj.T = data[i][j];
+    //         } else if (j == 1) {
+    //           //open
+    //           subArray[1] = data[i][j];
+    //           postObj.OpenPrice = data[i][j];
+    //         } else if (j == 2) {
+    //           //highest
+    //           subArray[4] = data[i][j];
+    //           postObj.H = data[i][j];
+    //         } else if (j == 3) {
+    //           //lowest
+    //           subArray[3] = data[i][j];
+    //           postObj.L = data[i][j];
+    //         } else if (j == 4) {
+    //           //close
+    //           subArray[2] = data[i][j];
+    //           postObj.C = data[i][j];
+    //         } else if (j == 5) {
+    //           postObj.TP = data[i][j];
+    //         } else if (j == 6) {
+    //           if (data[i][j] != 0) postObj.N = 3;
+    //         } else if (j == 7) {
+    //           subArray[5] = {};
+    //           if (data[i][j] && data[i][j] != 0) {
+    //             postObj.N = 1;
+    //             subArray[5] = {
+    //               name: "买入Point",
+    //               coord: [
+    //                 `${moment(data[i][0] * 1000).format(
+    //                   "YYYY-MM-DD HH:mm:ss"
+    //                 )}`,
+    //                 data[i][3]
+    //               ],
+    //               value: data[i][j],
+    //               itemStyle: {
+    //                 color: "rgb(23,160,93)"
+    //               }
+    //             };
+    //           }
+    //         } else if (j == 8) {
+    //           subArray[6] = {};
+    //           if (data[i][j] && data[i][j] != 0) {
+    //             postObj.N = 0;
+    //             subArray[6] = {
+    //               name: "卖出Point",
+    //               symbol: "diamond",
+    //               symbolSize: [15, 25],
+    //               symbolOffset: [0, 25],
+    //               coord: [
+    //                 `${moment(data[i][0] * 1000).format(
+    //                   "YYYY-MM-DD HH:mm:ss"
+    //                 )}`,
+    //                 data[i][2]
+    //               ],
+    //               value: data[i][j],
+    //               itemStyle: {
+    //                 color: "rgb(221,82,70)"
+    //               }
+    //             };
+    //           }
+    //         }
+    //       }
+    //       if (subArray.length > 0) result.push(subArray);
+    //       if (postObj.T != null) postResult.push(postObj);
+    //     }
+    //   }
+    //   return { kLineData: result, postData: postResult };
+    // },
 
     executeTest() {
       if (this.policyFormData && this.kLineDataList.length > 0) {
@@ -704,10 +722,10 @@ export default {
         this.$http
           .post("/Api/Simulation/MomentumWaveTest", {
             MomentumWavePolicy: this.policyFormData,
-            kLineDataList: this.kLineDataList,
+            kLineDataList: this.kLineDataList
           })
-          .then((res) => {
-            this.logShowCondition = (i) => true;
+          .then(res => {
+            this.logShowCondition = i => true;
             this.spinning = false;
             if (res.Code == 200) {
               console.log("回测成功");
@@ -741,8 +759,8 @@ export default {
             }
           });
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
diff --git a/src/router/routes.js b/src/router/routes.js
index 9626100..8a74024 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -20,10 +20,10 @@ const routes = [
   {
     path: "/",
     component: DashboardLayout,
-    redirect: "/Robot",
+    redirect: "/robot/0",
     children: [
       {
-        path: "robot",
+        path: "robot/:type",
         name: "robot",
         component: Robot
       },
@@ -38,7 +38,7 @@ const routes = [
         component: WinRate
       },
       {
-        path: "account",
+        path: "account/:type",
         name: "account",
         component: Account
       },