From 01767582ca739d13767c825fb0d1d7bdf03c9f0d Mon Sep 17 00:00:00 2001
From: hucan <951870319@qq.com>
Date: Thu, 6 Mar 2025 14:27:03 +0800
Subject: [PATCH] 1

---
 .../admin/line-order-template-logs/index.vue  | 371 ++++++------------
 src/views/admin/line-pre-order/index.vue      |  34 +-
 2 files changed, 148 insertions(+), 257 deletions(-)

diff --git a/src/views/admin/line-order-template-logs/index.vue b/src/views/admin/line-order-template-logs/index.vue
index 7f2283e..5f36ec7 100644
--- a/src/views/admin/line-order-template-logs/index.vue
+++ b/src/views/admin/line-order-template-logs/index.vue
@@ -1,16 +1,10 @@
-
 <template>
   <BasicLayout>
     <template #wrapper>
       <el-card class="box-card">
         <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-          <el-form-item label="模板名称" prop="name"><el-input
-            v-model="queryParams.name"
-            placeholder="请输入模板名称"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-form-item label="模板名称" prop="name"><el-input v-model="queryParams.name" placeholder="请输入模板名称" clearable
+              size="small" @keyup.enter.native="handleQuery" />
           </el-form-item>
           <!-- <el-form-item label="用户" prop="userId"><el-select
             v-model="queryParams.userId"
@@ -27,18 +21,8 @@
           </el-select>
           </el-form-item> -->
           <el-form-item label="模板类型" prop="type">
-            <el-select
-              v-model="queryParams.type"
-              placeholder="请选择模板类型"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="dict in types"
-                :key="dict.v"
-                :label="dict.l"
-                :value="dict.v"
-              />
+            <el-select v-model="queryParams.type" placeholder="请选择模板类型" clearable size="small">
+              <el-option v-for="dict in types" :key="dict.v" :label="dict.l" :value="dict.v" />
             </el-select>
           </el-form-item>
 
@@ -60,153 +44,74 @@
                         </el-button>
                     </el-col> -->
           <el-col :span="1.5">
-            <el-button
-              v-permisaction="['admin:lineOrderTemplateLogs:edit']"
-              type="success"
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-            >修改
+            <el-button v-permisaction="['admin:lineOrderTemplateLogs:edit']" type="success" icon="el-icon-edit"
+              size="mini" :disabled="single" @click="handleUpdate">修改
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              v-permisaction="['admin:lineOrderTemplateLogs:remove']"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-            >删除
+            <el-button v-permisaction="['admin:lineOrderTemplateLogs:remove']" type="danger" icon="el-icon-delete"
+              size="mini" :disabled="multiple" @click="handleDelete">删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              :disabled="multiple"
-              @click="handleOrders"
-            >一键下单
+            <el-button type="primary" icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleOrders">一键下单
             </el-button>
           </el-col>
         </el-row>
 
-        <el-table ref="table" v-loading="loading" :data="lineOrderTemplateLogsList" @selection-change="handleSelectionChange">
+        <el-table ref="table" v-loading="loading" :data="lineOrderTemplateLogsList"
+          @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column
-            label="id"
-            align="center"
-            prop="id"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="模板名称"
-            align="center"
-            prop="name"
-            :show-overflow-tooltip="true"
-          />
+          <el-table-column label="id" align="center" prop="id" :show-overflow-tooltip="true" />
+          <el-table-column label="模板名称" align="center" prop="name" :show-overflow-tooltip="true" />
           <!-- <el-table-column label="用户id" align="center" prop="userId" :formatter="userIdFormat" width="100">
             <template slot-scope="scope">
               {{ userIdFormat(scope.row) }}
             </template>
