diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue index 6414eaab..7f3b0213 100644 --- a/src/components/DictTag/src/DictTag.vue +++ b/src/components/DictTag/src/DictTag.vue @@ -4,7 +4,8 @@ import { isHexColor } from '@/utils/color' import { ElTag } from 'element-plus' import { DictDataType, getDictOptions } from '@/utils/dict' import { isArray, isBoolean, isNumber, isString } from '@/utils/is' - +import {useLocaleStoreWithOut} from "@/store/modules/locale"; +const localeStore = useLocaleStoreWithOut() export default defineComponent({ name: 'DictTag', props: { @@ -68,6 +69,7 @@ export default defineComponent({ if (dict.colorType + '' === 'primary' || dict.colorType + '' === 'default') { dict.colorType = '' } + const label = localeStore.getCurrentLocale?.lang === 'en' ? (dict.labelEn || dict.label) : dict.label return ( // 添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题 - {dict?.label} + {label} ) } diff --git a/src/permission.ts b/src/permission.ts index 8201e1d6..427ae0a1 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -79,7 +79,9 @@ const whiteList = [ '/auth-redirect', '/bind', '/register', - '/oauthLogin/gitee' + '/oauthLogin/gitee', + '/iot/report/dashboardPage/Dashboard8', + '/iot/report/dashboardPage/Dashboard1' ] // 路由加载前 diff --git a/src/views/erp/autocode/AutocodeIndex.vue b/src/views/erp/autocode/AutocodeIndex.vue index d3e06ba6..1154d1e6 100644 --- a/src/views/erp/autocode/AutocodeIndex.vue +++ b/src/views/erp/autocode/AutocodeIndex.vue @@ -98,8 +98,8 @@ - - + + - + diff --git a/src/views/mold/moldrepair/index.vue b/src/views/mold/moldrepair/index.vue index b0313e17..631dfdda 100644 --- a/src/views/mold/moldrepair/index.vue +++ b/src/views/mold/moldrepair/index.vue @@ -107,12 +107,12 @@ - + - + diff --git a/src/views/mold/taskConfiguration/index.vue b/src/views/mold/taskConfiguration/index.vue index 07624bc4..00a2df8d 100644 --- a/src/views/mold/taskConfiguration/index.vue +++ b/src/views/mold/taskConfiguration/index.vue @@ -69,7 +69,7 @@ > - +