From dd929871969c4275eeb3246d7c5c0d6f35060b10 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 31 十二月 2024 14:52:47 +0800
Subject: [PATCH] 接口文件冲突

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

diff --git a/src/main.js b/src/main.js
index 1ce1506..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;
 
@@ -20,10 +22,18 @@
 //鏈湴
 // Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
 // const javaApi = 'http://127.0.0.1:8001';
-// 寮狅細192.168.45.249
-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://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';
 
@@ -34,17 +44,20 @@
 //瑁呭鐢电紗娴嬭瘯搴�
 // Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
 // const javaApi = 'http://10.16.173.59:8001';
-// const javaApi = 'http://192.168.47.2: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);
 
@@ -151,3 +164,4 @@
     Vue.prototype.$bus = this
   }
 });
+

--
Gitblit v1.9.3