From 39b0abc198534c9b69ac6d5969b12e7d76dd5e1d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 11 七月 2024 12:49:37 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

---
 src/main.js |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main.js b/src/main.js
index c48e4e1..db962ce 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,20 +10,29 @@
 import axios from 'axios'
 import api from './assets/api/controller.js'
 import swal from 'sweetalert'
+import Big from 'big.js'
+
+Vue.prototype.$Big = Big;
 
 // 椤圭洰鍒囨崲
-Vue.prototype.PROJECT = '妫�娴嬩腑蹇�' //椤圭洰鍚嶇О锛氭娴嬩腑蹇冦�佽澶囩數缂�
+// Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
+Vue.prototype.PROJECT = '瑁呭鐢电紗'
 //鏈湴
-Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://192.168.144.200:8001';//鏉�
-// const javaApi = 'http://192.168.11.249: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';
-// const javaApi = 'http://10.1.200.86:8001';//姝e紡鏈�
+// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+// const javaApi = 'http://127.0.0.1:8001';
+// const javaApi = 'http://172.20.10.5: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))
@@ -57,10 +66,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

--
Gitblit v1.9.3