From 2f2e51d7aa36aba7181e74f791b601fe2e545dc5 Mon Sep 17 00:00:00 2001
From: lizhixin <382352532@qq.com>
Date: Tue, 29 Jun 2021 14:41:32 +0800
Subject: [PATCH] change

---
 src/App.vue                                   |   5 +
 .../black-dashboard/bootstrap/_variables.scss |   2 +-
 .../black-dashboard/custom/_variables.scss    |   2 +-
 src/layout/dashboard/DashboardLayout.vue      |   4 +
 src/oldComponents/EchartTable/line.vue        | 104 ++++++
 src/pages/MainAccount/index.vue               | 321 ++++++++++++++++++
 src/pages/MainSec/OrderTable.vue              | 127 ++++++-
 src/pages/MainSec/SignalTable.vue             |  40 +++
 src/pages/MainSec/Summary.vue                 |  38 +++
 src/pages/MainSec/index.vue                   |  17 +-
 src/pages/RobotSec/Modal/OrderPlan.vue        |  56 ++-
 src/pages/RobotSec/Modal/RobotCreate.vue      |  90 ++++-
 src/pages/RobotSec/Modal/RobotSetting.vue     |  12 +-
 src/pages/RobotSec/index.vue                  |  54 +--
 src/pages/prePages/js/columns.js              |  50 ++-
 src/router/routes.js                          |   7 +
 16 files changed, 883 insertions(+), 46 deletions(-)
 create mode 100644 src/oldComponents/EchartTable/line.vue
 create mode 100644 src/pages/MainAccount/index.vue

