From 7f2f8a92e0698e2257fab89590b47c8dbdda47bb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 15:52:16 +0800
Subject: [PATCH] 合并调整
---
src/main.js | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main.js b/src/main.js
index e9bae15..2e86d84 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,21 @@
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://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';
+// const javaApi = 'http://114.132.189.42:1234';
// //妫�娴嬩腑蹇冩寮忓簱
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
@@ -43,12 +49,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