diff --git a/src/api/admin/line-pre-order.js b/src/api/admin/line-pre-order.js
index 747e89d..6828f4e 100644
--- a/src/api/admin/line-pre-order.js
+++ b/src/api/admin/line-pre-order.js
@@ -82,13 +82,6 @@ export function orderMarginType(data) {
data
})
}
-export function manuallyCover(data) {
- return request({
- url: '/api/v1/line-pre-order/manuallyCover',
- method: 'post',
- data
- })
-}
export function closePosition(data) {
return request({
url: '/api/v1/line-pre-order/closePosition',
diff --git a/src/api/admin/line-reduce-strategy.js b/src/api/admin/line-reduce-strategy.js
new file mode 100644
index 0000000..4a1603d
--- /dev/null
+++ b/src/api/admin/line-reduce-strategy.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询LineReduceStrategy列表
+export function listLineReduceStrategy(query) {
+ return request({
+ url: '/api/v1/line-reduce-strategy',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询LineReduceStrategy详细
+export function getLineReduceStrategy(id) {
+ return request({
+ url: '/api/v1/line-reduce-strategy/' + id,
+ method: 'get'
+ })
+}
+
+// 新增LineReduceStrategy
+export function addLineReduceStrategy(data) {
+ return request({
+ url: '/api/v1/line-reduce-strategy',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改LineReduceStrategy
+export function updateLineReduceStrategy(data) {
+ return request({
+ url: '/api/v1/line-reduce-strategy/' + data.id,
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除LineReduceStrategy
+export function delLineReduceStrategy(data) {
+ return request({
+ url: '/api/v1/line-reduce-strategy',
+ method: 'delete',
+ data: data
+ })
+}
+
diff --git a/src/api/admin/line-strategy-template.js b/src/api/admin/line-strategy-template.js
new file mode 100644
index 0000000..5b0bc65
--- /dev/null
+++ b/src/api/admin/line-strategy-template.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询LineStrategyTemplate列表
+export function listLineStrategyTemplate(query) {
+ return request({
+ url: '/api/v1/line-strategy-template',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询LineStrategyTemplate详细
+export function getLineStrategyTemplate(id) {
+ return request({
+ url: '/api/v1/line-strategy-template/' + id,
+ method: 'get'
+ })
+}
+
+// 新增LineStrategyTemplate
+export function addLineStrategyTemplate(data) {
+ return request({
+ url: '/api/v1/line-strategy-template',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改LineStrategyTemplate
+export function updateLineStrategyTemplate(data) {
+ return request({
+ url: '/api/v1/line-strategy-template/' + data.id,
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除LineStrategyTemplate
+export function delLineStrategyTemplate(data) {
+ return request({
+ url: '/api/v1/line-strategy-template',
+ method: 'delete',
+ data: data
+ })
+}
+
diff --git a/src/api/admin/line-symbol-price.js b/src/api/admin/line-symbol-price.js
new file mode 100644
index 0000000..eb63a98
--- /dev/null
+++ b/src/api/admin/line-symbol-price.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询LineSymbolPrice列表
+export function listLineSymbolPrice(query) {
+ return request({
+ url: '/api/v1/line-symbol-price',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询LineSymbolPrice详细
+export function getLineSymbolPrice(id) {
+ return request({
+ url: '/api/v1/line-symbol-price/' + id,
+ method: 'get'
+ })
+}
+
+// 新增LineSymbolPrice
+export function addLineSymbolPrice(data) {
+ return request({
+ url: '/api/v1/line-symbol-price',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改LineSymbolPrice
+export function updateLineSymbolPrice(data) {
+ return request({
+ url: '/api/v1/line-symbol-price/' + data.id,
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除LineSymbolPrice
+export function delLineSymbolPrice(data) {
+ return request({
+ url: '/api/v1/line-symbol-price',
+ method: 'delete',
+ data: data
+ })
+}
+
diff --git a/src/views/admin/line-order-template-logs/index.vue b/src/views/admin/line-order-template-logs/index.vue
index 019cfb4..c08a42d 100644
--- a/src/views/admin/line-order-template-logs/index.vue
+++ b/src/views/admin/line-order-template-logs/index.vue
@@ -301,6 +301,48 @@
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
百分比
@@ -439,6 +481,45 @@
直接执行
+
+
+
+
+
+
+
+
+
{
+ this.strategyTemplatePagition.total = res.data.count
+ this.strategyTemplateOptions = res.data.list
+ })
+ .finally(() => {
+ this.searchLoding = false
+ })
+ },
+ // 查询减仓策略
+ queryReduceStrategy() {
+ this.searchLoding = true
+ listLineReduceStrategy({ pageIndex: this.reduceStrategyPagition.pageIndex, pageSize: this.reduceStrategyPagition.pageSize }).then(res => {
+ this.reduceStrategyPagition.reduceStrategyList = res.data.list
+ this.reduceStrategyPagition.total = res.data.count
+ })
+ .finally(() => {
+ this.searchLoding = false
+ })
+ },
// 文件
/** 搜索按钮操作 */
handleQuery() {
@@ -1288,6 +1412,10 @@ export default {
symbol_group_id: x.symbol_group_id ? Number(x.symbol_group_id) : undefined
}
+ if (this.inForm.price_pattern === 'aicoin') {
+ this.inForm.price = null
+ }
+
this.getApiUserGroupList()
this.onchangePattern(false)
this.getListLineApiUser()
@@ -1302,8 +1430,6 @@ export default {
},
/** 提交按钮 */
submitForm: function() {
- console.log('this.form', this.form)
- console.log('this.inForm', this.inForm)
Promise.all([
this.$refs['inForm'].validate(), // 验证第一个表单
this.$refs['extForm'].validate() // 验证第二个表单
diff --git a/src/views/admin/line-order/index.vue b/src/views/admin/line-order/index.vue
index 251646a..cb5843e 100644
--- a/src/views/admin/line-order/index.vue
+++ b/src/views/admin/line-order/index.vue
@@ -98,10 +98,29 @@
v-model="queryParams.status"
placeholder="请选择状态"
size="small"
+ clearable
>
+
+
+
+ -
+
+
搜索
重置
@@ -964,7 +983,9 @@ export default {
idOrder: 'desc',
addPositionStatus: -1,
hedgeStatus: -1,
- status: ''
+ status: '',
+ percentStart: undefined,
+ percentEnd: undefined
},
// 表单参数
form: {
diff --git a/src/views/admin/line-pre-order/index.vue b/src/views/admin/line-pre-order/index.vue
index 995360c..efb23f4 100644
--- a/src/views/admin/line-pre-order/index.vue
+++ b/src/views/admin/line-pre-order/index.vue
@@ -69,13 +69,27 @@
/>
-
-
-
+
+
+
+
+
+
+
+ -
+
搜索
@@ -301,44 +315,12 @@
-
{{ exchangeTypeFormat(row) }}
-
{{ row.triggerTime && parseTime(row.triggerTime) }}
@@ -351,21 +333,7 @@
-
+
合约
-
单个
@@ -543,6 +503,47 @@
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
百分比
@@ -605,91 +606,13 @@
-
-
-
+
限价
市价
-
-
最新价
@@ -711,6 +634,45 @@
直接执行
+
+
+
+
+
+
+
+
+
取 消
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 加仓主账号
- 加仓副账号
- 都加
-
-
-
-
- 现货
- 合约
-
-
-
-
-
-
-
-
-
-
- 市价
- 限价
-
-
-
-
-
-
-
- 市价
- 限价
-
-
-
-
-
-
-
- 百分比
- 金额
-
-
-
-
-
-
-
-
@@ -1272,10 +1126,13 @@
diff --git a/src/views/admin/line-strategy-template/index.vue b/src/views/admin/line-strategy-template/index.vue
new file mode 100644
index 0000000..b8fc9e6
--- /dev/null
+++ b/src/views/admin/line-strategy-template/index.vue
@@ -0,0 +1,414 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+ {{ directionFormat(scope.row.direction) }}
+
+
+
+
+
+ {{ compareTypeFormat(scope.row.compareType) }}
+
+
+
+
+
+
+ {{ parseTime(row.createdAt) }}
+
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ dict.label
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/line-symbol-price/index.vue b/src/views/admin/line-symbol-price/index.vue
new file mode 100644
index 0000000..a51e2f4
--- /dev/null
+++ b/src/views/admin/line-symbol-price/index.vue
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+ {{ scope.row.status === 1 ? "已启用" : "禁用" }}
+
+
+ {{ parseTime(row.createdAt) }}
+
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 启用
+ 禁用
+
+
+
+
+
+
+
+
+
+
+
+