From cfd9f0b05e4e9b46c4d72ec5cefd3c04648648ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 02 九月 2024 08:11:23 +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 8ac785a..166ffa7 100644
--- a/UI-Project/src/main.js
+++ b/UI-Project/src/main.js
@@ -12,8 +12,9 @@
 import 'vxe-table/lib/style.css'
 import i18n from '@/lang'
 // import Echarts from "vue-echarts"
-// import * as echarts from "echarts"
-
+import * as echarts from "echarts"
+// echarts.registerMap('china', china)
+// Vue.prototype.$echarts = echarts
 // app.component("v-chart", Echarts)
 // app.config.globalProperties.$echarts = echarts
 const app = createApp(App)
@@ -22,10 +23,9 @@
 app.use(VXETable)
 app.use(pinia)
 app.use(router)
-app.use(ElementPlus)
+// app.use(ElementPlus)
 app.use(ElementPlus,{
     locale: zhCn,
 })
 app.use(i18n)
- 
-app.mount('#app')
\ No newline at end of file
+app.mount('#app')

--
Gitblit v1.8.0