diff --git a/src/stores/modules/tabs.ts b/src/stores/modules/tabs.ts index c35b0da..5d997f3 100644 --- a/src/stores/modules/tabs.ts +++ b/src/stores/modules/tabs.ts @@ -255,12 +255,23 @@ export const useTabsStore = defineStore('tabs', () => { setStorage('activeTab', activeTab.value) } - // 清空页签 + // 清空页签(重新登录时调用,保留固定页签) const clearTabs = () => { - tabs.value = [] - activeTab.value = '' - removeStorage('tabs') - removeStorage('activeTab') + // 只保留固定页签 + const fixedTabItems = tabs.value.filter(item => isFixedTab(item.path)) + // 如果没有固定页签,至少添加首页 + if (fixedTabItems.length === 0) { + tabs.value = [{ + title: '首页', + path: '/dashboard' + }] + activeTab.value = '/dashboard' + } else { + tabs.value = fixedTabItems + const firstFixedTab = fixedTabItems[0] + activeTab.value = firstFixedTab ? firstFixedTab.path : '/dashboard' + } + saveTabs() } // 初始化默认首页标签 diff --git a/src/stores/modules/transaction.ts b/src/stores/modules/transaction.ts index 19651ea..2e8b27a 100644 --- a/src/stores/modules/transaction.ts +++ b/src/stores/modules/transaction.ts @@ -87,7 +87,7 @@ export const useTransactionStore = defineStore('transaction', () => { mqttClient.onTopicMessages({ [topic]: (_topic: string, msg: string): void => { - console.log(_topic, msg) + // console.log(_topic, msg) let [type, data] = msg.split('|') switch (type) { @@ -96,9 +96,7 @@ export const useTransactionStore = defineStore('transaction', () => { orderStore.handlePositionOrderList(data) break } - case 'SUBSCRIBE_AMOUNT_FLOATING_BACK': { - // 做市商浮动盈亏回调:更新 marketFloatProfitMap - console.log('做市商浮动盈亏数据:', data); + case 'SUBSCRIBE_AMOUNT_FLOATING_BACK': { handleMarketFloatProfit(data) break } @@ -130,8 +128,7 @@ export const useTransactionStore = defineStore('transaction', () => { marketFloatProfitMap.value.set(account_id, float_profit_loss) // 触发响应式更新(创建新的 Map 实例) marketFloatProfitMap.value = new Map(marketFloatProfitMap.value) - - console.log(`做市商浮动盈亏更新: account=${account_id}, float=${float_profit_loss}`) + } // ------------------ 持仓列表 ------------------ diff --git a/src/stores/modules/user.ts b/src/stores/modules/user.ts index 805ce38..29e3dc8 100644 --- a/src/stores/modules/user.ts +++ b/src/stores/modules/user.ts @@ -18,6 +18,7 @@ import type { UserInfo, MenuItem, PermissionItem } from '@/stores/types/user' import { formatMenuToElMenu, type ElMenuItem } from '@/utils/menuFormat' import { handleRouter, setRouter } from '@/router/handleRouter.ts' import { useTransactionStore } from './transaction' +import { useTabsStore } from './tabs' // 定义用户 Store export const useUserStore = defineStore('user', () => { @@ -81,6 +82,10 @@ export const useUserStore = defineStore('user', () => { // 断开 MQTT 连接 const transactionStore = useTransactionStore() transactionStore.disconnect() + + // 清空页签数据(重新登录后只保留固定页签) + const tabsStore = useTabsStore() + tabsStore.clearTabs() } /**