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

ZengTao

2024-05-13 c85904597bf93e0fbae321093a970dd973b0f64f

 CanadaMes-ui/src/router/index.js

@@ -83,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')
      }



 

    ]
  }
@@ -95,7 +138,10 @@

const router = new VueRouter({
  // base: '/canadames/',  
  routes
  routes,
  meta:{
keepAlive:false
  }
});

// 路由控制守卫,解决需要登录才可以访问的页面
@@ -105,8 +151,6 @@

  // 获取token
  const hasToken = getToken();




  const isExist = Vue.prototype.$tagList.some(tag => tag.path === to.fullPath);