From 75375a0f68c8b91799482dc1cd2ec7d7f211167f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 31 五月 2024 09:28:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/router/index.js | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/CanadaMes-ui/src/router/index.js b/CanadaMes-ui/src/router/index.js
index 27246f5..d65b7da 100644
--- a/CanadaMes-ui/src/router/index.js
+++ b/CanadaMes-ui/src/router/index.js
@@ -107,8 +107,28 @@
path: '/Electrical/Positioning2',
component: () => import('../views/Electrical/Positioning2')
},
+ {
+ path: '/Electrical/ManualonePosition',
+ component: () => import('../views/Electrical/ManualonePosition')
+ },
+ {
+ path: '/Electrical/ManualonePosition2',
+ component: () => import('../views/Electrical/ManualonePosition2')
+ },
+ {
+ path: '/Electrical/AutomaticParameterSetting',
+ component: () => import('../views/Electrical/AutomaticParameterSetting')
+ },
+ {
+ path: '/Electrical/ManualJog',
+ component: () => import('../views/Electrical/ManualJog')
+ },
+ {
+ path: '/Electrical/InteractionState',
+ component: () => import('../views/Electrical/InteractionState')
+ }
-
+
]
}
@@ -118,20 +138,19 @@
const router = new VueRouter({
// base: '/canadames/',
- routes
+ routes,
+ meta:{
+keepAlive:false
+ }
});
// 璺敱鎺у埗瀹堝崼,瑙ｅ喅闇�瑕佺櫥褰曟墠鍙互璁块棶鐨勯〉闈�
-
-
router.beforeEach((to, from, next) => {
// 濡傛灉璁块棶鐨勬槸鐧诲綍鎴栨敞鍐岄〉闈㈢洿鎺ユ斁琛�
if (to.path === '/login' || to.path === '/register') return next();
// 鑾峰彇token
const hasToken = getToken();
-
-
const isExist = Vue.prototype.$tagList.some(tag => tag.path === to.fullPath);
--
Gitblit v1.8.0