From 5a84728f49a5c708d21212b1a395bd62684efd48 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 六月 2024 14:06:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/main.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/main.js b/UI-Project/src/main.js
index fe656ab..b8b328b 100644
--- a/UI-Project/src/main.js
+++ b/UI-Project/src/main.js
@@ -6,22 +6,22 @@
import App from './App.vue'
import router from './router'
import ElementPlus from 'element-plus'
-import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import 'element-plus/dist/index.css'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'
-// import i18n from './lang/i18n'
-
-
+import i18n from '@/lang'
+
const app = createApp(App)
const pinia = createPinia()
pinia.use(piniaPluginPersistedstate )
-// app.use(i18n)
app.use(VXETable)
app.use(pinia)
app.use(router)
+app.use(ElementPlus)
app.use(ElementPlus,{
locale: zhCn,
})
+app.use(i18n)
app.mount('#app')
\ No newline at end of file
--
Gitblit v1.8.0