diff --git a/src/App.vue b/src/App.vue
index cd69c90..cb57c98 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,6 +26,11 @@ export default {
 </script>
 
 <style lang="scss">
+.form-label {
+  font-size: 0.75rem;
+  margin-bottom: 5px;
+  color: rgba(255, 255, 255, 0.6);
+}
 .el-tabs__item {
   color: #c9ccd2 !important;
 }
diff --git a/src/assets/sass/black-dashboard/bootstrap/_variables.scss b/src/assets/sass/black-dashboard/bootstrap/_variables.scss
index 5cf118f..c58bef3 100644
--- a/src/assets/sass/black-dashboard/bootstrap/_variables.scss
+++ b/src/assets/sass/black-dashboard/bootstrap/_variables.scss
@@ -812,7 +812,7 @@ $modal-footer-border-width:         $modal-header-border-width !default;
 $modal-header-padding:              1rem !default;
 
 $modal-lg:                          800px !default;
-$modal-md:                          500px !default;
+$modal-md:                          1000px !default;
 $modal-sm:                          300px !default;
 
 $modal-transition:                  transform .3s ease-out !default;
diff --git a/src/assets/sass/black-dashboard/custom/_variables.scss b/src/assets/sass/black-dashboard/custom/_variables.scss
index bd6f11d..6659330 100644
--- a/src/assets/sass/black-dashboard/custom/_variables.scss
+++ b/src/assets/sass/black-dashboard/custom/_variables.scss
@@ -930,7 +930,7 @@ $tooltip-arrow-color:               $tooltip-bg !default;
 $modal-inner-padding:               24px 24px 16px 24px !default;
 
 $modal-lg:                          800px !default;
-$modal-md:                          500px !default;
+$modal-md:                          1000px !default;
 $modal-sm:                          380px !default;
 $modal-title-line-height:           1.1;
 $modal-content-bg:               $white !default;
diff --git a/src/layout/dashboard/DashboardLayout.vue b/src/layout/dashboard/DashboardLayout.vue
index 9ed394c..cbd4ffb 100644
--- a/src/layout/dashboard/DashboardLayout.vue
+++ b/src/layout/dashboard/DashboardLayout.vue
@@ -59,6 +59,10 @@
           <i class="el-icon-trophy"></i>
           <span slot="title">回测</span>
         </el-menu-item>
+        <el-menu-item index="6" @click="to('/mainAccount')">
+          <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>
diff --git a/src/oldComponents/EchartTable/line.vue b/src/oldComponents/EchartTable/line.vue
new file mode 100644
index 0000000..8f25f0b
--- /dev/null
+++ b/src/oldComponents/EchartTable/line.vue
@@ -0,0 +1,104 @@
+<template>
+  <div :id="id" class="k-line"></div>
+</template>
+
+<script>
+/* eslint-disable */
+import * as echarts from "echarts/core";
+import {
+  TitleComponent,
+  ToolboxComponent,
+  TooltipComponent,
+  GridComponent,
+  DataZoomComponent
+} from "echarts/components";
+import { LineChart } from "echarts/charts";
+import { SVGRenderer } from "echarts/renderers";
+
+echarts.use([
+  TitleComponent,
+  ToolboxComponent,
+  TooltipComponent,
+  GridComponent,
+  DataZoomComponent,
+  LineChart,
+  SVGRenderer
+]);
+
+export default {
+  props: {
+    id: { type: String, default: "lineEchart" },
+    data: { type: Array, default: () => [] }
+  },
+  watch: {
+    data(newVal, oldVal) {
+      console.log(newVal, oldVal);
+      this.options.series[0].data = newVal;
+      this.options && this.chart.setOption(this.options);
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      tempKeyPointArray: [],
+      options: {
+        tooltip: {
+          trigger: "axis",
+          position: function(pt) {
+            return [pt[0], "10%"];
+          }
+        },
+        title: {
+          left: "center",
+          text: "收益面积图"
+        },
+        toolbox: {
+          feature: {}
+        },
+        xAxis: {
+          type: "time",
+          boundaryGap: false
+        },
+        yAxis: {
+          type: "value",
+          boundaryGap: [0, "100%"]
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100
+          },
+          {
+            start: 0,
+            end: 100
+          }
+        ],
+        series: [
+          {
+            name: "收益",
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            areaStyle: {},
+            data: this.data
+          }
+        ]
+      }
+    };
+  },
+  mounted() {
+    let chartDom = document.getElementById(this.id);
+    this.chart = echarts.init(chartDom);
+    this.options && this.chart.setOption(this.options);
+  },
+  methods: {}
+};
+</script>
+
+<style>
+.k-line {
+  height: 500px;
+  width: 90%;
+}
+</style>
diff --git a/src/pages/MainAccount/index.vue b/src/pages/MainAccount/index.vue
new file mode 100644
index 0000000..c088321
--- /dev/null
+++ b/src/pages/MainAccount/index.vue
@@ -0,0 +1,321 @@
+<template>
+  <div>
+    <div class="row">
+      <div class="col-md-4">
+        <card
+          ><span style="fontSize:20px;color:#ffffff;fontWeight:600"
+            >投资总资金：1000000U</span
+          ></card
+        >
+      </div>
+      <div class="col-md-4">
+        <card
+          ><span style="fontSize:20px;color:#ffffff;fontWeight:600"
+            >系统收益：10000000000U</span
+          ></card
+        >
+      </div>
+    </div>
+    <base-button @click="modal.accountAddVisible = true">
+      创建账户
+    </base-button>
+    <el-table :data="data" class="customer-no-border-table" style="width:100%">
+      <el-table-column
+        v-for="i in columns"
+        :label="i.name"
+        :prop="i.prop"
+        :key="i.prop"
+      >
+        <template slot-scope="scope">
+          <!-- 投资收益 -->
+          <div v-if="i.customSlot == 'OrderType'"></div>
+          <!-- 操作 -->
+          <div v-if="i.customSlot == 'Actions'">
+            <el-dropdown
+              trigger="click"
+              :tabindex="1000"
+              @command="handleCommand"
+            >
+              <base-button>操作</base-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="apiKeyVisible"
+                  >编辑</el-dropdown-item
+                >
+                <el-dropdown-item command="amountChangeFormVisible"
+                  >资金变动</el-dropdown-item
+                >
+                <el-dropdown-item command="logVisible"
+                  >变更记录</el-dropdown-item
+                >
+                <el-dropdown-item command="delete">删除</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+          <span v-else> {{ scope.row[i.prop] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加账户 -->
+    <modal
+      :show.sync="modal.accountAddVisible"
+      body-classes="p-0"
+      modal-classes="modal-dialog-centered modal-sm"
+    >
+      <card
+        type="secondary"
+        header-classes="bg-white pb-5"
+        body-classes="px-lg-5 py-lg-5"
+        class="border-0 mb-0"
+      >
+        <template>
+          <div class="text-muted text-center mb-3">
+            <small>添加账号</small>
+          </div>
+          <form role="form">
+            <base-input
+              label="账户"
+              placeholder="请填写账户"
+              v-model="accountForm.LoginName"
+            >
+            </base-input>
+            <base-input
+              label="密码"
+              placeholder="请填写密码"
+              v-model="accountForm.AccessKey"
+            >
+            </base-input>
+            <base-input
+              label="投资资金"
+              placeholder="请填写投资资金"
+              v-model="accountForm.AccessKey"
+            >
+            </base-input>
+
+            <div class="text-center">
+              <base-button
+                type="primary"
+                class="my-4"
+                @click="addAccount"
+                :loading="createLoading"
+                >创建账户</base-button
+              >
+            </div>
+          </form>
+        </template>
+      </card>
+    </modal>
+
+    <!-- 资金变动 -->
+    <modal
+      :show.sync="modal.amountChangeFormVisible"
+      body-classes="p-0"
+      modal-classes="modal-dialog-centered modal-sm"
+    >
+      <card
+        type="secondary"
+        header-classes="bg-white pb-5"
+        body-classes="px-lg-5 py-lg-5"
+        class="border-0 mb-0"
+      >
+        <template>
+          <div class="text-muted text-center mb-3">
+            <small>资金变动</small>
+          </div>
+          <form role="form">
+            <!-- 类型 -->
+            <p class="form-label" style="color:rgba(255, 255, 255, 0.6)">
+              类型：
+            </p>
+            <el-select
+              class="select-danger mb-4"
+              style="width:100%"
+              placeholder="选择改变资金类型"
+              v-model="amountChangeForm.AccountType"
+            >
+              <el-option
+                v-for="item in changeTypes"
+                class="select-danger"
+                :value="item.value"
+                :label="item.title"
+                :key="item.value"
+              >
+              </el-option>
+            </el-select>
+
+            <base-input
+              label="变动金额"
+              placeholder="请填写变动金额"
+              v-model="amountChangeForm.AccessKey"
+            >
+            </base-input>
+
+            <base-input
+              label="备注"
+              placeholder="请填写备注"
+              v-model="amountChangeForm.AccessKey"
+            >
+            </base-input>
+
+            <div class="text-center">
+              <base-button
+                type="primary"
+                class="my-4"
+                @click="moneyChange"
+                :loading="createLoading"
+                >确定</base-button
+              >
+            </div>
+          </form>
+        </template>
+      </card>
+    </modal>
+
+    <!-- 变更记录 -->
+    <modal
+      :show.sync="modal.logVisible"
+      body-classes="p-0"
+      modal-classes="modal-dialog-centered modal-xl"
+    >
+      <card
+        type="secondary"
+        header-classes="bg-white pb-5"
+        body-classes="px-lg-5 py-lg-5"
+        class="border-0 mb-0"
+      >
+        <template>
+          <div class="text-muted text-center mb-3">
+            <small>资金变动</small>
+          </div>
+          <el-table :data="changeData">
+            <el-table-column
+              v-for="i in changeColumns"
+              :label="i.name"
+              :width="i.width || 160"
+              :prop="i.prop"
+              :key="i.prop"
+            >
+              <template slot-scope="scope">
+                <!-- 投资收益 -->
+                <div v-if="i.customSlot == 'OrderType'"></div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </card>
+    </modal>
+  </div>
+</template>
+
+<script>
+import { Modal } from "@/components";
+import Card from "../../components/Cards/Card.vue";
+
+const Columns = [
+  {
+    name: "账户",
+    prop: "Account",
+    key: "Account"
+  },
+  {
+    name: "昵称",
+    prop: "Nick",
+    key: "Nick"
+  },
+  {
+    name: "投资资金",
+    prop: "Money",
+    key: "Money",
+    customSlot: "CapitalAfter"
+  },
+  {
+    name: "投资占比",
+    prop: "Ratio",
+    key: "Ratio",
+    customSlot: "CapitalAfter"
+  },
+  {
+    name: "投资收益",
+    prop: "Profit",
+    key: "Profit"
+  },
+  {
+    name: "最后变更时间",
+    prop: "LastModified",
+    key: "LastModified"
+  },
+  {
+    name: "操作",
+    prop: "Actions",
+    key: "Actions",
+    customSlot: "Actions"
+  }
+];
+
+const ChangeColumns = [
+  {
+    name: "账户",
+    prop: "Account",
+    key: "Account"
+  },
+  {
+    name: "昵称",
+    prop: "Nick",
+    key: "Nick"
+  },
+  {
+    name: "类型",
+    prop: "Type",
+    key: "Type",
+    customSlot: "Type"
+  },
+  {
+    name: "变更金额",
+    prop: "ChangeAmount",
+    key: "ChangeAmount"
+  },
+  {
+    name: "备注",
+    prop: "Remark",
+    key: "Remark"
+  },
+  {
+    name: "时间",
+    prop: "Time",
+    key: "Time"
+  }
+];
+
+export default {
+  components: { Modal },
+  data() {
+    return {
+      modal: {
+        accountAddVisible: false,
+        logVisible: false,
+        amountChangeFormVisible: false
+      },
+      createLoading: false,
+      columns: Columns,
+      changeColumns: ChangeColumns,
+      accountForm: {},
+      amountChangeForm: {},
+      data: [{ Account: "小一" }],
+      changeData: [],
+      changeTypes: [
+        { value: 0, title: "增加资金" },
+        { value: 1, title: "减少资金" }
+      ]
+    };
+  },
+  methods: {
+    addAccount() {},
+    moneyChange() {},
+    handleCommand(command) {
+      this.modal[command] = true;
+    }
+  }
+};
+</script>
+
+<style></style>
diff --git a/src/pages/MainSec/OrderTable.vue b/src/pages/MainSec/OrderTable.vue
index aa61bc1..442dc51 100644
--- a/src/pages/MainSec/OrderTable.vue
+++ b/src/pages/MainSec/OrderTable.vue
@@ -1,11 +1,126 @@
 <template>
-    <div>
+  <div>
+    <el-table :data="data" height="600" class="customer-no-border-table">
+      <el-table-column
+        v-for="i in columns"
+        :label="i.name"
+        :prop="i.prop"
+        :key="i.prop"
+      >
+        <template slot-scope="scope">
+          <!-- 卖卖类型 -->
+          <div v-if="i.customSlot == 'OrderType'">
+            <p>买入</p>
+            <p>卖出</p>
+          </div>
+          <!-- 手持资金 -->
+          <div v-else-if="i.customSlot == 'CapitalAfter'">
+            <p>{{ scope.row.CapitalAfterPurchase.toFixed(2) || 0 }}</p>
+            <p>{{ scope.row.CapitalAfterSale.toFixed(2) || 0 }}</p>
+          </div>
+          <!-- 买卖时间 -->
+          <div v-else-if="i.customSlot == 'KLineId'">
+            <p>
+              {{
+                scope.row.PurchaseKLineId
+                  ? moment(scope.row.PurchaseKLineId * 1000).format(
+                      "YYYY-MM-DD HH:mm:ss"
+                    )
+                  : "-"
+              }}
+            </p>
+            <p>
+              {{
+                scope.row.SaleKLineId
+                  ? moment(scope.row.SaleKLineId * 1000).format(
+                      "YYYY-MM-DD HH:mm:ss"
+                    )
+                  : "-"
+              }}
+            </p>
+          </div>
+          <!-- 买卖价格 -->
+          <div v-else-if="i.customSlot == 'Price'">
+            <p>{{ scope.row.PurchasePrice }}</p>
+            <p>{{ scope.row.SalePrice }}</p>
+          </div>
+          <!-- 买卖数量 -->
+          <div v-else-if="i.customSlot == 'Count'">
+            <p>{{ scope.row.PurchaseCoinCount || "-" }}</p>
+            <p>{{ scope.row.SaleCoinCount || "-" }}</p>
+          </div>
+          <!-- 成交总价 -->
+          <div v-else-if="i.customSlot == 'Total'">
+            <p>{{ scope.row.TotalPurchasePrice || "-" }}</p>
+            <p>{{ scope.row.TotalSalePrice || "-" }}</p>
+          </div>
 
-    </div>
+          <!-- 借币金额 -->
+          <div v-else-if="i.customSlot == 'BorrowAmount'">
+            <p>{{ scope.row.BorrowAmount.toFixed(2) || "-" }}</p>
+          </div>
+
+          <!-- 借币利息 -->
+          <div v-else-if="i.customSlot == 'BorrowFee'">
+            <p>{{ scope.row.BorrowFee.toFixed(2) || "-" }}</p>
+          </div>
+
+          <!-- 借币比例 -->
+          <div v-else-if="i.customSlot == 'BorrowRatio'">
+            <p>{{ scope.row.BorrowRatio.toFixed(2) || "-" }}%</p>
+          </div>
+
+          <!-- 最大浮亏 -->
+          <div v-else-if="i.customSlot == 'MaxLossRatio'">
+            <p>{{ scope.row.MaxLossPrice || "-" }}</p>
+            <p>{{ scope.row.MaxLossRatio || "-" }}%</p>
+          </div>
+          <!-- 盈亏 -->
+          <div v-else-if="i.customSlot == 'Profit'">
+            <p>{{ scope.row.Profit }}</p>
+            <p v-if="scope.row.Profit">
+              {{
+                (
+                  (scope.row.Profit / scope.row.TotalPurchasePrice) *
+                  100
+                ).toFixed(2)
+              }}%
+            </p>
+            <p v-else>-</p>
+          </div>
+          <!-- 累计盈亏 -->
+          <div v-else-if="i.customSlot == 'TotalProfit'">
+            <p>{{ scope.row.TotalProfit }}</p>
+            <p v-if="scope.row.TotalProfit">
+              {{ scope.row.TotalProfitRatio }}%
+            </p>
+            <p v-else>-</p>
+          </div>
+          <div v-else>
+            <p>{{ scope.row[i.prop] }}</p>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 <script>
-import {secondTradeColumns} from '../prePages/js/columns'
+import { secondTradeColumns } from "../prePages/js/columns";
 export default {
-    
-}
-</script>
\ No newline at end of file
+  props: {
+    robotId: { type: String, default: "" }
+  },
+  data() {
+    return {
+      columns: secondTradeColumns,
+      data: []
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    init() {}
+  }
+};
+</script>
diff --git a/src/pages/MainSec/SignalTable.vue b/src/pages/MainSec/SignalTable.vue
index e69de29..8572063 100644
--- a/src/pages/MainSec/SignalTable.vue
+++ b/src/pages/MainSec/SignalTable.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <el-table :data="data" class="customer-no-border-table">
+      <el-table-column
+        v-for="i in secondLogColumns"
+        :label="i.name"
+        :prop="i.prop"
+        :key="i.prop"
+      >
+        <template slot-scope="scope">
+          <div v-if="i.customSlot == 'OrderType'"></div>
+          <div v-else>
+            <p>{{ scope.row[i.prop] }}</p>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { secondLogColumns } from "../prePages/js/columns";
+export default {
+  props: {
+    robotId: { type: String, default: "" }
+  },
+  data() {
+    return {
+      secondLogColumns,
+      data: []
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    init() {}
+  }
+};
+</script>
diff --git a/src/pages/MainSec/Summary.vue b/src/pages/MainSec/Summary.vue
index e69de29..2d110e3 100644
--- a/src/pages/MainSec/Summary.vue
+++ b/src/pages/MainSec/Summary.vue
@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <card><LineEcahrt :data="data"/></card>
+    <card>
+      <p>购买交易数量：</p>
+      <p>购买交易数量：</p>
+      <p>购买交易数量：</p>
+      <p>购买交易数量：</p>
+      <p>购买交易数量：</p>
+      <p>购买交易数量：</p>
+      <p>购买交易数量：</p>
+    </card>
+  </div>
+</template>
+<script>
+import LineEcahrt from "../../oldComponents/EchartTable/line.vue";
+export default {
+  components: {
+    LineEcahrt
+  },
+  data() {
+    return {
+      data: [
+        ["2021/6/28", 12],
+        ["2021/6/29", 2],
+        ["2021/6/30", 44],
+        ["2021/7/1", 54],
+        ["2021/7/2", 34],
+        ["2021/7/3", 12],
+        ["2021/7/4", 21],
+        ["2021/7/5", 21],
+        ["2021/7/6", 333],
+        ["2021/7/7", 43]
+      ]
+    };
+  }
+};
+</script>
diff --git a/src/pages/MainSec/index.vue b/src/pages/MainSec/index.vue
index 3a4694e..3e8a222 100644
--- a/src/pages/MainSec/index.vue
+++ b/src/pages/MainSec/index.vue
@@ -1,14 +1,23 @@
 <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="1" label="概况"> <Summary /></el-tab-pane>
+      <el-tab-pane name="2" label="交易清单"><OrderTable /> </el-tab-pane>
+      <el-tab-pane name="3" label="信号日志"> <SignalTable /></el-tab-pane>
       <el-tab-pane name="4" label="资金日志"> </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
-export default {};
+import OrderTable from "./OrderTable.vue";
+import SignalTable from "./SignalTable.vue";
+import Summary from "./Summary.vue";
+export default {
+  components: {
+    OrderTable,
+    SignalTable,
+    Summary
+  }
+};
 </script>
diff --git a/src/pages/RobotSec/Modal/OrderPlan.vue b/src/pages/RobotSec/Modal/OrderPlan.vue
index 3759f1b..c3aa93b 100644
--- a/src/pages/RobotSec/Modal/OrderPlan.vue
+++ b/src/pages/RobotSec/Modal/OrderPlan.vue
@@ -16,10 +16,52 @@
           <small>委托单</small>
         </div>
       </template>
-      <div class="text-center">
-        <base-button type="primary" class="my-4" @click="confirm"
-          >确定</base-button
+      <!-- 类型 -->
+      <p class="form-label" style="color:rgba(255, 255, 255, 0.6)">
+        委托类型：
+      </p>
+      <el-select
+        class="select-danger mb-4"
+        style="width:100%"
+        placeholder="选择改变委托类型"
+        v-model="planForm.Type"
+      >
+        <el-option
+          v-for="item in planWays"
+          class="select-danger"
+          :value="item.value"
+          :label="item.title"
+          :key="item.value"
         >
+        </el-option>
+      </el-select>
+      <base-input
+        v-if="planForm.Type == 0"
+        label="价格"
+        placeholder="请填写价格"
+        v-model="planForm.Price"
+      >
+      </base-input>
+      <base-input
+        label="数量"
+        placeholder="请填写数量"
+        v-model="planForm.Count"
+      >
+      </base-input>
+
+      <div class="text-center">
+        <div class="row">
+          <div class="col-md-6">
+            <base-button type="info" class="my-4" @click="confirm"
+              >买入</base-button
+            >
+          </div>
+          <div class="col-md-6">
+            <base-button type="warning" class="my-4" @click="confirm"
+              >卖出</base-button
+            >
+          </div>
+        </div>
       </div>
     </card>
   </modal>
@@ -33,7 +75,13 @@ export default {
   components: { Modal },
   props: { robotInfo: { type: Object, defualt: () => {} }, visible: false },
   data() {
-    return {};
+    return {
+      planForm: { Type: 0 },
+      planWays: [
+        { title: "限价单", value: 0 },
+        { title: "市价单", value: 1 }
+      ]
+    };
   },
   watch: {
     visible(newV, oldV) {
diff --git a/src/pages/RobotSec/Modal/RobotCreate.vue b/src/pages/RobotSec/Modal/RobotCreate.vue
index 1a56693..bd6845d 100644
--- a/src/pages/RobotSec/Modal/RobotCreate.vue
+++ b/src/pages/RobotSec/Modal/RobotCreate.vue
@@ -17,6 +17,58 @@
             <small>新建机器人</small>
           </div>
         </template>
+        <!-- 关联账户 -->
+        <p class="form-label" style="color:rgba(255, 255, 255, 0.6)">
+          账户：
+        </p>
+        <el-select
+          @change="clearSymbol"
+          class="select-danger mb-4"
+          style="width:100%"
+          placeholder="选择关联账户"
+          v-model="form.AccessKey"
+        >
+          <el-option
+            v-for="item in accountList"
+            class="select-danger"
+            :value="item.id"
+            :label="item.account"
+            :key="item.id"
+          >
+          </el-option>
+        </el-select>
+        <!-- 关联交易对 -->
+        <div
+          v-if="
+            form.AccessKey &&
+              accountList.filter(item => item.id == form.AccessKey)[0]
+                .apiKeys[0]
+          "
+        >
+          <p class="form-label" style="color:rgba(255, 255, 255, 0.6)">
+            交易对：
+          </p>
+          <el-select
+            class="select-danger"
+            placeholder="选择交易对"
+            style="width:100%"
+            v-model="form.Symbol"
+          >
+            <el-option
+              v-for="item in accountList.filter(
+                item => item.id == form.AccessKey
+              )[0].apiKeys"
+              class="select-danger"
+              :value="item.key"
+              :label="`${item.symbol}(${item.key})`"
+              :key="item.key"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="text-center" style="marginTop:10px">
+          <base-button @click="confirm">确定</base-button>
+        </div>
       </card>
     </modal>
   </div>
@@ -26,10 +78,44 @@
 import { Modal } from "@/components";
 
 export default {
-  
   components: { Modal },
   data() {
-    return { visible: false };
+    return {
+      visible: false,
+      form: {},
+      accountList: [
+        {
+          id: 11,
+          account: "小一",
+          apiKeys: [
+            { key: "3213123", symbol: "DOTUSTD" },
+            { key: "32323223", symbol: "ADAUSTD" }
+          ]
+        },
+        {
+          id: 22,
+          account: "小二",
+          apiKeys: [
+            { key: "111111", symbol: "SHIBUSTD" }, 
+            { key: "222222", symbol: "DOGEUSTD" }
+          ]
+        }
+      ]
+    };
+  },
+  methods: {
+    clearSymbol() {
+      this.form = {
+        ...this.form,
+        Symbol: this.accountList.filter(
+          item => item.id == this.form.AccessKey
+        )[0].apiKeys[0]
+          ? this.accountList.filter(item => item.id == this.form.AccessKey)[0]
+              .apiKeys[0].key
+          : null
+      };
+    },
+    confirm() {}
   }
 };
 </script>
diff --git a/src/pages/RobotSec/Modal/RobotSetting.vue b/src/pages/RobotSec/Modal/RobotSetting.vue
index 39178ea..489283a 100644
--- a/src/pages/RobotSec/Modal/RobotSetting.vue
+++ b/src/pages/RobotSec/Modal/RobotSetting.vue
@@ -17,17 +17,18 @@
             <small>机器人配置</small>
           </div>
         </template>
-        <base-input label="固定交易量" v-model="form.FixedMount"></base-input>
+        <base-input label="最大借币比例" v-model="form.FixedMount"></base-input>
+        <base-input label="初始交易量" v-model="form.O"></base-input>
 
-        <p class="form-label">多空交叉：无状态</p>
+        <span class="form-label">交易周期</span>
         <el-select
           class="select-danger"
           style="width:100%"
-          placeholder="选择状态"
+          placeholder="选择周期"
           v-model="form.Status"
         >
           <el-option
-            v-for="item in status"
+            v-for="item in periodSignal"
             class="select-danger"
             :value="item.value"
             :label="item.title"
@@ -47,13 +48,14 @@
 
 <script>
 import { Modal } from "@/components";
-
+import { periodSignal } from "../../prePages/js/selectoptions";
 export default {
   components: { Modal },
   model: { prop: "visible", event: "visibleChanger" },
   props: { robotInfo: { type: Object, defualt: () => {} }, visible: false },
   data() {
     return {
+      periodSignal,
       form: {},
       status: [
         { value: 0, title: "多交叉" },
diff --git a/src/pages/RobotSec/index.vue b/src/pages/RobotSec/index.vue
index 4729d33..75b65fa 100644
--- a/src/pages/RobotSec/index.vue
+++ b/src/pages/RobotSec/index.vue
@@ -44,24 +44,32 @@
 
       <!-- 操作 -->
       <template slot="Action" slot-scope="item">
-        <base-dropdown title-classes="btn btn-secondary" title="操作">
-          <li class="nav-link">
-            <a
-              class="dropdown-item"
-              href="#"
-              @click="visibleModi('settingVisible', item.row.item)"
-              >编辑</a
-            >
-          </li>
-          <li class="nav-link">
-            <a
-              class="dropdown-item"
-              href="#"
-              @click="visibleModi('orderVisible', item.row.item)"
-              >委托下单</a
-            >
-          </li>
-        </base-dropdown>
+        <div class="row">
+          <div class="col-md-5">
+            <base-dropdown title-classes="btn btn-secondary" title="操作">
+              <li class="nav-link">
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  @click="visibleModi('settingVisible', item.row.item)"
+                  >编辑</a
+                >
+              </li>
+              <li class="nav-link">
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  @click="visibleModi('orderVisible', item.row.item)"
+                  >委托下单</a
+                >
+              </li>
+            </base-dropdown>
+          </div>
+
+          <div class="col-md-4">
+            <base-button @click="goCheck(item.row.item.Id)">查看</base-button>
+          </div>
+        </div>
       </template>
     </custom-base-table>
     <robot-setting :robotInfo="robot" v-model="settingVisible" />
@@ -112,7 +120,10 @@ export default {
   data() {
     return {
       columns: tableColumns,
-      data: [{ item: 1 }, { item: 2 }],
+      data: [
+        { item: 1, Id: 0 },
+        { item: 2, Id: 2 }
+      ],
       robot: {},
       settingVisible: false,
       orderVisible: false
@@ -122,7 +133,6 @@ export default {
     visibleModi(type, record) {
       this[type] = true;
       this.robot = record;
-      console.log(this);
     },
     //每个机器人的运行状态改变
     onStatusChange(record, isOn) {
@@ -165,6 +175,10 @@ export default {
             this.sMessage("danger", res.Message);
           }
         });
+    },
+
+    goCheck(id) {
+      this.$router.push(`/editt/${id}`);
     }
   }
 };
diff --git a/src/pages/prePages/js/columns.js b/src/pages/prePages/js/columns.js
index b963d13..3bb8338 100644
--- a/src/pages/prePages/js/columns.js
+++ b/src/pages/prePages/js/columns.js
@@ -264,8 +264,6 @@ export const secondTradeColumns = [
   {
     name: "ID",
     prop: "Id",
-
-    width: 150,
     key: "Id"
   },
   {
@@ -273,7 +271,6 @@ export const secondTradeColumns = [
     prop: "OrderType",
 
     key: "OrderType",
-    width: 80,
     customSlot: "OrderType"
   },
   {
@@ -416,3 +413,50 @@ export const logColumns = [
     key: "CreateTime"
   }
 ];
+
+export const secondLogColumns = [
+  {
+    name: "订单ID",
+    prop: "SpotGoodsOrderId",
+    key: "SpotGoodsOrderId"
+  },
+  {
+    name: "机器人ID",
+    prop: "RobotId",
+    key: "RobotId"
+  },
+
+  {
+    name: "日志类型",
+    prop: "LogType",
+    key: "LogType",
+    width: 150,
+    filters: [
+      { text: "买入", value: 0 },
+      { text: "卖出", value: 1 },
+      { text: "做多", value: 2 },
+      { text: "做空", value: 3 },
+      { text: "大趋势看多", value: 4 },
+      { text: "大趋势看空", value: 5 },
+      { text: "自动卖出", value: 10 },
+      { text: "自动卖出(趋势收益)", value: 11 }
+    ],
+    onFilter: (value, record) => record.LogType == value,
+    customSlot: "LogType"
+  },
+  {
+    name: "内容",
+    prop: "Content",
+    key: "Content"
+  },
+  {
+    name: "执行结果",
+    prop: "Result",
+    key: "Result"
+  },
+  {
+    name: "创建时间",
+    prop: "CreateTime",
+    key: "CreateTime"
+  }
+];
diff --git a/src/router/routes.js b/src/router/routes.js
index 3f0223a..d6cd3c4 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -20,6 +20,7 @@ const Prev = () => import("@/pages/Prev");
 const RobotSec = () => import("@/pages/RobotSec");
 const AccountSec = () => import("@/pages/RobotSec/Account");
 const MainSec = () => import("@/pages/MainSec");
+const MainAccount = () => import("@/pages/MainAccount");
 
 const routes = [
   {
@@ -86,6 +87,12 @@ const routes = [
         name: "accountSec",
         meta: { auth: true },
         component: AccountSec
+      },
+      {
+        path: "mainAccount",
+        name: "mainAccount",
+        meta: { auth: true },
+        component: MainAccount
       }
 
       // {