Kaynağa Gözat

用户管理提交

LAPTOP-16IUEB3P\Lenovo 3 yıl önce
ebeveyn
işleme
a1f8e46dbc

+ 10 - 5
ele-admin-template/src/api/layout/index.js

@@ -1,16 +1,21 @@
 import request from '@/utils/request';
 import { res1111 } from './router';
+import { res222 } from './router2';
 
 /**
  * 获取当前登录的用户信息、菜单、权限、角色
  */
 export async function getUserInfo() {
-  // const res = await request.get('/system/resources/getResourcesTree');
-  // if (res.code === 0 && res.data) {
-  //   return res.data;
+   const res = await request.get('/system/resources/getResourcesTree');
+   console.log('res--',res)
+  // if (res1111.code === 0 && res1111.data) {
+  //   return res1111.data;
   // }
-  if (res1111.code === 0 && res1111.data) {
-    return res1111.data;
+  // if (res222.code == 0 && res222.data) {
+  //   return res222.data;
+  // }
+  if (res.data.code == 0 && res.data.data) { 
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }

+ 511 - 0
ele-admin-template/src/api/layout/router2.js

@@ -0,0 +1,511 @@
+export const res222 = {
+  code: 0,
+  message: '操作成功',
+  data: {
+    userId: 1,
+    username: 'admin',
+    password: '$2a$10$sWH.qQmf/dHMURzE4kN0puBOdB7VWwcDFB2NvwpMaHYz6OFZwQGBy',
+    nickname: '管理员',
+    avatar: 'https://cdn.eleadmin.com/20200610/avatar.jpg',
+    sex: '1',
+    phone: '12345678901',
+    email: null,
+    emailVerified: 0,
+    realName: null,
+    idCard: null,
+    birthday: '2021-05-21',
+    introduction: '遗其欲,则心静!',
+    organizationId: 1,
+    status: 0,
+    deleted: 0,
+    tenantId: 1,
+    createTime: '2020-01-13 14:43:52',
+    updateTime: '2023-02-06 09:05:19',
+    organizationName: 'XXX公司',
+    sexName: '男',
+    roles: [
+      {
+        roleId: 1,
+        roleCode: 'admin',
+        roleName: '管理员',
+        comments: '管理员',
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-02-26 15:18:37',
+        updateTime: '2020-03-21 15:15:54',
+        userId: null
+      }
+    ],
+    authorities: [
+      {
+        menuId: 36,
+        parentId: 0,
+        title: '主页',
+        path: '/dashboard',
+        component: null,
+        menuType: 0,
+        sortNumber: 0,
+        authority: null,
+        icon: 'el-icon-house',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:00:34',
+        updateTime: '2021-11-05 16:37:00',
+        children: null,
+        checked: null
+      },
+      
+      {
+        menuId: 2,
+        parentId: 1,
+        title: '流程定义',
+        path: '/system/user',
+        component: '/system/user',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-_user-group',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-02-26 12:51:55',
+        updateTime: '2021-05-21 17:56:28',
+        children: null,
+        checked: null
+      },
+    
+      
+      {
+        menuId: 1,
+        parentId: 0,
+        title: '流程管理',
+        path: '/system',
+        component: null,
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-setting',
+        hide: 0,
+        meta: '{"badge": "New", "badgeColor": "warning"}',
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-02-26 12:51:23',
+        updateTime: '2022-03-11 16:46:28',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 18,
+        parentId: 17,
+        title: '查询机构',
+        path: null,
+        component: null,
+        menuType: 1,
+        sortNumber: 1,
+        authority: 'sys:org:list',
+        icon: null,
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-21 18:24:21',
+        updateTime: '2020-03-21 18:44:36',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 51,
+        parentId: 45,
+        title: '添加用户',
+        path: '/list/basic/add',
+        component: '/list/basic/add',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-user',
+        hide: 1,
+        meta: '{"active": "/list/basic"}',
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2022-03-11 21:56:38',
+        updateTime: '2022-07-20 16:42:25',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 41,
+        parentId: 40,
+        title: '基础表单',
+        path: '/form/basic',
+        component: '/form/basic',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-_feedback',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:03:51',
+        updateTime: '2021-11-05 16:36:53',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 65,
+        parentId: 64,
+        title: '图标扩展',
+        path: '/extension/icon',
+        component: '/extension/icon',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-_heart',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:10:55',
+        updateTime: '2022-03-11 21:36:27',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 52,
+        parentId: 45,
+        title: '修改用户',
+        path: '/list/basic/edit',
+        component: '/list/basic/edit',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-user',
+        hide: 1,
+        meta: '{"active": "/list/basic"}',
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2022-03-11 21:56:38',
+        updateTime: '2022-07-20 16:42:26',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 63,
+        parentId: 61,
+        title: '我的消息',
+        path: '/user/message',
+        component: '/user/message',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-chat-dot-round',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:10:03',
+        updateTime: '2021-11-05 16:36:27',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 42,
+        parentId: 40,
+        title: '复杂表单',
+        path: '/form/advanced',
+        component: '/form/advanced',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-_visa',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:03:56',
+        updateTime: '2021-11-05 16:36:52',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 66,
+        parentId: 64,
+        title: '标签组件',
+        path: '/extension/tag',
+        component: '/extension/tag',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-price-tag',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:13:35',
+        updateTime: '2022-03-11 21:42:50',
+        children: null,
+        checked: null
+      },
+      
+      {
+        menuId: 59,
+        parentId: 57,
+        title: '404',
+        path: '/exception/404',
+        component: '/exception/404',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-document-remove',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:08:49',
+        updateTime: '2021-11-05 16:36:34',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 7,
+        parentId: 1,
+        title: '流程审批',
+        path: '/system/role',
+        component: '/system/role',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-postcard',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-13 13:29:08',
+        updateTime: '2021-05-21 17:56:34',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 40,
+        parentId: 0,
+        title: '表单页面',
+        path: '/form',
+        component: null,
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-tickets',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:03:28',
+        updateTime: '2021-11-05 16:36:54',
+        children: null,
+        checked: null
+      },
+     
+      {
+        menuId: 92,
+        parentId: 90,
+        title: '菜单徽章',
+        path: '/example/menu-badge',
+        component: '/example/menu-badge',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2022-03-11 21:57:35',
+        updateTime: '2023-04-21 22:32:42',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 46,
+        parentId: 44,
+        title: '复杂列表',
+        path: '/list/advanced',
+        component: '/list/advanced',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-_cols',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:05:26',
+        updateTime: '2021-11-05 16:36:47',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 49,
+        parentId: 47,
+        title: '应用列表',
+        path: '/list/card/application',
+        component: '/list/card/application',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:06:39',
+        updateTime: '2021-11-05 16:36:42',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 93,
+        parentId: 90,
+        title: '内嵌页面',
+        path: '/example/eleadmin',
+        component: 'https://www.eleadmin.com',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-connection',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-05-21 11:11:57',
+        updateTime: '2022-07-20 16:45:55',
+        children: null,
+        checked: null
+      },
+      
+      {
+        menuId: 47,
+        parentId: 44,
+        title: '卡片列表',
+        path: '/list/card',
+        component: '/list/card',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:05:30',
+        updateTime: '2021-11-05 16:36:45',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 50,
+        parentId: 47,
+        title: '文章列表',
+        path: '/list/card/article',
+        component: '/list/card/article',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:06:48',
+        updateTime: '2021-11-05 16:36:41',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 32,
+        parentId: 29,
+        title: '查看记录',
+        path: null,
+        component: null,
+        menuType: 1,
+        sortNumber: 3,
+        authority: 'sys:file:list',
+        icon: null,
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-09-17 23:20:29',
+        updateTime: '2022-07-20 16:40:24',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 53,
+        parentId: 45,
+        title: '用户详情',
+        path: '/list/basic/details/:id',
+        component: '/list/basic/details',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-user',
+        hide: 1,
+        meta: '{"active": "/list/basic"}',
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2022-03-11 21:56:38',
+        updateTime: '2022-07-20 16:42:27',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 43,
+        parentId: 40,
+        title: '分步表单',
+        path: '/form/step',
+        component: '/form/step',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-c-scale-to-original',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:04:06',
+        updateTime: '2021-11-05 16:36:50',
+        children: null,
+        checked: null
+      },
+     
+      {
+        menuId: 12,
+        parentId: 1,
+        title: '流程实力例',
+        path: '/system/menu',
+        component: '/system/menu',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-s-operation',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-21 01:07:13',
+        updateTime: '2021-05-21 17:56:39',
+        children: null,
+        checked: null
+      },
+      
+      
+    ],
+    enabled: true,
+    credentialsNonExpired: true,
+    accountNonLocked: true,
+    accountNonExpired: true
+  }
+};

+ 56 - 0
ele-admin-template/src/config/setting.js

@@ -25,6 +25,62 @@ export const KEEP_ALIVE_EXCLUDES = [];
 
 // 直接指定菜单数据
 export const USER_MENUS = undefined;
+// [
+//   {
+//     path: '/dashboard',
+//     redirect: '/dashboard/user',
+//     meta: { title: '流程管理', icon: 'el-icon-setting' }
+//   },
+//   {
+//     path: '/system',
+//     redirect: '/system/user',
+//     meta: { title: '流程管理', icon: 'el-icon-setting' },
+//     children: [
+//       {
+//         path: '/system/user',
+//         component: '/system/user',
+//         meta: { title: '流程定义', icon: 'el-icon-user', hide: false }
+//       },
+//       {
+//         path: '/system/user',
+//         component: '/system/user',
+//         meta: { title: '流程审批', icon: 'el-icon-user', hide: false }
+//       },
+//       {
+//         path: '/system/user',
+//         component: '/system/user',
+//         meta: { title: '流程实列', icon: 'el-icon-user', hide: false }
+//       }
+//     ]
+//   },
+//   {
+//     path: '/system',
+//     redirect: '/system/user',
+//     meta: { title: '授权管理', icon: 'el-icon-setting' },
+//     children: [
+//       {
+//         path: '/system/user',
+//         component: '/system/user',
+//         meta: { title: '用户管理', icon: 'el-icon-user', hide: false }
+//       },
+//       {
+//         path: '/system/user',
+//         component: '/system/user',
+//         meta: { title: '角色管理', icon: 'el-icon-user', hide: false }
+//       },
+//       {
+//         path: '/system/user',
+//         component: '/system/user',
+//         meta: { title: '租户管理', icon: 'el-icon-user', hide: false }
+//       },
+//       {
+//         path: '/system/user',
+//         component: '/system/user',
+//         meta: { title: '菜单管理', icon: 'el-icon-user', hide: false }
+//       }
+//     ]
+//   }
+// ];
 
 // 首页名称, 为空则取第一个菜单的名称
 export const HOME_TITLE = undefined;

+ 100 - 0
ele-admin-template/src/i18n/lang/zh_CN/route copy.js

@@ -0,0 +1,100 @@
+/* 菜单路由 */
+export default {
+  login: { _name: '登录' },
+  forget: { _name: '忘记密码' },
+  dashboard: {
+    _name: 'Dashboard',
+    workplace: { _name: '工作台' },
+    analysis: { _name: '分析页' },
+    monitor: { _name: '监控页' }
+  },
+  system: {
+    _name: '系统管理',
+    user: {
+      _name: '用户管理',
+      details: { _name: '' }
+    },
+    role: { _name: '角色管理' },
+    menu: { _name: '菜单管理' },
+    dictionary: { _name: '字典管理' },
+    organization: { _name: '机构管理' },
+    loginRecord: { _name: '登录日志' },
+    operationRecord: { _name: '操作日志' },
+    file: { _name: '文件管理' }
+  },
+  form: {
+    _name: '表单页面',
+    basic: { _name: '基础表单' },
+    advanced: { _name: '复杂表单' },
+    step: { _name: '分步表单' }
+  },
+  list: {
+    _name: '列表页面',
+    basic: {
+      _name: '基础列表',
+      add: { _name: '添加用户' },
+      edit: { _name: '修改用户' },
+      details: {
+        ':id': { _name: '' }
+      }
+    },
+    advanced: { _name: '复杂列表' },
+    card: {
+      _name: '卡片列表',
+      project: { _name: '项目列表' },
+      application: { _name: '应用列表' },
+      article: { _name: '文章列表' }
+    }
+  },
+  result: {
+    _name: '结果页面',
+    success: { _name: '成功页' },
+    fail: { _name: '失败页' }
+  },
+  exception: {
+    _name: '异常页面',
+    403: { _name: '403' },
+    404: { _name: '404' },
+    500: { _name: '500' }
+  },
+  user: {
+    _name: '个人中心',
+    profile: { _name: '个人资料' },
+    message: { _name: '我的消息' }
+  },
+  extension: {
+    _name: '扩展组件',
+    icon: { _name: '图标扩展' },
+    tag: { _name: '标签组件' },
+    dialog: { _name: '拖拽弹窗' },
+    file: { _name: '文件列表' },
+    upload: { _name: '图片上传' },
+    dragsort: { _name: '拖拽排序' },
+    message: { _name: '消息提示' },
+    regions: { _name: '城市选择' },
+    printer: { _name: '打印插件' },
+    excel: { _name: 'excel插件' },
+    countUp: { _name: '滚动数字' },
+    empty: { _name: '空状态' },
+    steps: { _name: '步骤条' },
+    menu: { _name: '菜单导航' },
+    treeSelect: { _name: '树形下拉' },
+    tableSelect: { _name: '表格下拉' },
+    player: { _name: '视频播放' },
+    map: { _name: '地图组件' },
+    qrCode: { _name: '二维码' },
+    barCode: { _name: '条形码' },
+    editor: { _name: '富文本框' },
+    markdown: { _name: 'markdown' }
+  },
+  example: {
+    _name: '常用实例',
+    table: { _name: '表格实例' },
+    menuBadge: { _name: '菜单徽章' },
+    eleadmin: { _name: '内嵌页面' },
+    eleadminDoc: { _name: '内嵌文档' },
+    choose: { _name: '批量选择' },
+    document: { _name: '案卷调整' }
+  },
+  'https://eleadminCom/goods/8': { _name: '获取授权' }
+};

+ 20 - 19
ele-admin-template/src/i18n/lang/zh_CN/route.js

@@ -3,19 +3,19 @@ export default {
   login: { _name: '登录' },
   forget: { _name: '忘记密码' },
   dashboard: {
-    _name: 'Dashboard',
+    _name: '主页',
     workplace: { _name: '工作台' },
     analysis: { _name: '分析页' },
     monitor: { _name: '监控页' }
   },
   system: {
-    _name: '系统管理',
+    _name: '流程管理',
     user: {
-      _name: '用户管理',
+      _name: '流程定义',
       details: { _name: '' }
     },
-    role: { _name: '角色管理' },
-    menu: { _name: '菜单管理' },
+    role: { _name: '流程审批' },
+    menu: { _name: '流程实例' },
     dictionary: { _name: '字典管理' },
     organization: { _name: '机构管理' },
     loginRecord: { _name: '登录日志' },
@@ -23,24 +23,24 @@ export default {
     file: { _name: '文件管理' }
   },
   form: {
-    _name: '表单页面',
-    basic: { _name: '基础表单' },
-    advanced: { _name: '复杂表单' },
-    step: { _name: '分步表单' }
+    _name: '授权管理',
+    basic: { _name: '用户管理' },
+    advanced: { _name: '角色管理' },
+    step: { _name: '租户管理' }
   },
   list: {
-    _name: '列表页面',
+    _name: '系统数据',
     basic: {
-      _name: '基础列表',
-      add: { _name: '添加用户' },
-      edit: { _name: '修改用户' },
+      _name: '业务系统注册',
+      add: { _name: '参数管理' },
+      edit: { _name: '日志管理' },
       details: {
         ':id': { _name: '' }
       }
     },
-    advanced: { _name: '复杂列表' },
+    advanced: { _name: '主数据' },
     card: {
-      _name: '卡片列表',
+      _name: '数据字典',
       project: { _name: '项目列表' },
       application: { _name: '应用列表' },
       article: { _name: '文章列表' }
@@ -52,10 +52,11 @@ export default {
     fail: { _name: '失败页' }
   },
   exception: {
-    _name: '异常页面',
-    403: { _name: '403' },
-    404: { _name: '404' },
-    500: { _name: '500' }
+    _name: '主数据',
+    basic: {
+      _name: '数据字典',
+     
+    },
   },
   user: {
     _name: '个人中心',

+ 46 - 10
ele-admin-template/src/store/modules/user.js

@@ -39,34 +39,70 @@ export default {
     /**
      * 请求用户信息、权限、角色、菜单
      */
+    // async fetchUserInfo({ commit }) {
+    //   const result = await getUserInfo().catch(() => {});
+    //   if (!result) {
+    //     return {};
+    //   }
+    //   // 用户信息
+    //   commit('setUserInfo', result);
+    //   // 用户权限
+    //   const authorities =
+    //     result.authorities
+    //       ?.filter((d) => !!d.authority)
+    //       ?.map((d) => d.authority) ?? [];
+    //   commit('setAuthorities', authorities);
+    //   // 用户角色
+    //   const roles = result.roles?.map((d) => d.roleCode) ?? [];
+    //   commit('setRoles', roles);
+    //   // 用户菜单, 过滤掉按钮类型并转为 children 形式
+    //   const { menus, homePath } = formatMenus(
+    //     USER_MENUS ??
+    //       toTreeData({
+    //         data: result.authorities?.filter((d) => d.menuType !== 1),
+    //         idField: 'menuId',
+    //         parentIdField: 'parentId'
+    //       })
+    //   );
+    //   commit('setMenus', menus); 
+    //   console.log('menus',menus, 'homePath',homePath)
+    //   return { menus, homePath };
+    // },
+    //动态路由
     async fetchUserInfo({ commit }) {
       const result = await getUserInfo().catch(() => {});
+      console.log('result--',result)
       if (!result) {
         return {};
       }
       // 用户信息
-      commit('setUserInfo', result);
+      // commit('setUserInfo', result);
       // 用户权限
-      const authorities =
-        result.authorities
-          ?.filter((d) => !!d.authority)
-          ?.map((d) => d.authority) ?? [];
-      commit('setAuthorities', authorities);
+      // const authorities =
+      //   result.authorities
+      //     ?.filter((d) => !!d.authority)
+      //     ?.map((d) => d.authority) ?? [];
+      // commit('setAuthorities', authorities);
       // 用户角色
-      const roles = result.roles?.map((d) => d.roleCode) ?? [];
-      commit('setRoles', roles);
+      // const roles = result.roles?.map((d) => d.roleCode) ?? [];
+      // commit('setRoles', roles);
       // 用户菜单, 过滤掉按钮类型并转为 children 形式
       const { menus, homePath } = formatMenus(
         USER_MENUS ??
           toTreeData({
-            data: result.authorities?.filter((d) => d.menuType !== 1),
-            idField: 'menuId',
+            data: result?.filter((d) => d.menuType !== 1),
+            idField: 'id',
             parentIdField: 'parentId'
           })
       );
+      
+      // console.log('menus--',menus)
       commit('setMenus', menus);
+      // const menus = result;
+      // const homePath = '/dashboard/workplace';
       return { menus, homePath };
     },
+
     /**
      * 更新用户信息
      */

+ 0 - 0
ele-admin-template/src/views/dashboard.vue


+ 11 - 0
ele-admin-template/src/views/flowable/flowableDefine.vue

@@ -0,0 +1,11 @@
+<template>
+    <div>流程定义</div>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style scoped>
+
+</style>