-          </el-table-column> -->
-          <el-table-column
-            label="模板类型"
-            align="center"
-            prop="type"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{row}">{{ ['单独添加','批量添加'][row.type-1] }}</template>
-          </el-table-column><el-table-column
-            label="开关"
-            align="center"
-            prop="switch"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{row}">
+</el-table-column> -->
+          <el-table-column label="模板类型" align="center" prop="type" :show-overflow-tooltip="true">
+            <template #default="{ row }">{{ ['单独添加', '批量添加'][row.type - 1] }}</template>
+          </el-table-column><el-table-column label="开关" align="center" prop="switch" :show-overflow-tooltip="true">
+            <template #default="{ row }">
               <div @click="onSwitch(row)">
-                <el-switch
-                  :value="row.switch"
-                  active-value="1"
-                  inactive-value="0"
-                  active-color="#13ce66"
-                  inactive-color="#ff4949"
-                />
+                <el-switch :value="row.switch" active-value="1" inactive-value="0" active-color="#13ce66"
+                  inactive-color="#ff4949" />
               </div>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-popconfirm
-                class="delete-popconfirm"
-                title="确认要修改吗?"
-                confirm-button-text="修改"
-                @confirm="handleUpdate(scope.row)"
-              >
-                <el-button
-                  slot="reference"
-                  v-permisaction="['admin:lineOrderTemplateLogs:edit']"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                >修改
+              <el-popconfirm class="delete-popconfirm" title="确认要修改吗?" confirm-button-text="修改"
+                @confirm="handleUpdate(scope.row)">
+                <el-button slot="reference" v-permisaction="['admin:lineOrderTemplateLogs:edit']" size="mini"
+                  type="text" icon="el-icon-edit">修改
                 </el-button>
               </el-popconfirm>
-              <el-popconfirm
-                class="delete-popconfirm"
-                title="确认要删除吗?"
-                confirm-button-text="删除"
-                @confirm="handleDelete(scope.row)"
-              >
-                <el-button
-                  slot="reference"
-                  v-permisaction="['admin:lineOrderTemplateLogs:remove']"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                >删除
+              <el-popconfirm class="delete-popconfirm" title="确认要删除吗?" confirm-button-text="删除"
+                @confirm="handleDelete(scope.row)">
+                <el-button slot="reference" v-permisaction="['admin:lineOrderTemplateLogs:remove']" size="mini"
+                  type="text" icon="el-icon-delete">删除
                 </el-button>
               </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageIndex"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageIndex"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1200px" :close-on-click-modal="false">
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="模板名称" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder="模板名称"
-              />
+              <el-input v-model="form.name" placeholder="模板名称" />
             </el-form-item>
-            <el-form ref="inForm" :model="inForm" :rules="inRules" label-width="180px" style="height: 500px;overflow: hidden auto;">
+            <el-form ref="inForm" :model="inForm" :rules="inRules" label-width="180px"
+              style="height: 500px;overflow: hidden auto;">
               <el-form-item label="交易所" prop="exchange_type">
-                <el-select
-                  v-model="inForm.exchange_type"
-                  style="width: 100%;"
-                  placeholder="请选择交易所"
-                  clearable
-                  filterable
-                  size="small"
-                  @change="onchangeForm"
-                >
-                  <el-option
-                    v-for="dict in exchangeTypes"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
+                <el-select v-model="inForm.exchange_type" style="width: 100%;" placeholder="请选择交易所" clearable filterable
+                  size="small" @change="onchangeForm">
+                  <el-option v-for="dict in exchangeTypes" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
               <el-form-item label="订单类型" prop="symbol_type">
@@ -225,21 +130,10 @@
               <el-form-item label="api用户" prop="api_id">
                 <el-row>
                   <el-col :span="21">
-                    <el-select
-                      v-model="inForm.api_id"
-                      multiple
-                      style="width: 100%;"
-                      placeholder="请选择api用户"
-                      clearable
-                      filterable
-                      size="small"
-                    >
-                      <el-option
-                        v-for="dict in lineUsers"
-                        :key="dict.id"
-                        :label="dict.apiName"
-                        :value="String(dict.id)"
-                      />
+                    <el-select v-model="inForm.api_id" multiple style="width: 100%;" placeholder="请选择api用户" clearable
+                      filterable size="small">
+                      <el-option v-for="dict in lineUsers" :key="dict.id" :label="dict.apiName"
+                        :value="String(dict.id)" />
                     </el-select>
                   </el-col>
                   <el-col :span="3">
