[FE] 海上定位导航权限

ebc-middle-platform/src/components/loginer.vue

@@ -63,12 +63,12 @@ import { mapActions, mapState, mapMutations } from 'vuex'
import Services from '@/conf/services'
import { KEY_USER_NAME } from '@/constants'
import routers from '@/routes'
import services from "../conf/services";
import services from '../conf/services'
import {
  GENERATE_ROUTES
} from '@/modules/ootb/permission/store/constants'
import store from '../store';
import {SET_ROUTERS} from "../modules/ootb/permission/store/constants";
import store from '../store'
import {SET_ROUTERS} from '../modules/ootb/permission/store/constants'
export default {
  name: 'Loginer',
@@ -84,9 +84,9 @@ export default {
      rememberMe: false,
      verifiyCode: '',
      loginForm: {
        userName: '',
        password: '',
        verifyCode: ''
        userName: 'admin',
        password: 'Abc@1234',
        verifyCode: 'zubk'
      },
      loginFormRules: {
        userName: [
@@ -159,19 +159,25 @@ export default {
              .post(services.login.FIND_MENUS, {userCode: data.RESULT.CODE})
              .then((data) => {
                var map = new Map()
                console.log(data.RESULT)
                data.RESULT.forEach(e => {
                  if (e.ROOT_MENU){
                    map.set(e.ROOT_MENU[0].NAME,e.ROOT_MENU[0].ID)
                  if (e.ROOT_MENU) {
                    map.set(e.ROOT_MENU[0].VIEWNAME, e.ROOT_MENU[0].ID)
                  }
                  map.set(e.NAME,e.ID)
                  if (e.menu_list) {
                    e.menu_list.forEach( m => {
                      map.set(m.NAME,m.ID)
                  map.set(e.menu_list[0].VIEWNAME, e.ID)
                  if (e.child_list) {
                    e.child_list.forEach(m => {
                      map.set(m.menu_list[0].VIEWNAME, m.ID)
                      if (m.child_list) {
                        m.child_list.forEach(mn => {
                          map.set(mn.menu_list[0].VIEWNAME, mn.ID)
                        })
                      }
                    })
                  }
                })
                debugger
                localStorage.setItem('menus',  JSON.stringify(map))
                localStorage.setItem('menus', JSON.stringify(map))
                store.dispatch(`permission/${GENERATE_ROUTES}`, roles)
                this.$router.push({ name: this.homeName })
              })
@@ -179,10 +185,6 @@ export default {
            this.loging = false
            this.$Message.danger(e)
          })
          // this.$test
          //   .post(services.login.LOGIN, )
          //   .then((data) => {

ebc-middle-platform/src/modules/ootb/permission/store/actions.js

@@ -8,17 +8,24 @@ import { SET_ROUTERS } from './constants'
 * @returns {boolean}
 */
function hasPermission(permission, route) {
  if (route.meta && route.meta.permission) {
    let flag = -1
    for (let i = 0, len = permission.length; i < len; i++) {
      flag = route.meta.permission.indexOf(permission[i])
      if (flag >= 0) {
        return true
      }
  // if (route.meta && route.meta.permission) {
  //   let flag = -1
  //   for (let i = 0, len = permission.length; i < len; i++) {
  //     flag = route.meta.permission.indexOf(permission[i])
  //     if (flag >= 0) {
  //       return true
  //     }
  //   }
  //   return false
  // }
  // return true
  var x = false
  permission.forEach(e => {
    if (e[0] === route.path){
      x = true
    }
    return false
  }
  return true
  })
  return x
}
/**
@@ -37,11 +44,12 @@ function hasRole(roles, route) {
  }
}
function filterAsyncRouter(routerMap, roles) {
function filterAsyncRouter(routerMap, roles, map) {
  const accessedRouters = routerMap.filter(route => {
    if (hasPermission(roles.permissionList, route)) {
    // if (hasPermission(roles.permissionList, route) && map[route.path] || route.path === '/') {
    if (hasPermission(map, route) || route.path === '/') {
      if (route.children && route.children.length) {
        route.children = filterAsyncRouter(route.children, roles)
        route.children = filterAsyncRouter(route.children, roles, map)
      }
      return true
    }
@@ -51,9 +59,10 @@ function filterAsyncRouter(routerMap, roles) {
}
export function GenerateRoutes({ commit }, roles) {
  var menus = JSON.parse(localStorage.getItem('menus'))
  return new Promise(resolve => {
    let accessedRouters
    accessedRouters = filterAsyncRouter(asyncRouterMap, roles)
    accessedRouters = filterAsyncRouter(asyncRouterMap, roles, menus)
    commit(SET_ROUTERS, accessedRouters)
    resolve()
  })

ebc-middle-platform/src/modules/page/GlobalHeader.vue

@@ -201,13 +201,16 @@ export default {
      this.lockScreen()
    },
    onLogoutItemClick() {
      this.doLogout().then(() => {
        this.$router.push({
          name: 'login'
        })
        // 清除标签导航
        window.localStorage.removeItem('tagNaveList')
      })
      // this.doLogout().then(() => {
      //   this.$router.push({
      //     name: 'login'
      //   })
      //   // 清除标签导航
      //   window.localStorage.removeItem('tagNaveList')
      // })
      this.$store.commit('setLogged', false)
      this.$router.push({ name: 'login' })
      window.localStorage.removeItem('tagNaveList')
    },
    onLangButtonClick() {
      if (this.lang === LANG_CN) {

ebc-middle-platform/src/routes.js

@@ -22,94 +22,7 @@ export default [
    },
    component:() => import(/* webpackChunkName:"user" */ '@/modules/refresh.vue')
  },
  {
    name: 'register-select-way',
    path: '/register-select-way',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/register/register-select-way.vue')
  },
  {
    name: 'register-account-existed',
    path: '/register-account-existed',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/register/register-account-existed.vue')
  },
  {
    name: 'register-by-phone',
    path: '/register-by-phone',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/register/register-by-phone.vue')
  },
  {
    name: 'register-by-email',
    path: '/register-by-email',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/register/register-by-email.vue')
  },
  {
    name: 'register-success',
    path: '/register-success',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/register/register-success.vue')
  },
  {
    name: 'register-email-validate',
    path: '/register-email-validate',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/register/register-email-validate.vue')
  },
  {
    name: 'find-password',
    path: '/find-password',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/find-password/find-password.vue')
  },
  {
    name: 'find-password-phone',
    path: '/find-password-phone',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/find-password/find-password-phone.vue')
  },
  {
    name: 'find-password-email',
    path: '/find-password-email',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/find-password/find-password-email.vue')
  },
  {
    name: 'find-password-email-validate',
    path: '/find-password-email-validate',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/find-password/find-password-email-validate.vue')
  },
  {
    name: 'find-password-success',
    path: '/find-password-success',
    meta: {
      ignoreAuth: true
    },
    component: () => import(/* webpackChunkName: "user" */ '@/modules/user/find-password/find-password-success.vue')
  },
  {
    name: 'index',
    path: '/',