From ef408d6a8bbef12d1df69fd5b0ca61849ff25853 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 29 八月 2024 17:31:53 +0800
Subject: [PATCH] 设备新增bug修改

---
 src/main.js |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/main.js b/src/main.js
index 22a7fb8..e9bae15 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,13 +18,17 @@
 Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
 // Vue.prototype.PROJECT = '瑁呭鐢电紗'
 //鏈湴
-// Vue.prototype.LOCATIONVUE = "http://10.193.48.211:80";
-// const javaApi = 'http://10.193.48.211:8001';
+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://10.1.13.77:8080";
+// const javaApi = 'http://10.1.13.77:8001';
 
 //浜�
 // 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";
@@ -34,10 +38,6 @@
 // Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
 // const javaApi = 'http://10.16.173.59:8001';
 // const javaApi = 'http://192.168.92.249:8001';
-
-// 閫氫俊涓績姝e紡搴�
-// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-// const javaApi = 'http://10.1.13.77:8001';
 
 Vue.prototype.HaveJson = (val) => {
 	return JSON.parse(JSON.stringify(val))
@@ -130,19 +130,11 @@
 	return Promise.reject(err)
 })
 
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
 	if(to.path.indexOf('/test') == 0){
 		next()
 		return
 	}
-	// 娴疆绯荤粺鐧诲綍閫昏緫
-	// if(to.query.code) {
-	// 	await axios({
-	// 		url: javaApi + "/tide/tideLogin",
-	// 		method: 'post',
-	// 		data: {code: to.query.code}
-	// 	})
-	// }
   if (to.path.indexOf('/enter') != 0) {
     if (sessionStorage.getItem('token') == null || sessionStorage.getItem('token') == '' || sessionStorage.getItem(
         'token') == undefined) {
@@ -163,3 +155,4 @@
     Vue.prototype.$bus = this
   }
 });
+

--
Gitblit v1.9.3