@@ -247,91 +141,52 @@
                   </el-col>
                 </el-row>
               </el-form-item>
-              <el-form-item v-if="form.type===2" label="交易对组" prop="symbol_group_id">
-                <el-select
-                  v-if="form.type===2"
-                  v-model="inForm.symbol_group_id"
-                  style="width: 100%;"
-                  placeholder="请选择交易对组"
-                  clearable
-                  filterable
-                  size="small"
-                >
-                  <el-option
-                    v-for="dict in comSymbols"
-                    :key="dict.id"
-                    :label="dict.groupName"
-                    :value="dict.id"
-                  />
+              <el-form-item v-if="form.type === 2" label="交易对组" prop="symbol_group_id">
+                <el-select v-if="form.type === 2" v-model="inForm.symbol_group_id" style="width: 100%;"
+                  placeholder="请选择交易对组" clearable filterable size="small">
+                  <el-option v-for="dict in comSymbols" :key="dict.id" :label="dict.groupName" :value="dict.id" />
                 </el-select>
               </el-form-item>
               <el-form-item v-else label="交易对" prop="symbol">
-                <el-select
-                  v-model="inForm.symbol"
-                  style="width: 100%;"
-                  placeholder="请选择交易对"
-                  clearable
-                  filterable
-                  remote
-                  :remote-method="getSymbol"
-                  :loading="searchLoding"
-                  size="small"
-                  @change="onchangeSymbol"
-                >
-                  <el-option
-                    v-for="dict in comSymbols"
-                    :key="dict.id || dict.symbol"
-                    :label="dict.symbol"
-                    :value="dict.symbol"
-                  />
+                <el-select v-model="inForm.symbol" style="width: 100%;" placeholder="请选择交易对" clearable filterable remote
+                  :remote-method="getSymbol" :loading="searchLoding" size="small" @change="onchangeSymbol">
+                  <el-option v-for="dict in comSymbols" :key="dict.id || dict.symbol" :label="dict.symbol"
+                    :value="dict.symbol" />
                   <div class="page">
-                    <pagination
-                      v-show="symbol.total>0"
-                      :background="false"
-                      :total="symbol.total"
-                      layout="prev, pager, next"
-                      :page.sync="symbol.pageIndex"
-                      :limit.sync="symbol.pageSize"
-                      @pagination="getSymbol"
-                    />
+                    <pagination v-show="symbol.total > 0" :background="false" :total="symbol.total"
+                      layout="prev, pager, next" :page.sync="symbol.pageIndex" :limit.sync="symbol.pageSize"
+                      @pagination="getSymbol" />
                   </div>
                 </el-select>
               </el-form-item>
               <el-form-item label="购买方向" prop="site">
                 <el-radio-group v-model="inForm.site">
                   <el-radio label="BUY">买（多）</el-radio>
-                  <el-radio label="SELL" :disabled="inForm.order_type==1">卖（空）</el-radio>
+                  <el-radio label="SELL" :disabled="inForm.order_type == 1">卖（空）</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="购买金额（U）" prop="buy_price">
-                <el-input
-                  v-model="inForm.buy_price"
-                  placeholder="购买金额（U）"
-                />
+                <el-input v-model="inForm.buy_price" placeholder="购买金额（U）" />
               </el-form-item>
               <el-form-item label="价格模式" prop="price_pattern">
                 <el-radio-group v-model="inForm.price_pattern" @change="onchangePattern">
                   <el-radio label="percentage">百分比</el-radio>
