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 | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/CanadaMes-ui/src/router/index.js b/CanadaMes-ui/src/router/index.js
index a4d9ebf..d65b7da 100644
--- a/CanadaMes-ui/src/router/index.js
+++ b/CanadaMes-ui/src/router/index.js
@@ -33,6 +33,7 @@
path: '/home',
component: () => import('../views/home')
},
+
{
@@ -48,11 +49,7 @@
component: () => import('../views/device/parameter'),
},
- {
- path: '/device/talk',
- component: () => import('../views/device/talkvue'),
-
- },
+
{
path: '/device/alarm',
component: () => import('../views/device/alarm')
@@ -61,10 +58,7 @@
path: '/device/iostate',
component: () => import('../views/device/iostate')
},
- {
- path: '/device/talkvue',
- component: () => import('../views/device/talkvue')
- },
+
{
path: '/device/control',
component: () => import('../views/device/control')
@@ -89,9 +83,52 @@
path: '/Electrical/alarm',
component: () => import('../views/Electrical/alarm')
},
+ {
+ path: '/Electrical/Servomanual',
+ component: () => import('../views/Electrical/Servomanual')
+ },
+ {
+ path: '/Electrical/ServoManualone',
+ component: () => import('../views/Electrical/ServoManualone')
+ },
+ {
+ path: '/Electrical/Parameter1',
+ component: () => import('../views/Electrical/Parameter1')
+ },
+ {
+ path: '/Electrical/Parameter2',
+ component: () => import('../views/Electrical/Parameter2')
+ },
+ {
+ path: '/Electrical/Positioning1',
+ component: () => import('../views/Electrical/Positioning1')
+ },
+ {
+ 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')
+ }
-
-
+
]
}
@@ -101,7 +138,10 @@
const router = new VueRouter({
// base: '/canadames/',
- routes
+ routes,
+ meta:{
+keepAlive:false
+ }
});
// 璺敱鎺у埗瀹堝崼,瑙ｅ喅闇�瑕佺櫥褰曟墠鍙互璁块棶鐨勯〉闈�
@@ -111,8 +151,6 @@
// 鑾峰彇token
const hasToken = getToken();
-
-
const isExist = Vue.prototype.$tagList.some(tag => tag.path === to.fullPath);
--
Gitblit v1.8.0