From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突

---
 src/main.js |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main.js b/src/main.js
index ab48d7d..70f1d88 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,7 @@
 import swal from 'sweetalert'
 import Big from 'big.js'
 import VueBarcode from "vue-barcode";
+import Moment from 'moment'
 
 Vue.prototype.$Big = Big;
 
@@ -21,15 +22,19 @@
 //鏈湴
 // 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';
+// const javaApi = 'http://172.20.10.5:8001';
 
-// //閫氫俊娴嬭瘯搴�
+//閫氫俊娴嬭瘯搴�
 // Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
 // const javaApi = 'http://10.1.13.77:8001';
 
-//浜�
+// 閫氫俊姝ｅ紡搴�
+Vue.prototype.LOCATIONVUE = "http://10.193.45.63:8080";
+const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+
+// //浜�
 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
-// const javaApi = 'http://10.1.13.77/:1234';
+// const javaApi = 'http://114.132.189.42:1234';
 
 // //妫�娴嬩腑蹇冩寮忓簱
 // Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
@@ -44,6 +49,7 @@
 	return JSON.parse(JSON.stringify(val))
 }
 Vue.prototype.javaApi = javaApi
+Vue.prototype.$moment = Moment
 
 Vue.use(VueAxios, axios)
 Vue.config.productionTip = false

--
Gitblit v1.9.3