Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

ZengTao

2023-11-30 2f78ef164653d5d30732d6e2e3f822a68de63010

 CanadaMes-ui/src/router/index.js

@@ -107,23 +107,6 @@
        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')
      }




@@ -139,6 +122,8 @@
});

// 路由控制守卫,解决需要登录才可以访问的页面


router.beforeEach((to, from, next) => {
  // 如果访问的是登录或注册页面直接放行
  if (to.path === '/login' || to.path === '/register') return next();