修改终止任务功能

ZengTao

2023-12-20 4142b96426da5346f5e2143a54775dbe5b154d2c

 CanadaMes-ui/src/router/index.js

@@ -33,6 +33,7 @@
        path: '/home',
        component: () => import('../views/home')
      },
      


      {
@@ -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,7 +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,8 +130,14 @@
  }
];



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

// 路由控制守卫,解决需要登录才可以访问的页面
@@ -96,6 +148,16 @@
  // 获取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');