From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/main.js | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/main.js b/src/main.js
index e0e4031..e69859f 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.11.200:8001';//鏉�
-// const javaApi = 'http://192.168.11.249:8001';//寮�
-const javaApi = 'http://172.20.10.3:8001';//濮�
-// const javaApi = 'http://192.168.11.2: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://127.0.0.1:80";
+// const javaApi = 'http://127.0.0.1:8001';
+// const javaApi = 'http://192.168.47.249: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))
@@ -54,10 +63,10 @@
// config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
// config.headers['Content-Type'] = 'application/json'
}
- if (config.method === 'post' || config.method === 'put') {
+ if ((config.method === 'post' || config.method === 'put')&&!config.noQs) {
config.data = qs.stringify(config.data)
}
- if (config.headers['Content-Type'] == 'application/json') {
+ if (config.headers['Content-Type'] == 'application/json'&&!config.noQs) {
config.data = qs.parse(config.data)
}
return config
@@ -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) {
--
Gitblit v1.9.3