diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue index 92ab5f9d..d029fac1 100644 --- a/src/components/Layout/BasicLayoutPage.vue +++ b/src/components/Layout/BasicLayoutPage.vue @@ -61,7 +61,7 @@ const layoutConf = reactive({ siderWidth: layout.value.siderWidth, logo: DefaultSetting.layout.logo, title: DefaultSetting.layout.title, - menuData: [...menu.siderMenus, AccountMenu], + menuData: menu.siderMenus, // menuData: menu.siderMenus, splitMenus: true, }); diff --git a/src/store/menu.ts b/src/store/menu.ts index ed6839cb..ab33fa91 100644 --- a/src/store/menu.ts +++ b/src/store/menu.ts @@ -123,7 +123,7 @@ export const useMenuStore = defineStore({ }) // console.log(menusData) // menusData.push(AccountMenu) - this.siderMenus = silderMenus.filter((item: { name: string }) => ![USER_CENTER_MENU_CODE, NotificationRecordCode, NotificationSubscriptionCode].includes(item.name)) + this.siderMenus = silderMenus res(menusData) } }) diff --git a/src/utils/menu.ts b/src/utils/menu.ts index b34a4c8b..273d5755 100644 --- a/src/utils/menu.ts +++ b/src/utils/menu.ts @@ -472,7 +472,7 @@ export const handleMenusMap = (menuData: any[], cb: (data: any) => void) => { } const hideInMenu = (code: string) => { - return ['account-center', 'message-subscribe'].includes(code) + return ['account-center', 'account-center', 'message-subscribe'].includes(code) } export const handleSiderMenu = (menuData: any[]) => { diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/item.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/item.vue index 7dcbdc7e..09d0b469 100644 --- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/item.vue +++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/item.vue @@ -7,7 +7,7 @@ @change="change" /> + +