1、模板修改
This commit is contained in:
		| @ -2,5 +2,5 @@ | ||||
| ENV = 'development' | ||||
|  | ||||
| # base api | ||||
| VUE_APP_BASE_API = 'http://192.168.1.11:6789' | ||||
| VUE_APP_BASE_API = 'http://192.168.2.102:6789' | ||||
|  | ||||
|  | ||||
| @ -534,7 +534,7 @@ | ||||
|                       <el-col :span="3"> | ||||
|                         <!-- 止盈数量百分比 --> | ||||
|                         <el-form-item | ||||
|                           label="止盈数量百分比" | ||||
|                           label="止盈数量(%)" | ||||
|                           :prop="'ext.' + index + '.takeProfitNumRatio'" | ||||
|                           :rules="inRules.takeProfitNumRatio" | ||||
|                           class="ext-form-item" | ||||
| @ -547,7 +547,7 @@ | ||||
|                           /> | ||||
|                         </el-form-item> | ||||
|                       </el-col> | ||||
|                       <el-col :span="6"> | ||||
|                       <el-col :span="4"> | ||||
|                         <!-- <span>第二止盈/止损百分比</span> --> | ||||
|                         <el-form-item | ||||
|                           label="第二止盈/止损百分比" | ||||
| @ -577,6 +577,16 @@ | ||||
|                         </el-form-item> | ||||
|                       </el-col> | ||||
|                     </template> | ||||
|                     <el-col :span="2"> | ||||
|                       <el-form-item | ||||
|                         label="过期(H)" | ||||
|                         :prop="'ext.' + index + '.expirateHour'" | ||||
|                         :rules="inRules.expirateHour" | ||||
|                         class="ext-form-item" | ||||
|                       > | ||||
|                         <el-input v-model.number="item.expirateHour" size="mini" type="number" placeholder="过期时间(小时)" /> | ||||
|                       </el-form-item> | ||||
|                     </el-col> | ||||
|                     <el-col :span="3"> | ||||
|                       <div style="margin-bottom: 14px;" /><el-button | ||||
|                         size="mini" | ||||
| @ -743,7 +753,8 @@ export default { | ||||
|           { validator: this.validateExtTakeProfitNumRatio, trigger: 'blur' } | ||||
|         ], | ||||
|         tpTpPriceRatio: [{ required: true, message: '第二止盈价格百分比不能为空', trigger: 'blur' }], | ||||
|         slSlPriceRatio: [{ required: true, message: '第二止损价格百分比不能为空', trigger: 'blur' }] | ||||
|         slSlPriceRatio: [{ required: true, message: '第二止损价格百分比不能为空', trigger: 'blur' }], | ||||
|         expirateHour: [{ required: true, message: '请输入过期时间(H)', trigger: 'blur' }] | ||||
|       }, | ||||
|       inForm: {}, | ||||
|       searchLoding: false, | ||||
| @ -992,7 +1003,8 @@ export default { | ||||
|         // 止盈数量百分比 止盈后止盈价格百分比 止盈后止损价格百分比 | ||||
|         takeProfitNumRatio: 100, | ||||
|         tpTpPriceRatio: 0, | ||||
|         tpSlPriceRatio: 0 | ||||
|         tpSlPriceRatio: 0, | ||||
|         expirateHour: 0 | ||||
|  | ||||
|         // reducePriceRatio: undefined, | ||||
|         // reduceNumRatio: undefined, | ||||
| @ -1217,7 +1229,8 @@ export default { | ||||
|                   stopLossRatio: item.stopLossRatio || 0, | ||||
|                   takeProfitNumRatio: item.takeProfitNumRatio || 0, | ||||
|                   tpTpPriceRatio: item.tpTpPriceRatio || 0, | ||||
|                   tpSlPriceRatio: item.tpSlPriceRatio || 0 | ||||
|                   tpSlPriceRatio: item.tpSlPriceRatio || 0, | ||||
|                   expirateHour: item.expirateHour || 0 | ||||
|                 })) | ||||
|                 : [] | ||||
|             }) | ||||
|  | ||||
| @ -731,7 +731,7 @@ | ||||
|                     </el-col> | ||||
|  | ||||
|                   </el-row> | ||||
|                   <el-row :gutter="20"> | ||||
|                   <el-row :gutter="10"> | ||||
|                     <el-col :span="3"> | ||||
|                       <el-form-item | ||||
|                         :prop="'ext.' + index + '.priceRatio'" | ||||
| @ -799,7 +799,7 @@ | ||||
|                     <template v-if="item.addType === 1"> | ||||
|                       <el-col :span="3"> | ||||
|                         <el-form-item | ||||
|                           label="止盈数量百分比" | ||||
|                           label="止盈数量(%)" | ||||
|                           :prop="'ext.' + index + '.takeProfitNumRatio'" | ||||
|                           :rules="rules.takeProfitNumRatio" | ||||
|                           class="ext-form-item" | ||||
| @ -812,7 +812,7 @@ | ||||
|                           /> | ||||
|                         </el-form-item> | ||||
|                       </el-col> | ||||
|                       <el-col :span="6"> | ||||
|                       <el-col :span="4"> | ||||
|                         <el-form-item | ||||
|                           label="第二止盈/止损百分比" | ||||
|                           :prop="'ext.' + index + '.tpTpPriceRatio'" | ||||
| @ -841,6 +841,21 @@ | ||||
|                         </el-form-item> | ||||
|                       </el-col> | ||||
|                     </template> | ||||
|                     <el-col :span="2"> | ||||
|                       <el-form-item | ||||
|                         label="过期(H)" | ||||
|                         :prop="'ext.' + index + '.expirateHour'" | ||||
|                         :rules="rules.expirateHour" | ||||
|                         class="ext-form-item" | ||||
|                       > | ||||
|                         <el-input | ||||
|                           v-model.number="item.expirateHour" | ||||
|                           size="mini" | ||||
|                           type="number" | ||||
|                           placeholder="过期时间(小时)" | ||||
|                         /> | ||||
|                       </el-form-item> | ||||
|                     </el-col> | ||||
|                     <el-col :span="3"> | ||||
|                       <div style="margin-bottom: 14px;" /><el-button | ||||
|                         size="mini" | ||||
| @ -1416,7 +1431,8 @@ export default { | ||||
|           { validator: this.validateExtTakeProfitNumRatio, trigger: 'blur' } | ||||
|         ], | ||||
|         tpTpPriceRatio: [{ required: true, message: '第二止盈价格百分比不能为空', trigger: 'blur' }], | ||||
|         slSlPriceRatio: [{ required: true, message: '第二止损价格百分比不能为空', trigger: 'blur' }] | ||||
|         slSlPriceRatio: [{ required: true, message: '第二止损价格百分比不能为空', trigger: 'blur' }], | ||||
|         expirateHour: [{ required: true, message: '请输入过期时间(H)', trigger: 'blur' }] | ||||
|       }, | ||||
|       currentExpandId: undefined, | ||||
|       cacheRefresh: {}, | ||||
| @ -1598,18 +1614,8 @@ export default { | ||||
|         // 止盈数量百分比 止盈后止盈价格百分比 止盈后止损价格百分比 | ||||
|         takeProfitNumRatio: 100, | ||||
|         tpTpPriceRatio: 0, | ||||
|         tpSlPriceRatio: 0 | ||||
|  | ||||
|         // reducePriceRatio: undefined, | ||||
|         // reduceNumRatio: undefined, | ||||
|         // reduceTakeProfitRatio: undefined, | ||||
|         // reduceStopLossRatio: undefined, | ||||
|  | ||||
|         // takeProfitRatio: undefined, | ||||
|         // addPositionPriceRatio: undefined, | ||||
|         // addPositionOrderType: 'LIMIT', | ||||
|         // addPositionType: 1, | ||||
|         // addPositionVal: undefined | ||||
|         tpSlPriceRatio: 0, | ||||
|         expirateHour: 0 | ||||
|       }) | ||||
|     }, | ||||
|     exchangeTypeFormat(row) { | ||||
|  | ||||
		Reference in New Issue
	
	Block a user