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

clll

2023-11-27 1ebc598658f85c07c7cbabaf289ab89838a8acc9

 CanadaMes-ui/src/router/index.js

@@ -35,6 +35,7 @@
      },



      {
        path: '/power',
        component: () => import('../views/power')
@@ -48,6 +49,7 @@
        component: () => import('../views/device/parameter'),

      },

      {
        path: '/device/alarm',
        component: () => import('../views/device/alarm')
@@ -56,6 +58,7 @@
        path: '/device/iostate',
        component: () => import('../views/device/iostate')
      },

      {
        path: '/device/control',
        component: () => import('../views/device/control')
@@ -76,6 +79,50 @@
        path: '/Electrical/State',
        component: () => import('../views/Electrical/State')
      },
      {
        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')
      }



@@ -84,7 +131,10 @@
  }
];



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

@@ -96,6 +146,18 @@
  // 获取token
  const hasToken = getToken();




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

  if (!isExist) {
    Vue.prototype.$tagList.push({
      path: to.fullPath,
      data: null
    });
  }

  // 没有token则跳转到登录页面
  if (!hasToken) return next('/login');