This commit is contained in:
shilin
2025-02-21 16:03:40 +08:00
parent 1380bee2bd
commit 78aaca142b
4 changed files with 55 additions and 45 deletions

View File

@ -337,6 +337,9 @@
</el-option>
</el-select>
</template>
<template #append>
<span v-if="inForm.price_pattern === 'mixture'">{{ comPrice }}</span>
</template>
</el-input>
</el-form-item>
</el-col>
@ -623,6 +626,20 @@ export default {
computed: {
comSymbols() {
return this.form.type === 2 ? this.symbolGroups : this.symbol.symbolList
},
comPrice() {
// (this.form.price-?)/? *100 + '%'
// 主单委托实际价下 获取交易对行情价
const { symbol, price, price_pattern } = this.inForm
if (symbol && price_pattern === 'mixture') {
const s = this.comSymbols.find(item => item.symbol === symbol)
if (s) {
const res = ((price - s.lastPrice) / s.lastPrice) * 100
return `${res}%`
}
return 0
}
return 0
}
},
created() {
@ -662,6 +679,7 @@ export default {
}
},
onchangeSymbol() {
this.inForm.price = 0
if (this.inForm.price_pattern === 'aicoin') {
aicoinSymbol({ symbol: this.inForm.symbol, symbolType: this.inForm.symbol_type }).then(res => {
this.aicoinPrice = undefined

View File

@ -70,8 +70,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单类型" prop="orderType"><el-select
v-model="queryParams.orderType"
<el-form-item label="订单类型" prop="symbolType"><el-select
v-model="queryParams.symbolType"
placeholder="请选择订单类型"
clearable
size="small"
@ -84,32 +84,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="对冲状态" prop="hedgeStatus"><el-select
v-model="queryParams.hedgeStatus"
placeholder="请选择对冲状态"
size="small"
>
<el-option
v-for="dict in [{l:'全部',v:-1},{l:'未对冲',v:0},{l:'已对冲',v:1}]"
:key="dict.k"
:label="dict.l"
:value="dict.v"
/>
</el-select>
</el-form-item>
<el-form-item label="加仓状态" prop="addPositionStatus"><el-select
v-model="queryParams.addPositionStatus"
placeholder="请选择加仓状态"
size="small"
>
<el-option
v-for="dict in [{l:'全部',v:-1},{l:'未加仓',v:0},{l:'已加仓',v:1}]"
:key="dict.k"
:label="dict.l"
:value="dict.v"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status"><el-select
v-model="queryParams.status"
placeholder="请选择状态"
@ -218,7 +192,7 @@
lazy
:load="onLoadChild"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
height="590"
height="650"
@selection-change="handleSelectionChange"
@expand-change="onExpand"
>
@ -1089,7 +1063,7 @@ export default {
rate: undefined,
site: undefined,
orderSn: undefined,
orderType: undefined,
symbolType: undefined,
idOrder: 'desc',
addPositionStatus: -1,
hedgeStatus: -1,

View File

@ -71,8 +71,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单类型" prop="orderType"><el-select
v-model="queryParams.orderType"
<el-form-item label="订单类型" prop="symbolType"><el-select
v-model="queryParams.symbolType"
placeholder="请选择订单类型"
clearable
size="small"
@ -342,17 +342,6 @@
<span :style="comStatusStyle(row)">{{ status[row.status] ? status[row.status].l : '' }}</span>
</template>
</el-table-column>
<el-table-column
label="加仓状态"
align="center"
prop="add_position_status"
width="100"
:show-overflow-tooltip="true"
>
<template #default="{row}">
<el-tag v-if="row.pid===0" size="mini" :type="['danger','success'][row.add_position_status]">{{ ['未加仓','已加仓'][row.add_position_status] }}</el-tag>
</template>
</el-table-column>
<el-table-column
label="减仓状态"
align="center"
@ -364,6 +353,17 @@
<el-tag v-if="row.pid===0" size="mini" :type="['danger','success'][row.reduce_status]">{{ ['未减仓','已减仓'][row.reduce_status] }}</el-tag>
</template>
</el-table-column>
<el-table-column
label="加仓状态"
align="center"
prop="add_position_status"
width="100"
:show-overflow-tooltip="true"
>
<template #default="{row}">
<el-tag v-if="row.pid===0" size="mini" :type="['danger','success'][row.add_position_status]">{{ ['未加仓','已加仓'][row.add_position_status] }}</el-tag>
</template>
</el-table-column>
<el-table-column
label="订单描述"
align="center"
@ -659,6 +659,9 @@
</el-option>
</el-select>
</template>
<template #append>
<span v-if="form.price_pattern === 'mixture'">{{ comPrice }}</span>
</template>
</el-input>
</el-form-item>
</el-col>
@ -1385,7 +1388,7 @@ export default {
rate: undefined,
site: undefined,
orderSn: undefined,
orderType: undefined,
symbolType: undefined,
idOrder: 'desc',
addPositionStatus: -1,
hedgeStatus: -1,
@ -1484,6 +1487,20 @@ export default {
return {}
}
}
},
comPrice() {
// (this.form.price-?)/? *100 + '%'
// 主单委托实际价下 获取交易对行情价
const { symbol, price, price_pattern } = this.form
if (symbol && price_pattern === 'mixture') {
const s = this.comSymbols.find(item => item.symbol === symbol)
if (s) {
const res = ((price - s.lastPrice) / s.lastPrice) * 100
return `${res}%`
}
return 0
}
return 0
}
},
watch: {
@ -1541,6 +1558,7 @@ export default {
},
methods: {
onchangeSymbol() {
this.form.price = 0
if (this.form.price_pattern === 'aicoin') {
aicoinSymbol({ symbol: this.form.symbol, symbolType: this.form.symbol_type }).then(res => {
this.aicoinPrice = undefined

View File

@ -208,7 +208,6 @@
<el-input
v-model="form.symbol"
type="textarea"
:disabled="symbol.symbolList.length===0"
:autosize="{ minRows: 4, maxRows: 8 }"
placeholder="请输入交易对"
/>
@ -360,6 +359,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.getSymbol()
this.open = true
this.title = '添加交易对组列表'
this.isEdit = false