From 7ed5f33e7bd9ca26fb41700e518234b973841921 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: 星期三, 24 四月 2024 22:30:52 +0800 Subject: [PATCH] !107 add 新增岗位编码与部门编码 并将岗位放到部门下 * add 新增获取岗位选择框列表 * update 岗位查询树表和单表相互undefined * update 岗位查询增加单部门查询 * update 优化类别编码与后台一致性 * add 新增岗位部门树以及类别编码 * add 部门增加类别代码 --- src/lang/index.ts | 38 ++++++++++---------------------------- 1 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/lang/index.ts b/src/lang/index.ts index 8fdf19e..e4e1d25 100644 --- a/src/lang/index.ts +++ b/src/lang/index.ts @@ -1,42 +1,24 @@ // 鑷畾涔夊浗闄呭寲閰嶇疆 import { createI18n } from 'vue-i18n'; -// 鏈湴璇█鍖� -import enLocale from './en'; -import zhCnLocale from './zh-cn'; -import Cookies from 'js-cookie'; - -const messages = { - 'zh-cn': { - ...zhCnLocale - }, - en: { - ...enLocale - } -}; +import { LanguageEnum } from '@/enums/LanguageEnum'; +import messages from '@intlify/unplugin-vue-i18n/messages'; /** - * 鑾峰彇褰撳墠绯荤粺浣跨敤璇█瀛楃涓� + * 鑾峰彇褰撳墠璇█ * @returns zh-cn|en ... */ -export const getLanguage = () => { - // 鏈湴缂撳瓨鑾峰彇 - let language = Cookies.get('language'); - if (language) { - return language; +export const getLanguage = (): LanguageEnum => { + const language = useStorage<LanguageEnum>('language', LanguageEnum.zh_CN); + if (language.value) { + return language.value; } - // 娴忚鍣ㄤ娇鐢ㄨ瑷� - language = navigator.language.toLowerCase(); - const locales = Object.keys(messages); - for (const locale of locales) { - if (language.indexOf(locale) > -1) { - return locale; - } - } - return 'zh-cn'; + return LanguageEnum.zh_CN; }; const i18n = createI18n({ + globalInjection: true, + allowComposition: true, legacy: false, locale: getLanguage(), messages -- Gitblit v1.9.3