-                  <el-radio label="mixture" :disabled="form.type===2">主单实价委托百分比</el-radio>
-                  <el-radio label="aicoin" :disabled="form.type===2">aiCoin买入点</el-radio>
+                  <el-radio label="mixture" :disabled="form.type === 2">主单实价委托百分比</el-radio>
+                  <el-radio label="aicoin" :disabled="form.type === 2">aiCoin买入点</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item v-if="inForm.price_pattern === 'percentage'" label="下单百分比" prop="price">
-                <el-input
-                  v-model="inForm.price"
-                  placeholder="下单百分比"
-                />
+                <el-input v-model="inForm.price" placeholder="下单百分比" />
               </el-form-item>
               <el-row v-else type="flex">
                 <el-col :span="14">
                   <el-form-item label="下单价(实际价格)" prop="price">
-                    <el-input
-                      v-model="inForm.price"
-                      placeholder="下单价(实际价格)"
-                    >
+                    <el-input v-model="inForm.price" placeholder="下单价(实际价格)">
                       <template #prepend>
-                        <el-select v-if="inForm.price_pattern === 'aicoin'" v-model="aicoinPrice" placeholder="请选择" style="width: 150px;" @change="onchangeAicoin">
-                          <el-option v-for="o in JSON.stringify(aicoins) !== '{}' ? options : []" :key="o.label" :label="o.label" :value="aicoins[o.value] || ''">
+                        <el-select v-if="inForm.price_pattern === 'aicoin'" v-model="aicoinPrice" placeholder="请选择"
+                          style="width: 150px;" @change="onchangeAicoin">
+                          <el-option v-for="o in JSON.stringify(aicoins) !== '{}' ? options : []" :key="o.label"
+                            :label="o.label" :value="aicoins[o.value] || ''">
                             <span style="float: left">{{ o.label }}</span>
                             <span style="float: right">{{ aicoins[o.value] || 0 }}</span>
                           </el-option>
@@ -353,10 +208,7 @@
                 </el-col>
               </el-row>
               <el-form-item label="止盈百分比" prop="profit">
-                <el-input
-                  v-model="inForm.profit"
-                  placeholder="止盈百分比"
-                />
+                <el-input v-model="inForm.profit" placeholder="止盈百分比" />
               </el-form-item>
               <!--<el-form-item label="亏损百分比" prop="stop_price">
                 <el-input
@@ -416,29 +268,19 @@
               <el-form-item label="对标价类型" prop="price_type">
                 <el-radio-group v-model="inForm.price_type">
                   <el-radio label="new">最新价</el-radio>
-                  <el-radio label="mixture" :disabled="form.type===2">标记价</el-radio>
-                  <el-radio label="aicoin" :disabled="form.type===2">aicoin</el-radio>
+                  <el-radio label="mixture" :disabled="form.type === 2">标记价</el-radio>
+                  <el-radio label="aicoin" :disabled="form.type === 2">aicoin</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="订单过期时间" prop="profit_rate">
-                <el-input
-                  v-model.number="inForm.expire_hour"
-                  class="hour"
-                  type="number"
-                  placeholder="订单过期时间"
-                >
+                <el-input v-model.number="inForm.expire_hour" class="hour" type="number" placeholder="订单过期时间">
                   <template slot="append">小时</template>
                 </el-input>
               </el-form-item>
-              <el-form-item v-if="form.type===2" label="批量下单次数" prop="order_num">
-                <el-input
-                  v-model.number="inForm.order_num"
-                  min="1"
-                  type="number"
-                  placeholder="批量下单次数"
-                />
+              <el-form-item v-if="form.type === 2" label="批量下单次数" prop="order_num">
+                <el-input v-model.number="inForm.order_num" min="1" type="number" placeholder="批量下单次数" />
               </el-form-item>
-              <el-form-item v-if="form.type===2" label="执行类型" prop="script">
+              <el-form-item v-if="form.type === 2" label="执行类型" prop="script">
                 <el-radio-group v-model="inForm.script">
                   <el-radio label="1"><span>脚本执行</span></el-radio>
                   <el-radio label="0">直接执行</el-radio>
@@ -452,7 +294,7 @@
               </el-form-item>
               <el-form-item label="主单减仓后止盈价百分比" prop="reduce_take_profit">
                 <el-input v-model.number="inForm.reduce_take_profit" type="number" placeholder="主单减仓后止盈价百分比">
