From 8c2cab7124b183b86ac1a4f231e432da74d29a4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 31 十二月 2024 13:25:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main.js | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main.js b/src/main.js
index e9bae15..2aabee7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,8 @@
import api from './assets/api/controller.js'
import swal from 'sweetalert'
import Big from 'big.js'
+import VueBarcode from "vue-barcode";
+import Moment from 'moment'
Vue.prototype.$Big = Big;
@@ -18,17 +20,22 @@
Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
// Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
-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://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://10.1.13.77:8080";
// const javaApi = 'http://10.1.13.77:8001';
-//浜�
+// 閫氫俊姝ｅ紡搴�
+// Vue.prototype.LOCATIONVUE = "http://192.168.22.29:8080";
+// const javaApi = 'http://192.168.22.29:8001/lims/';
+const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+
+// //浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
-//const javaApi = 'http://114.132.189.42:1234';
+// const javaApi = 'http://114.132.189.42:1234';
// //妫�娴嬩腑蹇冩寮忓簱
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
@@ -43,12 +50,14 @@
return JSON.parse(JSON.stringify(val))
}
Vue.prototype.javaApi = javaApi
+Vue.prototype.$moment = Moment
Vue.use(VueAxios, axios)
Vue.config.productionTip = false
Vue.config.performance = true;
Vue.use(VueRouter);
Vue.use(ElementUI);
+Vue.component('barcode', VueBarcode)
Vue.use(qs);
Vue.use(api);
--
Gitblit v1.9.3