diff --git a/jero-web/src/store/modules/online.js b/jero-web/src/store/modules/online.js index f2f74410..15cbfed9 100644 --- a/jero-web/src/store/modules/online.js +++ b/jero-web/src/store/modules/online.js @@ -1,6 +1,4 @@ import Vue from 'vue' -import { ONL_AUTH_FIELDS } from '@/store/mutation-types' -import { getAction } from '@/api/manage' const online = { state: { diff --git a/jero-web/src/store/modules/permission.js b/jero-web/src/store/modules/permission.js index 9077d122..f0206f68 100644 --- a/jero-web/src/store/modules/permission.js +++ b/jero-web/src/store/modules/permission.js @@ -38,7 +38,7 @@ function hasRole(roles, route) { } function filterAsyncRouter (routerMap, roles) { - const accessedRouters = routerMap.filter(route => { + return routerMap.filter(route => { if (hasPermission(roles.permissionList, route)) { if (route.children && route.children.length) { route.children = filterAsyncRouter(route.children, roles) @@ -47,7 +47,6 @@ function filterAsyncRouter (routerMap, roles) { } return false }) - return accessedRouters } const permission = { @@ -65,8 +64,7 @@ const permission = { GenerateRoutes ({ commit }, data) { return new Promise(resolve => { const { roles } = data - let accessedRouters - accessedRouters = filterAsyncRouter(asyncRouterMap, roles) + const accessedRouters = filterAsyncRouter(asyncRouterMap, roles) commit('SET_ROUTERS', accessedRouters) resolve() }) diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 27135a08..36a6f446 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -5,7 +5,6 @@ import store from '@/store' import { welcome } from '@/utils/util' import { queryPermissionsByUser } from '@/api/api' import { getAction } from '@/api/manage' -import notification from 'ant-design-vue/lib/notification' const user = { state: { @@ -71,7 +70,7 @@ const user = { Login ({ commit }, userInfo) { return new Promise((resolve, reject) => { login(userInfo).then(response => { - if (response.code == '200') { + if (response.code + '' === '200') { const result = response.result const userInfo = result.userInfo Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) @@ -95,7 +94,7 @@ const user = { PhoneLogin ({ commit }, userInfo) { return new Promise((resolve, reject) => { phoneLogin(userInfo).then(response => { - if (response.code == '200') { + if (response.code + '' === '200') { const result = response.result const userInfo = result.userInfo Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) @@ -127,12 +126,12 @@ const user = { sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) if (menuData && menuData.length > 0) { // update--begin--autor:qinfeng-----date:20200109------for: 一级菜单的子菜单全部是隐藏路由,则一级菜单不显示------ - menuData.forEach((item, index) => { + menuData.forEach((item) => { if (item.children) { const hasChildrenMenu = item.children.filter((i) => { - return !i.hidden || i.hidden == false + return !i.hidden || i.hidden === false }) - if (hasChildrenMenu == null || hasChildrenMenu.length == 0) { + if (hasChildrenMenu == null || hasChildrenMenu.length === 0) { item.hidden = true } } @@ -173,7 +172,7 @@ const user = { Vue.ls.remove(TENANT_ID) // console.log('logoutToken: '+ logoutToken) logout(logoutToken).then(() => { - if (process.env.VUE_APP_SSO == 'true') { + if (process.env.VUE_APP_SSO + '' === 'true') { const sevice = 'http://' + window.location.host + '/' const serviceUrl = encodeURIComponent(sevice) window.location.href = process.env.VUE_APP_CAS_BASE_URL + '/logout?service=' + serviceUrl @@ -189,7 +188,7 @@ const user = { ThirdLogin ({ commit }, param) { return new Promise((resolve, reject) => { thirdLogin(param.token, param.thirdType).then(response => { - if (response.code == '200') { + if (response.code + '' === '200') { const result = response.result const userInfo = result.userInfo Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)