-                  <template v-if="form.type===1" #append>{{ re_take_profit_ratio }}</template>
+                  <template v-if="form.type === 1" #append>{{ re_take_profit_ratio }}</template>
                 </el-input>
               </el-form-item>
               <el-form-item label="主单减仓后止损价百分比" prop="reduce_stop_price">
@@ -461,9 +303,10 @@
               <el-row>
                 <el-col :span="4"><el-form-item label="主单加仓配置" /></el-col>
                 <el-col :span="2"><el-button type="primary" size="mini" @click="onAddExt(0)">新增</el-button></el-col>
-                <el-col v-if="form.type===1" :span="2"><el-button type="primary" size="mini" :disabled="inForm.ext && inForm.ext.length===0" @click="onCalculate">计算</el-button></el-col>
+                <el-col v-if="form.type === 1" :span="2"><el-button type="primary" size="mini"
+                    :disabled="inForm.ext && inForm.ext.length === 0" @click="onCalculate">计算</el-button></el-col>
               </el-row>
-              <div v-for="(item,index) in inForm.ext" :key="index" class="exts">
+              <div v-for="(item, index) in inForm.ext" :key="index" class="exts">
                 <el-row :gutter="20">
                   <el-col :span="5">
                     <div style="margin-bottom: 8px;">加仓类型</div>
@@ -479,20 +322,32 @@
                       <el-radio :label="2">实际金额</el-radio>
                     </el-radio-group>
                   </el-col>
-                  <el-col :span="5">加仓下跌百分比<el-input v-model.number="item.addPositionPriceRatio" size="mini" type="number" placeholder="加仓价格百分比" /></el-col>
-                  <el-col :span="5">加仓数值<el-input v-model.number="item.addPositionVal" size="mini" type="number" placeholder="加仓数值" /></el-col>
-                  <el-col :span="4">加仓后止盈价百分比<el-input v-model.number="item.takeProfitRatio" size="mini" type="number" placeholder="止盈百分比">
-                    <template v-if="form.type===1" #append>{{ ext[index] ? ext[index].reTakeProfitRatio : 0 }}</template>
-                  </el-input></el-col>
+                  <el-col :span="5">加仓下跌百分比<el-input v-model.number="item.addPositionPriceRatio" size="mini"
+                      type="number" placeholder="加仓价格百分比" /></el-col>
+                  <el-col :span="5">加仓数值<el-input v-model.number="item.addPositionVal" size="mini" type="number"
+                      placeholder="加仓数值" /></el-col>
+                  <el-col :span="4">加仓后止盈价百分比<el-input v-model.number="item.takeProfitRatio" size="mini" type="number"
+                      placeholder="止盈百分比">
+                      <template v-if="form.type === 1" #append>{{ ext[index] ? ext[index].reTakeProfitRatio : 0
+                        }}</template>
+                    </el-input></el-col>
                 </el-row>
                 <el-row :gutter="20" style="margin-top: 10px;">
