From 6be6a7f6225da2160e44c2a98192abbc05577294 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 27 十二月 2024 13:28:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cnas' into master
---
src/main.js | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main.js b/src/main.js
index c684668..548dc3a 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;
@@ -20,29 +22,41 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.47.249: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://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';
+// const javaApi = 'http://192.168.92.249:8001';
Vue.prototype.HaveJson = (val) => {
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);
@@ -149,3 +163,4 @@
Vue.prototype.$bus = this
}
});
+
--
Gitblit v1.9.3