From 20adcd9881c91be3ccbefe93c99a4c71b35ac942 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 19 六月 2024 14:30:37 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/main.js | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main.js b/src/main.js
index 41bde4c..e11ae3b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,16 +11,25 @@
import api from './assets/api/controller.js'
import swal from 'sweetalert'
+// 椤圭洰鍒囨崲
+Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
+// Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
-Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-const javaApi = 'http://192.168.0.161:8001';//鏉�
-// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
-//鑳滀簯鏈嶅姟鍣�
-// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
-// const javaApi = 'http://122.114.52.69:8001';
-//浜戞湇鍔″櫒
-// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:39901";
-// const javaApi = 'http://114.132.189.42:9006';
+// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+// const javaApi = 'http://127.0.0.1:8001';
+// const javaApi = 'http://192.168.0.104:8001';
+
+//浜�
+// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
+// const javaApi = 'http://114.132.189.42:1234';
+
+//妫�娴嬩腑蹇冩寮忓簱
+Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
+const javaApi = 'http://10.1.200.86:8001';
+
+//瑁呭鐢电紗娴嬭瘯搴�
+// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
+// const javaApi = 'http://10.16.173.59:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
@@ -67,7 +76,11 @@
axios.interceptors.response.use(res => {
if(res.data.code === 201){
- Message.error(res.data.message)
+ Message({
+ type: 'error',
+ dangerouslyUseHTMLString: true,
+ message: `${res.data.message}`
+ })
}
return res.data
}, async function(err) {
@@ -127,5 +140,9 @@
new Vue({
el: '#app',
router,
- render: h => h(App)
+ render: h => h(App),
+ beforeCreate() {
+ // 闇�瑕佸湪鍏ㄥ眬娣诲姞涓�涓睘鎬�
+ Vue.prototype.$bus = this
+ }
});
--
Gitblit v1.9.3