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

lyfO_o

2022-05-24 f15b467c2233ba069459c809fffbe994692e3315

 src/permission.js

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

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

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