From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/main.js | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main.js b/src/main.js
index 8bc9dcf..bcb24ed 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,11 +51,29 @@
import { rules } from '@/utils/rules'
import * as echarts from 'echarts'
import qs from 'qs'
-import VCalendar from 'v-calendar'; // 寮曞叆鏃ュ巻鎻掍欢
+// import VCalendar from 'v-calendar'; // 寮曞叆鏃ュ巻鎻掍欢
+//
+// Vue.use(VCalendar, {
+// componentPrefix: 'vc',
+// });
-Vue.use(VCalendar, {
- componentPrefix: 'vc',
-});
+//娉ㄥ叆鍏ㄥ眬灞炴��$message
+import { message, notification } from 'ant-design-vue'
+Vue.prototype.$message = message
+Vue.prototype.$notification = notification
+message.config({
+})
+notification.config({
+ bottom: '20px',
+ right: '100px'
+})
+
+// 灏嗚嚜鍔ㄦ敞鍐屾墍鏈夌粍浠朵负鍏ㄥ眬缁勪欢
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
+import VueDragResize from "vue-drag-resize"
+Vue.component('vue-drag-resize', VueDragResize)
// import 'echarts-liquidfill'
Vue.prototype.$echarts = echarts
@@ -81,7 +99,10 @@
new Vue({
router,
store,
- mounted () {
+ 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))
store.commit('TOGGLE_LAYOUT_MODE', Vue.ls.get(DEFAULT_LAYOUT_MODE, config.layout))
@@ -92,7 +113,7 @@
store.commit('TOGGLE_WEAK', Vue.ls.get(DEFAULT_COLOR_WEAK, config.colorWeak))
store.commit('TOGGLE_COLOR', Vue.ls.get(DEFAULT_COLOR, config.primaryColor))
store.commit('SET_TOKEN', Vue.ls.get(ACCESS_TOKEN))
- store.commit('SET_MULTI_PAGE',Vue.ls.get(DEFAULT_MULTI_PAGE,config.multipage))
+ store.commit('SET_MULTI_PAGE', Vue.ls.get(DEFAULT_MULTI_PAGE, config.multipage))
},
render: h => h(App)
}).$mount('#app')
--
Gitblit v1.9.3