diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts index 4386b9a..ceaae68 100644 --- a/frontend/src/api/check/interface/index.ts +++ b/frontend/src/api/check/interface/index.ts @@ -144,8 +144,8 @@ export namespace CheckData { export enum ButtonColorEnum { INFO = '#909399', - LOADING = '#003078', - SUCCESS = '#67c23a', + LOADING = 'var(--el-color-primary)', + SUCCESS = '#91cc75', WARNING = '#e6a23c', DANGER = '#f56c6c', } diff --git a/frontend/src/config/index.ts b/frontend/src/config/index.ts index 6f96270..c269a4c 100644 --- a/frontend/src/config/index.ts +++ b/frontend/src/config/index.ts @@ -9,7 +9,6 @@ export const HOME_URL: string = "/home/index"; export const LOGIN_URL: string = "/login"; // 默认主题颜色 -//export const DEFAULT_PRIMARY: string = "#003078"; export const DEFAULT_PRIMARY: string = "#526ADE"; // 路由白名单地址(本地存在的路由 staticRouter.ts 中) @@ -20,3 +19,5 @@ export const AMAP_MAP_KEY: string = ""; // 百度地图 key export const BAIDU_MAP_KEY: string = ""; + + diff --git a/frontend/src/hooks/useTheme.ts b/frontend/src/hooks/useTheme.ts index 5d6c2ea..34f9185 100644 --- a/frontend/src/hooks/useTheme.ts +++ b/frontend/src/hooks/useTheme.ts @@ -27,6 +27,7 @@ export const useTheme = () => { // 修改主题颜色 const changePrimary = (val: string | null) => { + if (!val) { val = DEFAULT_PRIMARY; ElMessage({ type: "success", message: `主题颜色已重置为 ${DEFAULT_PRIMARY}` }); @@ -42,8 +43,7 @@ export const useTheme = () => { document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, primaryColor); } globalStore.setGlobalState("primary", val); - }; - + } // 灰色和弱色切换 const changeGreyOrWeak = (type: Theme.GreyOrWeakType, value: boolean) => { const body = document.body as HTMLElement; diff --git a/frontend/src/stores/modules/global.ts b/frontend/src/stores/modules/global.ts index 7446281..147a515 100644 --- a/frontend/src/stores/modules/global.ts +++ b/frontend/src/stores/modules/global.ts @@ -1,6 +1,6 @@ import { defineStore } from "pinia"; import { GlobalState } from "@/stores/interface"; -import { DEFAULT_PRIMARY } from "@/config"; +import { DEFAULT_PRIMARY} from "@/config"; import piniaPersistConfig from "@/stores/helper/persist"; import {GLOBAL_STORE_KEY} from "@/stores/constant"; @@ -42,6 +42,7 @@ export const useGlobalStore = defineStore({ tabsIcon: true, // 页脚 footer: false + }), getters: {}, actions: { diff --git a/frontend/src/utils/color.ts b/frontend/src/utils/color.ts index 88ebaac..abbc35a 100644 --- a/frontend/src/utils/color.ts +++ b/frontend/src/utils/color.ts @@ -37,6 +37,7 @@ export function rgbToHex(r: any, g: any, b: any) { * @returns {String} 返回处理后的颜色值 */ export function getDarkColor(color: string, level: number) { + let reg = /^\#?[0-9A-Fa-f]{6}$/; if (!reg.test(color)) return ElMessage.warning("输入错误的hex颜色值"); let rgb = hexToRgb(color); @@ -51,6 +52,7 @@ export function getDarkColor(color: string, level: number) { * @returns {String} 返回处理后的颜色值 */ export function getLightColor(color: string, level: number) { + let reg = /^\#?[0-9A-Fa-f]{6}$/; if (!reg.test(color)) return ElMessage.warning("输入错误的hex颜色值"); let rgb = hexToRgb(color); diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue index 45a76eb..80213f0 100644 --- a/frontend/src/views/home/components/channelsTest.vue +++ b/frontend/src/views/home/components/channelsTest.vue @@ -7,7 +7,7 @@