diff --git a/frontend/src/hooks/useTheme.ts b/frontend/src/hooks/useTheme.ts index 34f9185..7746aba 100644 --- a/frontend/src/hooks/useTheme.ts +++ b/frontend/src/hooks/useTheme.ts @@ -41,8 +41,12 @@ export const useTheme = () => { for (let i = 1; i <= 9; i++) { const primaryColor = isDark.value ? `${getDarkColor(val, i / 10)}` : `${getLightColor(val, i / 10)}`; document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, primaryColor); + + // const colorValue = document.documentElement.style.getPropertyValue(`--el-color-primary-light-${i}`).trim(); + // console.log(`--el-color-primary-light-${i}: ${colorValue}`); } globalStore.setGlobalState("primary", val); + } // 灰色和弱色切换 const changeGreyOrWeak = (type: Theme.GreyOrWeakType, value: boolean) => { diff --git a/frontend/src/languages/modules/en.ts b/frontend/src/languages/modules/en.ts index 8653fb0..38347f7 100644 --- a/frontend/src/languages/modules/en.ts +++ b/frontend/src/languages/modules/en.ts @@ -26,6 +26,7 @@ export default { changePassword: "Change Password", changeMode:"Change Mode", versionRegister:"Version Register", + changeTheme: "Change Theme", logout: "Logout" } }; diff --git a/frontend/src/languages/modules/zh.ts b/frontend/src/languages/modules/zh.ts index ea95310..6248c72 100644 --- a/frontend/src/languages/modules/zh.ts +++ b/frontend/src/languages/modules/zh.ts @@ -26,6 +26,7 @@ export default { changePassword: "修改密码", changeMode:"模式切换", versionRegister:"版本注册", + changeTheme:"主题切换", logout: "退出登录" } }; diff --git a/frontend/src/layouts/LayoutTransverse/index.scss b/frontend/src/layouts/LayoutTransverse/index.scss index 8e87766..b746ab5 100644 --- a/frontend/src/layouts/LayoutTransverse/index.scss +++ b/frontend/src/layouts/LayoutTransverse/index.scss @@ -40,7 +40,7 @@ .el-menu-item:hover { color: #fff; //一级导航划过颜色 //background-color: #5274a5 !important; //一级导航划过背景色 - background-color: #7588e5 !important; + background-color:var(--el-color-primary-light-3) !important; } .el-sub-menu__hide-arrow { @@ -50,7 +50,7 @@ .el-menu-item.is-active { color: #fff !important; //一级导航文字选中颜色 //background-color: #5274a5 !important; //一级导航选中背景色 - background-color: #7588e5 !important; + background-color: var(--el-color-primary-light-3) !important; border-bottom: 0 !important; } @@ -72,8 +72,8 @@ // background-color: var(--el-color-primary) !important; // background-color: #5274a5 !important;//二级导航选中背景色 - background-color: #7588e5 !important; - + //background-color: #7588e5 !important; + background-color: var(--el-color-primary-light-3) !important; border-bottom-color: var(--el-color-primary) !important; } } diff --git a/frontend/src/layouts/components/Header/components/Avatar.vue b/frontend/src/layouts/components/Header/components/Avatar.vue index 4e3a32c..c74e29a 100644 --- a/frontend/src/layouts/components/Header/components/Avatar.vue +++ b/frontend/src/layouts/components/Header/components/Avatar.vue @@ -18,17 +18,20 @@ @@ -42,6 +45,9 @@ + + + + \ No newline at end of file diff --git a/frontend/src/layouts/components/Menu/SubMenu.vue b/frontend/src/layouts/components/Menu/SubMenu.vue index 4f1ef3b..26cb765 100644 --- a/frontend/src/layouts/components/Menu/SubMenu.vue +++ b/frontend/src/layouts/components/Menu/SubMenu.vue @@ -35,7 +35,7 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => { color: #fff !important;//一级导航文字选中颜色 //background-color: #5274a5 !important; //一级导航选中背景色 - background-color: #7588e5 !important; + background-color: var(--el-color-primary-light-3) !important; } .el-menu--collapse { @@ -44,7 +44,7 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => { color: #ffffff !important; // background-color: var(--el-color-primary) !important; //background-color: #5274a5 !important; - background-color: #7588e5 !important; + background-color: var(--el-color-primary-light-3) !important; border-bottom: 0 !important; } @@ -59,7 +59,7 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => { // background-color: var(--el-menu-active-bg-color) !important; color: #fff !important;//一级导航文字选中颜色 //background-color: #5274a5 !important; //一级导航选中背景色 - background-color: #7588e5 !important; + background-color: var(--el-color-primary-light-3) !important; &::before { position: absolute; diff --git a/frontend/src/layouts/components/ThemeDrawer/index.scss b/frontend/src/layouts/components/ThemeDrawer/index.scss index c82209c..37af5fb 100644 --- a/frontend/src/layouts/components/ThemeDrawer/index.scss +++ b/frontend/src/layouts/components/ThemeDrawer/index.scss @@ -46,7 +46,7 @@ border-radius: 3px; } .layout-light { - background-color: var(--el-color-primary-light-5); + background-color: var(--el-color-primary-light-3); border-radius: 3px; } .layout-content { diff --git a/frontend/src/stores/modules/global.ts b/frontend/src/stores/modules/global.ts index 147a515..613b6ae 100644 --- a/frontend/src/stores/modules/global.ts +++ b/frontend/src/stores/modules/global.ts @@ -31,7 +31,7 @@ export const useGlobalStore = defineStore({ // 折叠菜单 isCollapse: false, // 菜单手风琴 - accordion: true, + accordion: false, // 面包屑导航 breadcrumb: true, // 面包屑导航图标 @@ -49,6 +49,7 @@ export const useGlobalStore = defineStore({ // Set GlobalState setGlobalState(...args: ObjToKeyValArray) { this.$patch({ [args[0]]: args[1] }); + console.log(DEFAULT_PRIMARY); } }, persist: piniaPersistConfig(GLOBAL_STORE_KEY) diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue index c49c06c..528c88e 100644 --- a/frontend/src/views/home/tabs/dashboard.vue +++ b/frontend/src/views/home/tabs/dashboard.vue @@ -168,7 +168,7 @@ const handleTabsChange = (val: any) => { form.value.activeChildTabs = Number(val) } -localStorage.setItem('color', 'red') +localStorage.setItem('color', '#91cc75') //功能选择数据 const tabsList = ref([ {