From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/main.js | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/main.js b/UI-Project/src/main.js
index fe656ab..276e058 100644
--- a/UI-Project/src/main.js
+++ b/UI-Project/src/main.js
@@ -6,22 +6,31 @@
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'
+// import Echarts from "vue-echarts"
+import * as echarts from "echarts"
+// echarts.registerMap('china', china)
+// Vue.prototype.$echarts = echarts
+// app.component("v-chart", Echarts)
+// app.config.globalProperties.$echarts = echarts
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+
const app = createApp(App)
+for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+ app.component(key, component)
+}
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.mount('#app')
\ No newline at end of file
+app.use(i18n)
+app.mount('#app')
--
Gitblit v1.8.0