From d33acff5eaafe9ab6dc78a01f0b00d43c73833a5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 16 五月 2024 17:41:39 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/main.js | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main.js b/src/main.js
index ac9c023..580b072 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,11 +12,17 @@
import swal from 'sweetalert'
//鏈湴
-// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://localhost:8001';
+Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+// const javaApi = 'http://192.168.11.200:8001';//鏉�
+// const javaApi = 'http://10.20.102.168:8001';//寮�
+// const javaApi = 'http://172.20.10.3:8001';//濮�
+// const javaApi = 'http://192.168.11.2:8001';//鏌�
+ const javaApi = 'http://127.0.0.1:8001';//鏅�
+// const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
-Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
-const javaApi = 'http://122.114.52.69:8001';
+// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
+// const javaApi = 'http://122.114.52.69:8001';
+
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
}
@@ -104,6 +110,10 @@
})
router.beforeEach((to, from, next) => {
+ if(to.path.indexOf('/test') == 0){
+ next()
+ return
+ }
if (to.path.indexOf('/enter') != 0) {
if (sessionStorage.getItem('token') == null || sessionStorage.getItem('token') == '' || sessionStorage.getItem(
'token') == undefined) {
@@ -118,5 +128,9 @@
new Vue({
el: '#app',
router,
- render: h => h(App)
+ render: h => h(App),
+ beforeCreate() {
+ // 闇�瑕佸湪鍏ㄥ眬娣诲姞涓�涓睘鎬�
+ Vue.prototype.$bus = this
+ }
});
--
Gitblit v1.9.3