From 4e734ec086a3fc08e70ecfda434fe1c45cbf15fd Mon Sep 17 00:00:00 2001
From: hucan <951870319@qq.com>
Date: Fri, 7 Feb 2025 14:58:56 +0800
Subject: [PATCH 1/2] 1

---
 src/views/admin/line-pre-order/index.vue      | 27 +------------------
 src/views/admin/line-system-setting/index.vue | 10 +++----
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/views/admin/line-pre-order/index.vue b/src/views/admin/line-pre-order/index.vue
index 1c23da5..a91321a 100644
--- a/src/views/admin/line-pre-order/index.vue
+++ b/src/views/admin/line-pre-order/index.vue
@@ -334,32 +334,6 @@
             prop="desc"
             :show-overflow-tooltip="true"
           />
-          <el-table-column
-            label="对冲状态"
-            align="center"
-            prop="status"
-            width="100"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{row}">
-              <el-tag v-if="row.pid===0" size="mini" :type="row.hedgeStatus===1?'success':'danger'">
-                {{ ['未对冲','已对冲'][row.hedgeStatus] }}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="加仓状态"
-            align="center"
-            prop="status"
-            width="100"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{row}">
-              <el-tag v-if="row.pid===0" size="mini" :type="row.addPositionStatus===1?'success':'danger'">
-                {{ ['未加仓','已加仓'][row.addPositionStatus] }}
-              </el-tag>
-            </template>
-          </el-table-column>
           <el-table-column
             label="计价货币"
             align="center"
@@ -459,6 +433,7 @@
         <!-- 添加或修改对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="700px" :close-on-click-modal="false">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="height: 600px;overflow: hidden auto;">
+            <el-form />
             <el-form-item label="订单类型" prop="order_type">
               <el-radio-group v-model="form.order_type">
                 <el-radio label="1">现货</el-radio>
diff --git a/src/views/admin/line-system-setting/index.vue b/src/views/admin/line-system-setting/index.vue
index 22dd391..b7d2cb7 100644
--- a/src/views/admin/line-system-setting/index.vue
+++ b/src/views/admin/line-system-setting/index.vue
@@ -11,14 +11,14 @@
             width="210"
             :show-overflow-tooltip="true"
           />
-          <el-table-column
+          <!-- <el-table-column
             label="主账号加仓溢价百分比"
             align="center"
             prop="scaleOrderTypeARate"
             width="210"
             :show-overflow-tooltip="true"
-          />
-          <el-table-column
+          /> -->
+          <!-- <el-table-column
             label="副账号加仓溢价百分比"
             align="center"
             prop="scaleOrderTypeBRate"
@@ -78,7 +78,7 @@
             align="center"
             prop="protectHedgeRate"
             width="80"
-          />
+          /> -->
           <el-table-column
             label="创建时间"
             align="center"
@@ -162,7 +162,7 @@
                 <el-radio :label="1">开启</el-radio>
               </el-radio-group>
             </el-form-item>
-            
+
             <el-form-item label="加仓账户类型" prop="scaleSubordinate">
               <el-radio-group v-model="form.scaleSubordinate">
                 <el-radio :label="1">主账号</el-radio>

From 0c7efc2da406a9e4dd7b4b48155f108ce3bd9a28 Mon Sep 17 00:00:00 2001
From: hucan <951870319@qq.com>
Date: Fri, 7 Feb 2025 16:24:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E6=8C=82=E5=8D=95=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/line-system-setting/index.vue | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/admin/line-system-setting/index.vue b/src/views/admin/line-system-setting/index.vue
index b7d2cb7..4727b1e 100644
--- a/src/views/admin/line-system-setting/index.vue
+++ b/src/views/admin/line-system-setting/index.vue
@@ -8,8 +8,11 @@
             label="副账号限价对冲溢价买入百分比"
             align="center"
             prop="coverOrderTypeBRate"
-            width="210"
-            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="止损溢价百分比"
+            align="center"
+            prop="stopLossPremium"
           />
           <!-- <el-table-column
             label="主账号加仓溢价百分比"
@@ -129,7 +132,10 @@
             <el-form-item label="副账号限价对冲溢价买入百分比" prop="coverOrderTypeBRate">
               <el-input v-model="form.coverOrderTypeBRate" placeholder="副账号限价对冲溢价买入百分比" />
             </el-form-item>
-            <el-form-item label="主账号加仓溢价百分比" prop="scaleOrderTypeARate">
+            <el-form-item label="止损溢价百分比" prop="stopLossPremium">
+              <el-input v-model="form.stopLossPremium" placeholder="止损溢价百分比" />
+            </el-form-item>
+            <!-- <el-form-item label="主账号加仓溢价百分比" prop="scaleOrderTypeARate">
               <el-input v-model="form.scaleOrderTypeARate" placeholder="主账号限价加仓买入百分比" />
             </el-form-item>
             <el-form-item label="副账号加仓溢价百分比" prop="scaleOrderTypeBRate">
@@ -169,7 +175,7 @@
                 <el-radio :label="2">副账号</el-radio>
                 <el-radio :label="3">都加</el-radio>
               </el-radio-group>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -206,13 +212,7 @@ export default {
       // 表单校验
       rules: {
         scaleOrderTypeARate: [{ required: true, message: '主账号限价加仓买入百分比不能为空', trigger: 'blur' }],
-        scaleOrderTypeBRate: [{ required: true, message: '副账号限价加仓买入百分比不能为空', trigger: 'blur' }],
-        coverOrderTypeBRate: [{ required: true, message: '副账号限价对冲单价买入百分比不能为空', trigger: 'blur' }],
-        scaleNum: [{ required: true, message: '加参数值不能为空', trigger: 'blur' }],
-        autoScaleTimes: [{ required: true, message: '自动加仓次数不能为空', trigger: 'blur' }],
-        scaleUnrealizedProfitRate: [{ required: true, message: '主单亏损多少百分比开始加仓不能为空', trigger: 'blur' }],
-        hedgePerformance: [{ required: true, message: '对冲平仓涨跌幅不能为空', trigger: 'blur' }],
-        scaleSubordinate: [{ required: true, message: '自动加仓数值不能为空', trigger: 'blur' }]
+        stopLossPremium: [{ required: true, message: '止损溢价百分比', trigger: 'blur' }]
       }
 
     }