提

ele-admin-template/.env.development

@@ -1,3 +1,2 @@
-# VUE_APP_API_BASE_URL=https://v2.eleadmin.com/api
-VUE_APP_API_BASE_URL=/kingdom
+VUE_APP_API_BASE_URL=/api
 #VUE_APP_API_BASE_URL=http://localhost:8081/api

ele-admin-template/.env.preview

@@ -1,2 +1,2 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=https://v2.eleadmin.com/api
+VUE_APP_API_BASE_URL=/api

ele-admin-template/src/api/layout/index.js

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

ele-admin-template/src/api/layout/router.js

@@ -0,0 +1,1528 @@
+export const res1111 = {
+  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: 'Dashboard',
+        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: 8,
+        parentId: 7,
+        title: '查询角色',
+        path: null,
+        component: null,
+        menuType: 1,
+        sortNumber: 1,
+        authority: 'sys:role:list',
+        icon: null,
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-13 13:30:41',
+        updateTime: '2020-03-21 18:45:34',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 55,
+        parentId: 54,
+        title: '成功页',
+        path: '/result/success',
+        component: '/result/success',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-circle-check',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:07:40',
+        updateTime: '2021-11-05 16:36:38',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 23,
+        parentId: 22,
+        title: '查询字典',
+        path: null,
+        component: null,
+        menuType: 1,
+        sortNumber: 1,
+        authority: 'sys:dict:list',
+        icon: null,
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-21 18:24:27',
+        updateTime: '2020-03-21 18:44:42',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 58,
+        parentId: 57,
+        title: '403',
+        path: '/exception/403',
+        component: '/exception/403',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-document-checked',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:08:47',
+        updateTime: '2021-11-05 16:36:35',
+        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: 37,
+        parentId: 36,
+        title: '工作台',
+        path: '/dashboard/workplace',
+        component: '/dashboard/workplace',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-monitor',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:00:37',
+        updateTime: '2021-11-05 16:36:59',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 3,
+        parentId: 2,
+        title: '查询用户',
+        path: null,
+        component: null,
+        menuType: 1,
+        sortNumber: 1,
+        authority: 'sys:user:list',
+        icon: null,
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-02-26 12:52:06',
+        updateTime: '2020-09-16 11:05:35',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 13,
+        parentId: 12,
+        title: '查询菜单',
+        path: null,
+        component: null,
+        menuType: 1,
+        sortNumber: 1,
+        authority: 'sys:menu:list',
+        icon: null,
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-21 16:43:30',
+        updateTime: '2020-03-21 18:45:40',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 45,
+        parentId: 44,
+        title: '基础列表',
+        path: '/list/basic',
+        component: '/list/basic',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-document',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:05:10',
+        updateTime: '2021-11-05 16:36:48',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 62,
+        parentId: 61,
+        title: '我的资料',
+        path: '/user/profile',
+        component: '/user/profile',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-user',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:09:58',
+        updateTime: '2021-11-05 16:36:30',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 48,
+        parentId: 47,
+        title: '项目列表',
+        path: '/list/card/project',
+        component: '/list/card/project',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:06:35',
+        updateTime: '2021-11-05 16:36:44',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 91,
+        parentId: 90,
+        title: '表格实例',
+        path: '/example/table',
+        component: '/example/table',
+        menuType: 0,
+        sortNumber: 1,
+        authority: null,
+        icon: 'el-icon-_table',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-06 22:26:55',
+        updateTime: '2022-03-11 21:53:34',
+        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: 56,
+        parentId: 54,
+        title: '失败页',
+        path: '/result/fail',
+        component: '/result/fail',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-circle-close',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:07:41',
+        updateTime: '2021-11-05 16:36:37',
+        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: 38,
+        parentId: 36,
+        title: '分析页',
+        path: '/dashboard/analysis',
+        component: '/dashboard/analysis',
+        menuType: 0,
+        sortNumber: 2,
+        authority: null,
+        icon: 'el-icon-data-analysis',
+        hide: 0,
+        meta: '{"badge": 1}',
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:00:40',
+        updateTime: '2022-03-11 16:45:44',
+        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: 39,
+        parentId: 36,
+        title: '监控页',
+        path: '/dashboard/monitor',
+        component: '/dashboard/monitor',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-odometer',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:03:12',
+        updateTime: '2021-11-05 16:36:56',
+        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: 67,
+        parentId: 64,
+        title: '弹窗扩展',
+        path: '/extension/dialog',
+        component: '/extension/dialog',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-copy-document',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:32:12',
+        updateTime: '2022-03-11 21:42:52',
+        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
+      },
+      {
+        menuId: 60,
+        parentId: 57,
+        title: '500',
+        path: '/exception/500',
+        component: '/exception/500',
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-document-delete',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:08:52',
+        updateTime: '2021-11-05 16:36:33',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 44,
+        parentId: 0,
+        title: '列表页面',
+        path: '/list',
+        component: null,
+        menuType: 0,
+        sortNumber: 3,
+        authority: null,
+        icon: 'el-icon-_table',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:05:07',
+        updateTime: '2021-11-05 16:36:49',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 17,
+        parentId: 1,
+        title: '机构管理',
+        path: '/system/organization',
+        component: '/system/organization',
+        menuType: 0,
+        sortNumber: 4,
+        authority: null,
+        icon: 'el-icon-office-building',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-21 18:24:20',
+        updateTime: '2021-11-05 16:13:26',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 94,
+        parentId: 90,
+        title: '内嵌文档',
+        path: '/example/eleadmin-doc',
+        component: 'https://eleadmin.com/doc/eleadmin/',
+        menuType: 0,
+        sortNumber: 4,
+        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:56',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 54,
+        parentId: 0,
+        title: '结果页面',
+        path: '/result',
+        component: null,
+        menuType: 0,
+        sortNumber: 4,
+        authority: null,
+        icon: 'el-icon-circle-check',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:07:33',
+        updateTime: '2021-11-05 16:36:40',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 68,
+        parentId: 64,
+        title: '文件列表',
+        path: '/extension/file',
+        component: '/extension/file',
+        menuType: 0,
+        sortNumber: 4,
+        authority: null,
+        icon: 'el-icon-folder',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:10:58',
+        updateTime: '2022-03-11 21:37:16',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 69,
+        parentId: 64,
+        title: '图片上传',
+        path: '/extension/upload',
+        component: '/extension/upload',
+        menuType: 0,
+        sortNumber: 5,
+        authority: null,
+        icon: 'el-icon-picture-outline',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:10:58',
+        updateTime: '2022-07-20 16:49:27',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 22,
+        parentId: 1,
+        title: '字典管理',
+        path: '/system/dictionary',
+        component: '/system/dictionary',
+        menuType: 0,
+        sortNumber: 5,
+        authority: null,
+        icon: 'el-icon-notebook-2',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-21 18:24:26',
+        updateTime: '2021-11-05 16:13:30',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 95,
+        parentId: 90,
+        title: '批量选择',
+        path: '/example/choose',
+        component: '/example/choose',
+        menuType: 0,
+        sortNumber: 5,
+        authority: null,
+        icon: 'el-icon-finished',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:15:11',
+        updateTime: '2022-07-20 16:45:57',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 33,
+        parentId: 2,
+        title: '用户详情',
+        path: '/system/user/details',
+        component: '/system/user/details',
+        menuType: 0,
+        sortNumber: 5,
+        authority: null,
+        icon: 'el-icon-user',
+        hide: 1,
+        meta: '{"active": "/system/user"}',
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-05-21 11:07:54',
+        updateTime: '2022-07-20 16:39:29',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 57,
+        parentId: 0,
+        title: '异常页面',
+        path: '/exception',
+        component: null,
+        menuType: 0,
+        sortNumber: 5,
+        authority: null,
+        icon: 'el-icon-document-delete',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:08:44',
+        updateTime: '2021-11-05 16:36:36',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 96,
+        parentId: 90,
+        title: '案卷调整',
+        path: '/example/document',
+        component: '/example/document',
+        menuType: 0,
+        sortNumber: 6,
+        authority: null,
+        icon: 'el-icon-files',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:15:03',
+        updateTime: '2022-07-20 16:45:59',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 61,
+        parentId: 0,
+        title: '个人中心',
+        path: '/user',
+        component: null,
+        menuType: 0,
+        sortNumber: 6,
+        authority: null,
+        icon: 'el-icon-set-up',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:09:54',
+        updateTime: '2021-11-05 16:36:31',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 70,
+        parentId: 64,
+        title: '拖拽排序',
+        path: '/extension/dragsort',
+        component: '/extension/dragsort',
+        menuType: 0,
+        sortNumber: 6,
+        authority: null,
+        icon: 'el-icon-rank',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:11:48',
+        updateTime: '2022-07-20 16:43:38',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 71,
+        parentId: 64,
+        title: '消息提示',
+        path: '/extension/message',
+        component: '/extension/message',
+        menuType: 0,
+        sortNumber: 7,
+        authority: null,
+        icon: 'el-icon-chat-line-square',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:14:28',
+        updateTime: '2022-07-20 16:43:39',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 64,
+        parentId: 0,
+        title: '扩展组件',
+        path: '/extension',
+        component: null,
+        menuType: 0,
+        sortNumber: 7,
+        authority: null,
+        icon: 'el-icon-open',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:10:52',
+        updateTime: '2021-11-05 16:36:26',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 27,
+        parentId: 1,
+        title: '登录日志',
+        path: '/system/login-record',
+        component: '/system/login-record',
+        menuType: 0,
+        sortNumber: 7,
+        authority: 'sys:login-record:list',
+        icon: 'el-icon-date',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-21 18:24:33',
+        updateTime: '2021-11-05 17:28:53',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 28,
+        parentId: 1,
+        title: '操作日志',
+        path: '/system/operation-record',
+        component: '/system/operation-record',
+        menuType: 0,
+        sortNumber: 8,
+        authority: 'sys:operation-record:list',
+        icon: 'el-icon-_retrieve',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2020-03-21 18:24:34',
+        updateTime: '2021-11-05 17:28:56',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 90,
+        parentId: 0,
+        title: '常用实例',
+        path: '/example',
+        component: null,
+        menuType: 0,
+        sortNumber: 8,
+        authority: null,
+        icon: 'el-icon-_integral',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:15:01',
+        updateTime: '2021-11-05 16:52:47',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 72,
+        parentId: 64,
+        title: '城市选择',
+        path: '/extension/regions',
+        component: '/extension/regions',
+        menuType: 0,
+        sortNumber: 8,
+        authority: null,
+        icon: 'el-icon-office-building',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:25:15',
+        updateTime: '2022-07-20 16:43:40',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 99,
+        parentId: 0,
+        title: '获取授权',
+        path: 'https://eleadmin.com/goods/8',
+        component: null,
+        menuType: 0,
+        sortNumber: 9,
+        authority: null,
+        icon: 'el-icon-_prerogative',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:15:18',
+        updateTime: '2022-03-11 21:33:18',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 73,
+        parentId: 64,
+        title: '打印插件',
+        path: '/extension/printer',
+        component: '/extension/printer',
+        menuType: 0,
+        sortNumber: 9,
+        authority: null,
+        icon: 'el-icon-printer',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:11:00',
+        updateTime: '2022-07-20 16:43:42',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 74,
+        parentId: 64,
+        title: 'excel插件',
+        path: '/extension/excel',
+        component: '/extension/excel',
+        menuType: 0,
+        sortNumber: 10,
+        authority: null,
+        icon: 'el-icon-_table',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:11:03',
+        updateTime: '2022-07-20 16:43:43',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 75,
+        parentId: 64,
+        title: '滚动数字',
+        path: '/extension/count-up',
+        component: '/extension/count-up',
+        menuType: 0,
+        sortNumber: 11,
+        authority: null,
+        icon: 'el-icon-more',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:29:03',
+        updateTime: '2022-07-20 16:43:45',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 76,
+        parentId: 64,
+        title: '空状态',
+        path: '/extension/empty',
+        component: '/extension/empty',
+        menuType: 0,
+        sortNumber: 12,
+        authority: null,
+        icon: 'el-icon-receiving',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:20:35',
+        updateTime: '2022-07-20 16:43:47',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 77,
+        parentId: 64,
+        title: '步骤条',
+        path: '/extension/steps',
+        component: '/extension/steps',
+        menuType: 0,
+        sortNumber: 13,
+        authority: null,
+        icon: 'el-icon-_timeline',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:16:39',
+        updateTime: '2022-07-20 16:43:49',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 78,
+        parentId: 64,
+        title: '菜单导航',
+        path: '/extension/menu',
+        component: '/extension/menu',
+        menuType: 0,
+        sortNumber: 14,
+        authority: null,
+        icon: 'el-icon-s-operation',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:18:35',
+        updateTime: '2022-07-20 16:43:51',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 79,
+        parentId: 64,
+        title: '树形下拉',
+        path: '/extension/tree-select',
+        component: '/extension/tree-select',
+        menuType: 0,
+        sortNumber: 15,
+        authority: null,
+        icon: 'el-icon-_condition',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-10 16:21:12',
+        updateTime: '2022-07-20 16:43:52',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 80,
+        parentId: 64,
+        title: '表格下拉',
+        path: '/extension/table-select',
+        component: '/extension/table-select',
+        menuType: 0,
+        sortNumber: 16,
+        authority: null,
+        icon: 'el-icon-_table',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-10 16:21:45',
+        updateTime: '2022-07-20 16:43:54',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 82,
+        parentId: 64,
+        title: '视频播放',
+        path: '/extension/player',
+        component: '/extension/player',
+        menuType: 0,
+        sortNumber: 18,
+        authority: null,
+        icon: 'el-icon-_video',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:13:49',
+        updateTime: '2022-07-20 16:44:01',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 83,
+        parentId: 64,
+        title: '地图组件',
+        path: '/extension/map',
+        component: '/extension/map',
+        menuType: 0,
+        sortNumber: 19,
+        authority: null,
+        icon: 'el-icon-map-location',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:11:49',
+        updateTime: '2022-07-20 16:44:03',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 84,
+        parentId: 64,
+        title: '二维码',
+        path: '/extension/qr-code',
+        component: '/extension/qr-code',
+        menuType: 0,
+        sortNumber: 20,
+        authority: null,
+        icon: 'el-icon-_qrcode',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:29:56',
+        updateTime: '2022-07-20 16:44:04',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 85,
+        parentId: 64,
+        title: '条形码',
+        path: '/extension/bar-code',
+        component: '/extension/bar-code',
+        menuType: 0,
+        sortNumber: 21,
+        authority: null,
+        icon: 'el-icon-_barcode',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-10-05 11:29:56',
+        updateTime: '2022-07-20 16:49:58',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 86,
+        parentId: 64,
+        title: '富文本框',
+        path: '/extension/editor',
+        component: '/extension/editor',
+        menuType: 0,
+        sortNumber: 22,
+        authority: null,
+        icon: 'el-icon-_font-family',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:13:57',
+        updateTime: '2022-07-20 16:44:07',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 87,
+        parentId: 64,
+        title: 'markdown',
+        path: '/extension/markdown',
+        component: '/extension/markdown',
+        menuType: 0,
+        sortNumber: 23,
+        authority: null,
+        icon: 'el-icon-_feedback',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2022-03-11 21:58:13',
+        updateTime: '2022-07-20 16:44:40',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 88,
+        parentId: 64,
+        title: '仪表盘',
+        path: '/extension/dashboard',
+        component: '/extension/dashboard',
+        menuType: 0,
+        sortNumber: 24,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2022-03-11 21:58:13',
+        updateTime: '2023-04-21 22:35:55',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 89,
+        parentId: 64,
+        title: '引导组件',
+        path: '/extension/tour',
+        component: '/extension/tour',
+        menuType: 0,
+        sortNumber: 25,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2022-03-11 21:58:13',
+        updateTime: '2023-04-21 22:35:56',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 97,
+        parentId: 64,
+        title: '水印组件',
+        path: '/extension/watermark',
+        component: '/extension/watermark',
+        menuType: 0,
+        sortNumber: 26,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:15:03',
+        updateTime: '2023-04-21 22:35:58',
+        children: null,
+        checked: null
+      },
+      {
+        menuId: 98,
+        parentId: 64,
+        title: '分割面板',
+        path: '/extension/split',
+        component: '/extension/split',
+        menuType: 0,
+        sortNumber: 27,
+        authority: null,
+        icon: 'el-icon-_menu',
+        hide: 0,
+        meta: null,
+        deleted: 0,
+        tenantId: 1,
+        createTime: '2021-02-02 20:15:03',
+        updateTime: '2023-04-21 22:35:59',
+        children: null,
+        checked: null
+      }
+    ],
+    enabled: true,
+    credentialsNonExpired: true,
+    accountNonLocked: true,
+    accountNonExpired: true
+  }
+};

