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 |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main.js b/src/main.js
index c2ad3a4..e11ae3b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,18 +12,24 @@
 import swal from 'sweetalert'
 
 // 椤圭洰鍒囨崲
-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://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))

--
Gitblit v1.9.3