{{ holdingModal.fund?.name }}
#{{ holdingModal.fund?.code }}
上一交易日净值：
{{ holdingModal.fund?.dwjz || '-' }}
+ （{{ holdingModal.fund.jzrq }}）
+
+
+ 当前份额：{{ holdings[holdingModal.fund.code].share.toFixed(2) }} 份
+ |
+ 成本价：{{ holdings[holdingModal.fund.code].cost.toFixed(4) }}
-
-
-
@@ -247,6 +317,8 @@ export default {
// 持仓弹窗
const holdingModal = ref({ open: false, fund: null })
const holdingForm = ref({ amount: '' })
+ const modalTab = ref('set')
+ const tradeForm = ref({ type: 'buy', amount: '', nav: '' })
// ==================== 计算属性 ====================
const isTradingTime = computed(() => {
@@ -279,7 +351,7 @@ export default {
funds.value.forEach(fund => {
const h = holdings.value[fund.code]
if (h && h.share) {
- total += getHoldingAmount(fund)
+ total += getHoldingEstimatedAmount(fund)
}
})
return total
@@ -328,19 +400,29 @@ export default {
return (num >= 0 ? '+' : '') + num.toFixed(2) + '%'
}
+ // 持有金额 = 上一交易日净值 × 份额（实际金额）
const getHoldingAmount = (fund) => {
+ const h = holdings.value[fund.code]
+ if (!h || !h.share) return 0
+ const nav = parseFloat(fund.dwjz) || 0
+ return h.share * nav
+ }
+
+ // 估算金额 = 估算净值 × 份额
+ const getHoldingEstimatedAmount = (fund) => {
const h = holdings.value[fund.code]
if (!h || !h.share) return 0
const nav = parseFloat(fund.gsz) || parseFloat(fund.dwjz) || 0
return h.share * nav
}
+ // 今日收益 = 份额 × (估算净值 - 上一交易日净值)
const getHoldingProfitToday = (fund) => {
const h = holdings.value[fund.code]
if (!h || !h.share) return 0
- const amount = getHoldingAmount(fund)
- const rate = typeof fund.gszzl === 'number' ? fund.gszzl : parseFloat(fund.gszzl) || 0
- return amount - (amount / (1 + rate / 100))
+ const gsz = parseFloat(fund.gsz) || parseFloat(fund.dwjz) || 0
+ const dwjz = parseFloat(fund.dwjz) || 0
+ return h.share * (gsz - dwjz)
}
const getHoldingProfitTotal = (fund) => {
@@ -675,6 +757,9 @@ export default {
} else {
holdingForm.value = { amount: '' }
}
+ // 重置加减仓表单
+ modalTab.value = h && h.share ? 'trade' : 'set'
+ tradeForm.value = { type: 'buy', amount: '', nav: '' }
}
const closeHoldingModal = () => {
@@ -717,6 +802,64 @@ export default {
closeHoldingModal()
}
+ // 获取交易净值（优先使用用户输入，否则使用上一交易日净值）
+ const getTradeNav = () => {
+ const inputNav = parseFloat(tradeForm.value.nav)
+ if (inputNav > 0) return inputNav
+ return parseFloat(holdingModal.value.fund?.dwjz) || 0
+ }
+
+ // 计算交易后总份额
+ const getTradeResultShares = () => {
+ const nav = getTradeNav()
+ const amount = parseFloat(tradeForm.value.amount) || 0
+ if (nav <= 0 || amount <= 0) return holdings.value[holdingModal.value.fund?.code]?.share || 0
+ const tradeShares = amount / nav
+ const currentShares = holdings.value[holdingModal.value.fund?.code]?.share || 0
+ return tradeForm.value.type === 'buy' ? currentShares + tradeShares : currentShares - tradeShares
+ }
+
+ // 保存加减仓交易
+ const saveTrade = () => {
+ const fund = holdingModal.value.fund
+ if (!fund) return
+
+ const amount = parseFloat(tradeForm.value.amount)
+ const nav = getTradeNav()
+ if (!amount || amount <= 0 || nav <= 0) return
+
+ const tradeShares = amount / nav
+ const h = holdings.value[fund.code] || { share: 0, cost: 0 }
+ const newHoldings = { ...holdings.value }
+
+ if (tradeForm.value.type === 'buy') {
+ // 加仓：计算新的总份额和加权平均成本
+ const newTotalShares = h.share + tradeShares
+ const newAvgCost = h.share > 0
+ ? (h.share * h.cost + amount) / newTotalShares
+ : nav
+ newHoldings[fund.code] = {
+ share: newTotalShares,
+ cost: newAvgCost
+ }
+ } else {
+ // 减仓：份额减少，成本价不变
+ const newTotalShares = h.share - tradeShares
+ if (newTotalShares <= 0.01) {
+ delete newHoldings[fund.code]
+ } else {
+ newHoldings[fund.code] = {
+ share: newTotalShares,
+ cost: h.cost
+ }
+ }
+ }
+
+ holdings.value = newHoldings
+ localStorage.setItem('realtime_holdings', JSON.stringify(newHoldings))
+ closeHoldingModal()
+ }
+
const saveRefreshMs = () => {
localStorage.setItem('realtime_refresh_ms', refreshMs.value.toString())
// 重启定时器
@@ -788,6 +931,8 @@ export default {
dropdownRef,
holdingModal,
holdingForm,
+ modalTab,
+ tradeForm,
isTradingTime,
sortedFunds,
hasHoldings,
@@ -800,6 +945,7 @@ export default {
formatGsz,
formatChange,
getHoldingAmount,
+ getHoldingEstimatedAmount,
getHoldingProfitToday,
getHoldingProfitTotal,
getHoldingProfitTodayClass,
@@ -816,7 +962,10 @@ export default {
saveHolding,
clearHolding,
saveRefreshMs,
- calculateShare
+ calculateShare,
+ getTradeNav,
+ getTradeResultShares,
+ saveTrade
}
}
}
@@ -1375,6 +1524,99 @@ export default {
font-size: 1.1rem;
}
+/* 弹窗 Tab */
+.modal-tabs {
+ display: flex;
+ gap: 0;
+ margin-bottom: 16px;
+ border-bottom: 2px solid var(--border-color);
+}
+
+.modal-tab {
+ flex: 1;
+ padding: 10px 0;
+ border: none;
+ background: transparent;
+ font-size: 14px;
+ font-weight: 500;
+ color: var(--text-secondary);
+ cursor: pointer;
+ border-bottom: 2px solid transparent;
+ margin-bottom: -2px;
+ transition: all 0.2s;
+}
+
+.modal-tab.active {
+ color: var(--primary-color);
+ border-bottom-color: var(--primary-color);
+}
+
+.modal-tab:hover:not(.active) {
+ color: var(--text-primary);
+}
+
+/* 持仓摘要 */
+.fund-holding-summary {
+ margin-top: 8px;
+ padding-top: 8px;
+ border-top: 1px dashed var(--border-color);
+ font-size: 12px;
+ color: var(--text-secondary);
+ display: flex;
+ align-items: center;
+ gap: 6px;
+}
+
+.summary-sep {
+ color: var(--border-color);
+}
+
+.nav-date {
+ font-size: 11px;
+ color: var(--text-tertiary);
+}
+
+/* 加减仓切换 */
+.trade-type-toggle {
+ display: flex;
+ gap: 0;
+ margin-bottom: 16px;
+ border-radius: 8px;
+ overflow: hidden;
+ border: 1px solid var(--border-color);
+}
+
+.trade-type-btn {
+ flex: 1;
+ padding: 10px 0;
+ border: none;
+ background: var(--bg-primary);
+ font-size: 14px;
+ font-weight: 600;
+ cursor: pointer;
+ transition: all 0.2s;
+ color: var(--text-secondary);
+}
+
+.trade-type-btn.buy.active {
+ background: rgba(22, 119, 255, 0.1);
+ color: var(--primary-color);
+}
+
+.trade-type-btn.sell.active {
+ background: rgba(255, 77, 79, 0.1);
+ color: var(--danger-color);
+}
+
+.trade-type-btn:hover:not(.active) {
+ background: var(--bg-card);
+}
+
+.form-error {
+ color: var(--danger-color);
+ font-weight: 600;
+}
+
.fund-modal-info {
margin-bottom: 16px;
padding: 12px;
diff --git a/Frontend/src/components/FundWatchlist.vue b/Frontend/src/components/FundWatchlist.vue
index 028a8c2..2ff531f 100644
--- a/Frontend/src/components/FundWatchlist.vue
+++ b/Frontend/src/components/FundWatchlist.vue
@@ -547,8 +547,8 @@ export default {
}
}
- onMounted(() => {
- loadWatchlist()
+ onMounted(async () => {
+ await loadWatchlist()
// 启动估值自动刷新
startEstimateRefreshTimer()
})