|
@@ -19,11 +19,11 @@ export const tableColumns = [
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
key: '1th',
|
|
key: '1th',
|
|
|
- dataIndex: 'currentbalance',
|
|
|
|
|
|
|
+ dataIndex: 'netWorth',
|
|
|
title: '净值',
|
|
title: '净值',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
slots: {
|
|
slots: {
|
|
|
- customRender: 'currentbalance',
|
|
|
|
|
|
|
+ customRender: 'netWorth',
|
|
|
},
|
|
},
|
|
|
width: 120,
|
|
width: 120,
|
|
|
},
|
|
},
|
|
@@ -139,9 +139,9 @@ export const useHazardRates = (positions: Ref<QueryTradePositionRsp[]>) => {
|
|
|
const { accountid, currentbalance, otherfreezemargin, outamountfreeze } = taaccount
|
|
const { accountid, currentbalance, otherfreezemargin, outamountfreeze } = taaccount
|
|
|
// 浮动盈亏
|
|
// 浮动盈亏
|
|
|
const profitloss = handleProfitloss(taaccount, false) as number
|
|
const profitloss = handleProfitloss(taaccount, false) as number
|
|
|
|
|
+
|
|
|
// 市值
|
|
// 市值
|
|
|
const price = getSystemParam('087', '1') ? handleHoldPrice(accountid) : 0
|
|
const price = getSystemParam('087', '1') ? handleHoldPrice(accountid) : 0
|
|
|
-
|
|
|
|
|
// 风险净值 根据系统参数“087 风险净值是否加上市值 - 0:不加 1:加“
|
|
// 风险净值 根据系统参数“087 风险净值是否加上市值 - 0:不加 1:加“
|
|
|
// 0. 风险净值=期末余额+浮动盈亏(收益权)-其他冻结-出金冻结
|
|
// 0. 风险净值=期末余额+浮动盈亏(收益权)-其他冻结-出金冻结
|
|
|
// 1. 风险净值=期末余额+市值+浮动盈亏(收益权)-其他冻结-出金冻结
|
|
// 1. 风险净值=期末余额+市值+浮动盈亏(收益权)-其他冻结-出金冻结
|
|
@@ -167,6 +167,7 @@ export const useHazardRates = (positions: Ref<QueryTradePositionRsp[]>) => {
|
|
|
const { usedmargin, mortgagecredit } = taaccount
|
|
const { usedmargin, mortgagecredit } = taaccount
|
|
|
// 风险净值
|
|
// 风险净值
|
|
|
const riskValue = handleRiskValue(taaccount)
|
|
const riskValue = handleRiskValue(taaccount)
|
|
|
|
|
+ console.log('riskValue', riskValue)
|
|
|
const decimalplace = getDecimalplace()
|
|
const decimalplace = getDecimalplace()
|
|
|
// 风险率 根据系统参数“132 风险率计算公式”:
|
|
// 风险率 根据系统参数“132 风险率计算公式”:
|
|
|
// 1. 风险率=占用/风险净值
|
|
// 1. 风险率=占用/风险净值
|