From 6f271cc93b7992ae4613ac2fe2dad81c34630296 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 16:46:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/main.js | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/CanadaMes-ui/src/main.js b/CanadaMes-ui/src/main.js
index 8d19ac5..a6bc365 100644
--- a/CanadaMes-ui/src/main.js
+++ b/CanadaMes-ui/src/main.js
@@ -2,24 +2,34 @@
import App from './App.vue'
import router from './router'
import ElementUI, {Message, MessageBox} from 'element-ui';
+import locale from 'element-ui/lib/locale/lang/en' // lang i18n
+
import 'element-ui/lib/theme-chalk/index.css';
// 瀵煎叆鍏ㄥ眬鏍峰紡琛�
import './assets/css/global.css'
import VueI18n from 'vue-i18n'
import zhCN from './lang/locales/zh-CN.json' // 涓枃璇█鍖�
import enUS from './lang/locales/en-US.json' // 鑻辨枃璇█鍖�
+//import websocketPlugin from './api/websocketPlugin'; // 寮曞叆鎻掍欢鏂囦欢
+// import store from './store'
+// import store from './store'
Vue.use(VueI18n)
+// Vue.use(websocketPlugin, {
+// ip: 'localhost', // 鏇挎崲鎴愪綘鐨� WebSocket 鏈嶅姟鍣� IP 鍦板潃
+// });
const i18n = new VueI18n({
- locale: 'zh-CN', // 璁剧疆榛樿璇█涓轰腑鏂�
+ locale: 'en-US',
messages: {
'zh-CN': zhCN, // 娉ㄥ唽涓枃璇█鍖�
'en-US': enUS // 娉ㄥ唽鑻辨枃璇█鍖�
}
})
-Vue.use(ElementUI);
+const EventBus = new Vue();
+Vue.prototype.$bus = EventBus;
+Vue.use(ElementUI,{locale});
Vue.config.productionTip = false;
@@ -27,9 +37,11 @@
Vue.prototype.$message = Message;
// confirm
Vue.prototype.$confirm = MessageBox.confirm;
-
+Vue.prototype.$tagList = [];
new Vue({
router,
i18n,
+ // store,
+
render: h => h(App)
}).$mount('#app');
--
Gitblit v1.8.0