Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

shj

2022-04-12 185547d84110faeb341ca122a8e5c166a1f0681b

 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