From 14032ee411ef70a8219f23f49c2ed2fd7d6b3bcf Mon Sep 17 00:00:00 2001 From: lizhixin <382352532@qq.com> Date: Fri, 18 Jun 2021 00:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E7=A7=8D=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/App.vue | 74 +++++++++++++ src/pages/ReCheck/OrderTable.vue | 160 +++++++++++++++++------------ src/pages/ReCheck/index.vue | 15 ++- src/pages/Robot/index.vue | 4 +- src/pages/RobotSec/Account.vue | 171 ++++++++++++++----------------- src/pages/prePages/js/columns.js | 22 ++++ src/utils/plugin/axios-plugin.js | 4 +- 8 files changed, 284 insertions(+), 168 deletions(-) diff --git a/public/index.html b/public/index.html index ba080ac..cee98ef 100644 --- a/public/index.html +++ b/public/index.html @@ -27,7 +27,7 @@ - + diff --git a/src/App.vue b/src/App.vue index cd1fe2f..cd69c90 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,4 +41,78 @@ export default { .el-input { background-color: transparent; } + +.el-table th { + color: #a2a2a3; /* 字体颜色 */ + font-size: 16px; + background-color: transparent !important; /* 背景透明 */ + border: 0 !important; + height: 22px; + line-height: 22px; +} +.el-table tr, +.el-table td { + color: #a2a2a3; + font-size: 12px; + background-color: transparent !important; /* 背景透明 */ + border: 0 !important; + height: 22px; + line-height: 22px; +} + +.el-table, +.el-table__expanded-cell { + background-color: transparent !important; +} +.el-table th, +.el-table tr, +.el-table td { + background-color: transparent !important; +} + +/*去掉表格单元格边框*/ +.customer-no-border-table th { + border: none; +} +.customer-no-border-table td, +.customer-no-border-table th.is-leaf { + border: none; +} +/*表格最外边框*/ +.customer-no-border-table .el-table--border, +.el-table--group { + border: none; +} +/*头部边框*/ +.customer-no-border-table thead tr th.is-leaf { + border: 0px solid #ebeef5; + border-right: none; +} +.customer-no-border-table thead tr th:nth-last-of-type(2) { + border-right: 0px solid #ebeef5; +} +/*表格最外层边框-底部边框*/ +.customer-no-border-table .el-table--border::after, +.customer-no-border-table .el-table--group::after { + width: 0; +} +.customer-no-border-table::before { + width: 0; +} +.customer-no-border-table .el-table__fixed-right::before, +.el-table__fixed::before { + width: 0; +} +.customer-no-border-table .el-table__header tr th { + background: #fff; + padding: 3px; + font-weight: 550; + height: 36px; + border: 0px; + font-size: 15px; +} + +.el-table__expanded-cell[class*="cell"] { + padding: 0 20px; +} diff --git a/src/pages/ReCheck/OrderTable.vue b/src/pages/ReCheck/OrderTable.vue index 3312f82..8d1fbb4 100644 --- a/src/pages/ReCheck/OrderTable.vue +++ b/src/pages/ReCheck/OrderTable.vue @@ -16,76 +16,94 @@ > -
- + - - - - - - - - - - - - - - @@ -122,3 +140,9 @@ export default { } }; + diff --git a/src/pages/ReCheck/index.vue b/src/pages/ReCheck/index.vue index efd0040..5298949 100644 --- a/src/pages/ReCheck/index.vue +++ b/src/pages/ReCheck/index.vue @@ -133,8 +133,13 @@ v-model="trendForm" >
- + +
+ + 启用增购 + +
@@ -256,6 +261,7 @@ export default { lineSelect: "", tradeColumns, logColumns, + vTForm: { TradeCoinCount: 10, IsEnableAdditionalQuantity: false }, logData: [], PositionFund: 1, RobotPolicyType, @@ -765,7 +771,12 @@ export default { // 文件测试大小-end let params = this.policyMode == 3 - ? { TradeCoinCount: this.TradeCoinCount, SymbolList: newExcelData } + ? { + TradeCoinCount: this.vTForm.TradeCoinCount, + IsEnableAdditionalQuantity: this.vTForm + .IsEnableAdditionalQuantity, + SymbolList: newExcelData + } : { Capital: this.trendForm, IsEnabledLimit: this.trendForm.IsEnabledLimit, diff --git a/src/pages/Robot/index.vue b/src/pages/Robot/index.vue index 9a9fa13..39a1091 100644 --- a/src/pages/Robot/index.vue +++ b/src/pages/Robot/index.vue @@ -31,13 +31,13 @@ class="select-danger mb-4" style="width:100%" placeholder="选择关联账户" - v-model="form.StockAccountId" + v-model="form.AccessKey" > diff --git a/src/pages/RobotSec/Account.vue b/src/pages/RobotSec/Account.vue index a7d6bc2..3bf6286 100644 --- a/src/pages/RobotSec/Account.vue +++ b/src/pages/RobotSec/Account.vue @@ -12,7 +12,7 @@ +