ele-admin-template/src/api/login/index.js

@@ -5,15 +5,25 @@ import { setToken } from '@/utils/token-util';
  * 登录
  */
 export async function login(data) {
-  //data.tenantId = 1; // 租户id
   const res = await request.post('/main/user/login', data);
-  if (res.data.code === 0) {
-    setToken(res.data.data.oken, true);
+  if (res.data.code == 0) {
+    setToken(res.data.data.token, data.remember);
     return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
+export async function sub() {
+  const res = await request.post('/main/user/login', {
+    loginName: 'aaa',
+    loginPwd: '123456'
+  });
+  if (res) {
+    console.log(res);
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 /**
  * 获取验证码
  */

ele-admin-template/src/api/system/role/index.js

@@ -5,11 +5,11 @@ import request from '@/utils/request';
  * @param params 查询条件
  */
 export async function pageRoles(params) {
-  const res = await request.get('/system/role/page', {
+  const res = await request.get('/sys/role/page', {
     params
   });
   if (res.data.code === 0) {
-    return res.data.data;
+    return res.data.records;
   }
   return Promise.reject(new Error(res.data.message));
 }

ele-admin-template/src/views/example/table/components/default-sorter.vue

@@ -9,7 +9,8 @@
       :datasource="datasource"
       :default-sort="{ prop: 'username', order: 'ascending' }"
       size="mini"
-    />
+    >
+    </ele-pro-table>
   </el-card>
 </template>
 

ele-admin-template/src/views/example/table/components/merge-cell.vue

@@ -53,7 +53,8 @@
     },
     methods: {
       /* 表格数据源 */
-      datasource() {
+      datasource(data) {
+        console.log(data);
         return pageUserScores();
       },
       /* 合并表格单元格 */

ele-admin-template/src/views/login/index.vue

@@ -109,7 +109,7 @@
 <script>
   import I18nIcon from '@/layout/components/i18n-icon.vue';
   import { getToken } from '@/utils/token-util';
-  import { login, getCaptcha } from '@/api/login';
+  import { login, getCaptcha, sub } from '@/api/login';
 
   export default {
     // eslint-disable-next-line vue/multi-word-component-names
@@ -124,9 +124,8 @@
         // 表单数据
         form: {
           loginName: 'aaa',
-          loginPwd: 'admin',
-          pageNum:1,
-          pageSize:10
+          loginPwd: '123456',
+          remember: true
         },
         // 验证码base64数据
         captcha: '',
@@ -160,8 +159,6 @@
     created() {
       if (getToken()) {
         this.goHome();
-      } else {
-        // this.changeCaptcha();
       }
     },
     methods: {
@@ -171,10 +168,6 @@
           if (!valid) {
             return false;
           }
-          // if (this.form.code.toLowerCase() !== this.text) {
-          //   this.$message.error('验证码错误');
-          //   return;
-          // }
           this.loading = true;
           login(this.form)
             .then((msg) => {
@@ -190,6 +183,7 @@
       },
       /* 跳转到首页 */
       goHome() {
+        console.log(2222);
         this.$router.push(this.$route?.query?.from ?? '/').catch(() => {});
       },
       /* 更换图形验证码 */

ele-admin-template/src/views/system/role/index.vue

@@ -104,7 +104,7 @@
             fixed: 'left'
           },
           {
-            prop: 'roleName',
+            prop: 'name',
             label: '角色名称',
             sortable: 'custom',
             showOverflowTooltip: true,
@@ -154,7 +154,11 @@
         showAuth: false
       };
     },
+    created() {
+      this.getRoles(); //获取角色列表数据。该方法在实例初始化时实现。在实例销毁时
+    },
     methods: {
+      getRoles() {},
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
         return pageRoles({ ...where, ...order, page, limit });

ele-admin-template/src/views/user/message/index.vue

@@ -104,16 +104,23 @@
     },
     methods: {
       /* 查询未读数量 */
-      queryUnReadNum() {
-        getUnReadNum()
-          .then((result) => {
-            this.unReadNotice = result.notice;
-            this.unReadLetter = result.letter;
-            this.unReadTodo = result.todo;
-          })
-          .catch((e) => {
-            this.$message.error(e.message);
-          });
+      async queryUnReadNum() {
+        // getUnReadNum()
+        //   .then((result) => {
+        //     this.unReadNotice = result.notice;
+        //     this.unReadLetter = result.letter;
+        //     this.unReadTodo = result.todo;
+        //   })
+        //   .catch((e) => {
+        //     this.$message.error(e.message);
+        //   });
+        const result = await getUnReadNum();
+        console.log(result);
+        if (result) {
+          this.unReadNotice = result.notice;
+          this.unReadLetter = result.letter;
+          this.unReadTodo = result.todo;
+        }
       }
     }
   };

ele-admin-template/vue.config.js

@@ -2,6 +2,7 @@ const CompressionWebpackPlugin = require('compression-webpack-plugin');
 const { transformElementScss } = require('ele-admin/lib/utils/dynamic-theme');
 
 module.exports = {
+  lintOnSave: false,
   productionSourceMap: false,
   configureWebpack: {
     performance: {
@@ -9,6 +10,21 @@ module.exports = {
       maxEntrypointSize: 2000000
     }
   },
+  devServer: {
+    // 代理跨域的配置
+    proxy: {
+      // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
+      '/api': {
+        target: 'http://192.168.3.51:18086', // 跨域请求的地址
+        // target: 'http://192.168.3.35:8080', // kang杨威
+        // target: 'http://192.168.3.31:8080', // 黄峥嵘
+        changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
+        pathRewrite: {
+          '^/api': ''
+        }
+      }
+    }
+  },
   chainWebpack(config) {
     config.plugins.delete('prefetch');
     if (process.env.NODE_ENV !== 'development') {
@@ -30,22 +46,5 @@ module.exports = {
         }
       }
     }
-  },
-  devServer: { //liu
-
-    proxy: {
-
-        '/kingdom': {
-            target: 'http://192.168.3.51:18086',
-            // target: 'http://192.168.3.35:8080', // kang杨威
-            // target: 'http://192.168.3.31:8080', // 黄峥嵘
-            changeOrigin: true,
-            pathRewrite: {
-                "^/kingdom": '',
-            }
-        },
-
-    },
-
-},
+  }
 };