From 3845f43c43252185a134566a63670de9d1c2d253 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 28 十月 2024 15:06:45 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/main.js | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main.js b/src/main.js
index 02eed56..fc53eef 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,7 @@
import api from './assets/api/controller.js'
import swal from 'sweetalert'
import Big from 'big.js'
+import VueBarcode from "vue-barcode";
Vue.prototype.$Big = Big;
@@ -20,14 +21,27 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://192.168.92.2: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 = "https://ztwxlims.ztt.cn:7443";
+// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+
+// 閫氫俊姝ｅ紡搴�
+Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
+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://10.1.13.77/:1234';
// //妫�娴嬩腑蹇冩寮忓簱
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
-const javaApi = 'http://10.1.200.86:8001';
+// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
@@ -44,6 +58,7 @@
Vue.config.performance = true;
Vue.use(VueRouter);
Vue.use(ElementUI);
+Vue.component('barcode', VueBarcode)
Vue.use(qs);
Vue.use(api);
--
Gitblit v1.9.3