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

cqf

2022-05-13 3606a96b3e06b63936db0b04ed73fda13379bb51

 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', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/exist'] // no redirect whitelist

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