Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-04-08 a78c0264070e049eaca9b8fcfd180df217b7d4ab

 src/permission.js

@@ -17,7 +17,7 @@
  return roles.some(role => permissionRoles.indexOf(role) >= 0)
}

const whiteList = ['/login', '/auth-redirect','/agreement','/register'] // no redirect whitelist
const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/equipmentAlarm'] // no redirect whitelist

router.beforeEach((to, from, next) => {
  NProgress.start() // start progress bar