diff --git a/x.rar b/a.rar similarity index 93% rename from x.rar rename to a.rar index ba8b7d1..ed467fa 100644 Binary files a/x.rar and b/a.rar differ diff --git a/src/views/admin/line-order-template-logs/index.vue b/src/views/admin/line-order-template-logs/index.vue index ca1dc86..39a5645 100644 --- a/src/views/admin/line-order-template-logs/index.vue +++ b/src/views/admin/line-order-template-logs/index.vue @@ -448,7 +448,9 @@ - + + + @@ -595,6 +597,11 @@ export default { percenter: undefined, symbolGroups: [], inRules: { + reduce_price: [{ required: true, message: '主单亏损减仓百分比不能为空', trigger: 'blur' }], + reduce_num: [{ required: true, message: '主单减仓数量百分比不能为空', trigger: 'blur' }], + reduce_take_profit: [{ required: true, message: '主单减仓后止盈价百分比不能为空', trigger: 'blur' }], + // reduce_stop_price: [{ required: true, message: '主单减仓后止损价不能为空', trigger: 'blur' }], + buy_price: [{ required: true, message: '购买金额不能为空', trigger: 'blur' }], exchange_type: [{ required: true, message: '交易所不能为空', trigger: 'blur' }], api_id: [{ required: true, message: 'api用户不能为空', trigger: 'blur' }], symbol: [{ required: true, message: '交易对不能为空', trigger: 'blur' }], @@ -609,7 +616,8 @@ export default { exchangeTypes: [], aicoins: {}, aicoinPrice: undefined, - ext: [] + ext: [], + re_take_profit_ratio: 0 } }, computed: { @@ -925,6 +933,7 @@ export default { onCalculate() { calculate({ ...this.inForm, api_id: this.inForm.api_id.toString() }).then(res => { this.ext = res?.data?.ext || [] + this.re_take_profit_ratio = res?.data?.re_take_profit_ratio || 0 }) } } diff --git a/src/views/admin/line-pre-order/index.vue b/src/views/admin/line-pre-order/index.vue index 05ba06d..2f9bb58 100644 --- a/src/views/admin/line-pre-order/index.vue +++ b/src/views/admin/line-pre-order/index.vue @@ -777,7 +777,9 @@ - + + + @@ -1370,6 +1372,10 @@ export default { }, // 表单校验 rules: { + reduce_price: [{ required: true, message: '主单亏损减仓百分比不能为空', trigger: 'blur' }], + reduce_num: [{ required: true, message: '主单减仓数量百分比不能为空', trigger: 'blur' }], + reduce_take_profit: [{ required: true, message: '主单减仓后止盈价百分比不能为空', trigger: 'blur' }], + // reduce_stop_price: [{ required: true, message: '主单减仓后止损价不能为空', trigger: 'blur' }], exchange_type: [{ required: true, message: '交易所不能为空', trigger: 'blur' }], api_id: [{ required: true, message: 'api用户不能为空', trigger: 'blur' }], symbol: [{ required: true, message: '交易对不能为空', trigger: 'blur' }], @@ -1432,7 +1438,8 @@ export default { aicoins: {}, aicoinPrice: '', // 回本止盈点 - ext: [] + ext: [], + re_take_profit_ratio: 0 } }, computed: { @@ -2112,6 +2119,7 @@ export default { onCalculate() { calculate({ ...this.form, api_id: this.form.api_id.toString() }).then(res => { this.ext = res?.data?.ext || [] + this.re_take_profit_ratio = res?.data?.re_take_profit_ratio || 0 }) } }