-                  <el-col :span="5">减仓下跌百分比<el-input v-model.number="item.reducePriceRatio" size="mini" type="number" placeholder="减仓价格百分比" /></el-col>
-                  <el-col :span="5">减仓数量百分比<el-input v-model.number="item.reduceNumRatio" size="mini" type="number" placeholder="减仓数量百分比" /></el-col>
-                  <el-col :span="5">减仓后止盈价百分比<el-input v-model.number="item.reduceTakeProfitRatio" size="mini" type="number" placeholder="减仓后止盈百分比">
-                    <template v-if="form.type===1" #append>{{ ext[index] ? ext[index].reduceReTakeProfitRatio : 0 }}</template>
-                  </el-input></el-col>
-                  <el-col :span="5">减仓后止损价百分比<el-input v-model.number="item.reduceStopLossRatio" size="mini" type="number" placeholder="减仓后止损百分比" /></el-col>
-                  <el-col :span="4"><div style="margin-bottom: 14px;" /><el-button size="mini" type="danger" @click="onAddExt(1,index)">删除</el-button></el-col>
+                  <el-col :span="5">减仓下跌百分比<el-input v-model.number="item.reducePriceRatio" size="mini" type="number"
+                      placeholder="减仓价格百分比" /></el-col>
+                  <el-col :span="5">减仓数量百分比<el-input v-model.number="item.reduceNumRatio" size="mini" type="number"
+                      placeholder="减仓数量百分比" /></el-col>
+                  <el-col :span="5">减仓后止盈价百分比<el-input v-model.number="item.reduceTakeProfitRatio" size="mini"
+                      type="number" placeholder="减仓后止盈百分比">
+                      <template v-if="form.type === 1" #append>{{ ext[index] ? ext[index].reduceReTakeProfitRatio : 0
+                        }}</template>
+                    </el-input></el-col>
+                  <el-col :span="5">减仓后止损价百分比<el-input v-model.number="item.reduceStopLossRatio" size="mini"
+                      type="number" placeholder="减仓后止损百分比" /></el-col>
+                  <el-col :span="4">
+                    <div style="margin-bottom: 14px;" /><el-button size="mini" type="danger"
+                      @click="onAddExt(1, index)">删除</el-button>
+                  </el-col>
                 </el-row>
               </div>
               <!-- <el-form-item label="是否保存模板" prop="save_template">
@@ -808,10 +663,10 @@ export default {
       }
       this.resetForm('form')
     },
