From 7be77bb648c8dc92539d02f4d678ff60b2d5f3db Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期四, 19 六月 2025 17:51:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main.js | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main.js b/src/main.js index ebd34ec..9bc0344 100644 --- a/src/main.js +++ b/src/main.js @@ -50,7 +50,8 @@ //琛ㄥ崟楠岃瘉 import { rules } from '@/utils/rules' import * as echarts from 'echarts' - +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; // 灏嗚嚜鍔ㄦ敞鍐屾墍鏈夌粍浠朵负鍏ㄥ眬缁勪欢 import dataV from '@jiaminghi/data-view' Vue.use(dataV) @@ -62,12 +63,13 @@ Vue.prototype.rules = rules Vue.config.productionTip = false Vue.use(Storage, config.storageOptions) -Vue.use(Antd) Vue.use(VueAxios, router) Vue.use(Viser) Vue.use(hasPermission) Vue.use(JDictSelectTag) Vue.use(Print) +Vue.use(ElementUI); +Vue.use(Antd) Vue.use(preview) Vue.use(vueBus); Vue.use(JeecgComponents); @@ -80,6 +82,9 @@ new Vue({ router, store, + beforeCreate() { + Vue.prototype.$bus = new Vue() + }, mounted () { store.commit('SET_SIDEBAR_TYPE', Vue.ls.get(SIDEBAR_TYPE, true)) store.commit('TOGGLE_THEME', Vue.ls.get(DEFAULT_THEME, config.navTheme)) -- Gitblit v1.9.3