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

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

diff --git a/src/main.js b/src/main.js
index aec0653..d3987dd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,8 +15,8 @@
 Vue.prototype.$Big = Big;
 
 // 椤圭洰鍒囨崲
-Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
-// Vue.prototype.PROJECT = '瑁呭鐢电紗'
+// Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
+Vue.prototype.PROJECT = '瑁呭鐢电紗'
 //鏈湴
 // Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
 // const javaApi = 'http://127.0.0.1:8001';
@@ -26,13 +26,14 @@
 // 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.1.200.86:8080";
+// const javaApi = 'http://10.1.200.86:8001';
 
 //瑁呭鐢电紗娴嬭瘯搴�
-// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
+Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
 // const javaApi = 'http://10.16.173.59:8001';
+const javaApi = 'http://192.168.47.2:8001';
 
 Vue.prototype.HaveJson = (val) => {
 	return JSON.parse(JSON.stringify(val))

--
Gitblit v1.9.3