-    getImgList: function() {
+    getImgList: function () {
       this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
     },
-    fileClose: function() {
+    fileClose: function () {
       this.fileOpen = false
     },
     userIdFormat(row) {
@@ -853,7 +708,7 @@ export default {
       this.reset()
       this.ext = []
       const id =
-                row.id || this.ids
+        row.id || this.ids
       getLineOrderTemplateLogs(id).then(response => {
         this.form = response.data
         const x = JSON.parse(response.data.params)
@@ -871,7 +726,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs['form'].validate(valid => {
         if (valid) {
           this.inForm.price = this.inForm.price ? String(this.inForm.price) : ''
@@ -885,6 +740,9 @@ export default {
                 reduce_take_profit: this.inForm.reduce_take_profit || 0,
                 reduce_stop_price: this.inForm.reduce_stop_price || 0,
                 symbol_group_id: String(this.inForm.symbol_group_id),
+                profit_num_ratio: this.form.profit_num_ratio || 100,
+                profit_tp_tp_price_ratio: this.form.profit_tp_tp_price_ratio || 0,
+                profit_tp_sl_price_ratio: this.form.profit_tp_sl_price_ratio || 0,
                 api_id: this.inForm.api_id.toString(),
                 hedge_trigger_percent: Number(this.inForm.hedge_trigger_percent),
                 hedge_trigger_percent_max: Number(this.inForm.hedge_trigger_percent_max)
@@ -921,7 +779,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function() {
+      }).then(function () {
         return delLineOrderTemplateLogs({ 'ids': Ids })
       }).then((response) => {
         if (response.code === 200) {
@@ -931,7 +789,7 @@ export default {
         } else {
           this.msgError(response.msg)
         }
-      }).catch(function() {
+      }).catch(function () {
       })
     },
     handleOrders() {
@@ -940,7 +798,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function() {
+      }).then(function () {
         return quickAddPreOrder({ ids: Ids.toString() })
       }).then((response) => {
         if (response.code === 200) {
@@ -950,7 +808,7 @@ export default {
         } else {
           this.msgError(response.msg)
         }
-      }).catch(function() {
+      }).catch(function () {
       })
     },
     // 计算需要回本利润
@@ -964,13 +822,14 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.hour{
-  ::v-deep.el-input__inner{
+.hour {
+  ::v-deep.el-input__inner {
     line-height: 1;
   }
 }
-.page{
-  .pagination-container{
+
+.page {
+  .pagination-container {
     padding: 0 !important;
     margin-top: 0;
     margin-bottom: 0;
@@ -979,11 +838,13 @@ export default {
     justify-content: center;
     align-items: center;
   }
-  ::v-deep.el-pagination{
+
+  ::v-deep.el-pagination {
     width: 100%;
   }
 }
-.exts{
+
+.exts {
   font-size: 13px;
   margin-bottom: 20px;
   border: 1px solid #ebebeb;
diff --git a/src/views/admin/line-pre-order/index.vue b/src/views/admin/line-pre-order/index.vue
index c8760fa..b5b9e29 100644
--- a/src/views/admin/line-pre-order/index.vue
+++ b/src/views/admin/line-pre-order/index.vue
@@ -689,6 +689,24 @@
                   placeholder="止盈百分比"
                 />
               </el-form-item>
+              <el-form-item label="止盈数量百分比" prop="profit_num_ratio">
+                <el-input
+                  v-model="form.profit_num_ratio"
+                  placeholder="止盈数量百分比"
+                />
+              </el-form-item>
+              <el-form-item label="止盈后止盈价百分比" prop="profit_tp_tp_price_ratio">
+                <el-input
+                  v-model="form.profit_tp_tp_price_ratio"
+                  placeholder="止盈后止盈价百分比"
+                />
+              </el-form-item>
+              <el-form-item label="止盈后止损价百分比" prop="profit_tp_sl_price_ratio">
+                <el-input
+                  v-model="form.profit_tp_sl_price_ratio"
+                  placeholder="止盈后止损价百分比"
+                />
+              </el-form-item>
               <!-- <el-form-item label="亏损百分比" prop="stop_price">
               <el-input
                 v-model="form.stop_price"
@@ -1418,7 +1436,8 @@ export default {
         symbol: [{ required: true, message: '交易对不能为空', trigger: 'blur' }],
         symbol_group_id: [{ required: true, message: '交易对组不能为空', trigger: 'blur' }],
         quote_symbol: [{ required: true, message: '计价货币不能为空', trigger: 'blur' }],
-        order_sn: [{ required: true, message: '订单号不能为空', trigger: 'blur' }]
+        order_sn: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
+        profit_num_ratio:[{ required: true, message: '止盈数量百分比不能为空', trigger: 'blur' }],
       },
       currentExpandId: undefined,
       cacheRefresh: {},
@@ -1954,6 +1973,9 @@ export default {
         cover_type: 0,
         price_pattern: 'percentage',
         profit: 0,
+        profit_num_ratio:100,
+        profit_tp_tp_price_ratio:0,
+        profit_tp_sl_price_ratio:0,
         stop_price: '',
         save_template: '0',
         template_name: ''
@@ -2046,7 +2068,12 @@ export default {
             })
           } else {
             if (this.title === '批量添加') {
-              const params = JSON.parse(JSON.stringify({ ...this.form, symbol_group_id: String(this.form.symbol_group_id), api_id: this.form.api_id.toString() }))
+
+
+              const params = JSON.parse(JSON.stringify({ ...this.form, symbol_group_id: String(this.form.symbol_group_id), api_id: this.form.api_id.toString(),
+              profit_num_ratio:this.form.profit_num_ratio||100,
+              profit_tp_tp_price_ratio:this.form.profit_tp_tp_price_ratio||0,
+              profit_tp_sl_price_ratio:this.form.profit_tp_sl_price_ratio||0, }))
               delete params.symbol
               batchAddOrder(params).then(response => {
                 if (response.code === 200) {
@@ -2067,6 +2094,9 @@ export default {
               reduce_num: this.form.reduce_num || 0,
               reduce_take_profit: this.form.reduce_take_profit || 0,
               reduce_stop_price: this.form.reduce_stop_price || 0,
+              profit_num_ratio:this.form.profit_num_ratio||100,
+              profit_tp_tp_price_ratio:this.form.profit_tp_tp_price_ratio||0,
+              profit_tp_sl_price_ratio:this.form.profit_tp_sl_price_ratio||0,
               api_id: this.form.api_id.toString()
             }).then(response => {
               if (response.code === 200) {