Merge branch 'dev'

ele-admin-template/.env

@@ -1,2 +1,2 @@
-VUE_APP_NAME=Ele Admin
+VUE_APP_NAME=凯德主数据平台
 VUE_APP_API_BASE_URL=https://v2.eleadmin.com/api

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

@@ -1,13 +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 (res1111.code === 0 && res1111.data) {
-    return res1111.data;
+   const res = await request.get('/system/resources/getResourcesTree');
+   console.log('res--',res)
+  // 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));
 }

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
+  }
+};

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

@@ -8,7 +8,7 @@ export async function login(data) {
   const res = await request.post('/main/user/login', data);
   if (res.data.code == 0) {
     setToken(res.data.data.token, data.remember);
-    return res.data.message;
+    return res.data;
   }
   return Promise.reject(new Error(res.data.message));
 }

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

@@ -8,7 +8,6 @@ export async function pageRoles(params) {
   const res = await request.get('/sys/role/page', {
     params
   });
-
   if (res.data.code == 0) {
     return {
       list: res.data.data.records,
@@ -20,7 +19,6 @@ export async function pageRoles(params) {
 
 export async function putRoles(params) {
   const res = await request.put('/sys/role/update', params);
-
   if (res.data.code == 0) {
     return res.data;
   }
@@ -32,10 +30,9 @@ export async function putRoles(params) {
  * @param params 查询条件
  */
 export async function listRoles(params) {
-  const res = await request.get('/system/role', {
-    params
-  });
-  if (res.data.code === 0) {
+  let par = new URLSearchParams(params)
+  const res = await request.get(`/sys/role/page?`+par, {});
+  if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));

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

@@ -5,15 +5,76 @@ import request from '@/utils/request';
  * @param params 查询条件
  */
 export async function pageUsers(params) {
-  const res = await request.get('/system/user/page', {
-    params
-  });
-  if (res.data.code === 0) {
-    return res.data.data;
+  let par = new URLSearchParams(params)
+  const res = await request.get(`/system/account/getAccountPage?`+par, params);
+  if (res.data.code == 0 ) {
+    const result = {
+      count:0,
+      list:[]
+    }
+    result.count = res.data.data.total
+    result.list = res.data.data.records
+    return result;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 修改用户信息
+export async function putUsers(params) {
+  const res = await request.post('/system/account/update', params);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+// 新增用户
+export async function addUsers(params) {
+  const res = await request.post('/system/account/submit', params);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 删除用户
+export async function deleteUsers(params) {
+  const res = await request.post('/system/account/removeById', params);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 管理员重置密码
+export async function resetPassword(params) {
+  const res = await request.get(`/system/account/resetPassword/`+params, {});
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 修改用户密码
+export async function updatePassword(params) {
+  const res = await request.post('/system/account/updatePassword', params);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 退出登录
+export async function userLogout(params) {
+  const res = await request.post('/main/user/logout', params);
+  if (res.data.code == 0) {
+    return res.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
+// ————————————————————————原系统接口
 /**
  * 查询用户列表
  * @param params 查询条件

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;

ele-admin-template/src/i18n/lang/zh_CN/layout.js

@@ -6,12 +6,12 @@ export default {
     password: '修改密码',
     logout: '退出登录'
   },
-  footer: {
-    website: '官网',
-    document: '文档',
-    authorization: '授权',
-    copyright: 'Copyright © 2022 武汉易云智科技有限公司'
-  },
+  // footer: {
+  //   website: '官网',
+  //   document: '文档',
+  //   authorization: '授权',
+  //   copyright: 'Copyright © 2022 武汉易云智科技有限公司'
+  // },
   logout: {
     title: '提示',
     message: '确定要退出登录吗?'

ele-admin-template/src/i18n/lang/zh_CN/route3.js

@@ -0,0 +1,101 @@
+/* 菜单路由 */
+export default {
+  login: { _name: '登录' },
+  forget: { _name: '忘记密码' },
+  dashboard: {
+    _name: '主页',
+    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: '主数据',
+    basic: {
+      _name: '数据字典',
+     
+    },
+  },
+  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: '获取授权' }
+};

ele-admin-template/src/layout/components/header-tools.vue

@@ -61,6 +61,7 @@
   import SettingDrawer from './setting-drawer.vue';
   import I18nIcon from './i18n-icon.vue';
   import { logout } from '@/utils/page-tab-util';
+  import { userLogout } from '@/api/system/user'
 
   export default {
     components: { HeaderNotice, PasswordModal, SettingDrawer, I18nIcon },
@@ -99,7 +100,10 @@
             { type: 'warning' }
           )
             .then(() => {
-              logout();
+              userLogout().then(res=>{
+                 localStorage.removeItem('userId')
+                 logout();
+              })
             })
             .catch(() => {});
         }

ele-admin-template/src/layout/components/password-modal.vue

@@ -23,17 +23,17 @@
           placeholder="请输入旧密码"
         />
       </el-form-item>
-      <el-form-item label="新密码:" prop="password">
+      <el-form-item label="新密码:" prop="newPassword">
         <el-input
           show-password
-          v-model="form.password"
+          v-model="form.newPassword"
           placeholder="请输入新密码"
         />
       </el-form-item>
-      <el-form-item label="确认密码:" prop="password2">
+      <el-form-item label="确认密码:" prop="newPassword1">
         <el-input
           show-password
-          v-model="form.password2"
+          v-model="form.newPassword1"
           placeholder="请再次输入新密码"
         />
       </el-form-item>
@@ -46,8 +46,7 @@
 </template>
 
 <script>
-  import { updatePassword } from '@/api/layout';
-
+  import { updatePassword } from '@/api/system/user';
   export default {
     props: {
       visible: Boolean
@@ -59,8 +58,8 @@
         // 表单数据
         form: {
           oldPassword: '',
-          password: '',
-          password2: ''
+          newPassword: '',
+          newPassword1: ''
         },
         // 表单验证
         rules: {
@@ -71,14 +70,14 @@
               trigger: 'blur'
             }
           ],
-          password: [
+          newPassword: [
             {
               required: true,
               message: '请输入新密码',
               trigger: 'blur'
             }
           ],
-          password2: [
+          newPassword1: [
             {
               required: true,
               trigger: 'blur',
@@ -86,7 +85,7 @@
                 if (!value) {
                   return callback(new Error('请再次输入新密码'));
                 }
-                if (value !== this.form.password) {
+                if (value !== this.form.newPassword) {
                   return callback(new Error('两次输入密码不一致'));
                 }
                 callback();
@@ -106,6 +105,7 @@
         this.$refs.form.validate((valid) => {
           if (valid) {
             this.loading = true;
+            this.form.id =  localStorage.getItem('userId')
             updatePassword(this.form)
               .then((msg) => {
                 this.loading = false;
@@ -125,8 +125,8 @@
       onClose() {
         this.form = {
           oldPassword: '',
-          password: '',
-          password2: ''
+          newPassword: '',
+          newPassword1: ''
         };
         this.$refs.form.resetFields();
         this.loading = false;

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);
       // 用户权限
-      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 };
     },
+
     /**
      * 更新用户信息
      */

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

@@ -0,0 +1,30 @@
+<template>
+  <div class="ele-body ele-body-card">
+
+  </div>
+</template>
+
+<script>
+
+
+  export default {
+    name: '',
+    components: {
+
+    },
+    data() {
+      return {
+        
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+</style>

ele-admin-template/src/views/flowable/flowableDefine.vue

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

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

@@ -170,9 +170,10 @@
           }
           this.loading = true;
           login(this.form)
-            .then((msg) => {
+            .then(res => {
+              localStorage.setItem('userId', res.data.userId)
               this.loading = false;
-              this.$message.success(msg);
+              this.$message.success(res.message);
               this.goHome();
             })
             .catch((e) => {
@@ -183,7 +184,6 @@
       },
       /* 跳转到首页 */
       goHome() {
-        console.log(2222);
         this.$router.push(this.$route?.query?.from ?? '/').catch(() => {});
       },
       /* 更换图形验证码 */

ele-admin-template/src/views/system/user/components/role-select.vue

@@ -10,9 +10,9 @@
   >
     <el-option
       v-for="item in data"
-      :key="item.roleId"
-      :value="item.roleId"
-      :label="item.roleName"
+      :key="item.id"
+      :value="item.id"
+      :label="item.name"
     />
   </el-select>
 </template>
@@ -37,9 +37,13 @@
     },
     created() {
       /* 获取角色数据 */
-      listRoles()
-        .then((list) => {
-          this.data = list;
+      let params = {
+        pageNum:1,
+        size:99999999999
+      }
+      listRoles(params)
+        .then(res => {
+          this.data = res.records;
         })
         .catch((e) => {
           this.$message.error(e.message);

ele-admin-template/src/views/system/user/components/user-edit.vue

@@ -1,7 +1,7 @@
 <!-- 用户编辑弹窗 -->
 <template>
   <ele-modal
-    width="680px"
+    width="720px"
     :visible="visible"
     :append-to-body="true"
     :close-on-click-modal="true"
@@ -9,85 +9,45 @@
     :title="isUpdate ? '修改用户' : '添加用户'"
     @update:visible="updateVisible"
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="82px">
-      <el-row :gutter="15">
-        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="用户账号:" prop="username">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="用户账号:" prop="loginName">
             <el-input
               clearable
               :maxlength="20"
               :disabled="isUpdate"
-              v-model="form.username"
+              v-model="form.loginName"
               placeholder="请输入用户账号"
             />
           </el-form-item>
-          <el-form-item label="用户名:" prop="nickname">
-            <el-input
-              clearable
-              :maxlength="20"
-              v-model="form.nickname"
-              placeholder="请输入用户名"
-            />
-          </el-form-item>
-          <el-form-item label="性别:" prop="sex">
-            <el-select
-              clearable
-              class="ele-block"
-              v-model="form.sex"
-              placeholder="请选择性别"
-            >
-              <el-option label="男" value="1" />
-              <el-option label="女" value="2" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="角色:" prop="roleIds">
-            <role-select v-model="form.roleIds" />
-          </el-form-item>
-          <el-form-item label="邮箱:" prop="email">
-            <el-input
-              clearable
-              :maxlength="100"
-              v-model="form.email"
-              placeholder="请输入邮箱"
-            />
-          </el-form-item>
         </el-col>
-        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="手机号:" prop="phone">
-            <el-input
-              clearable
-              :maxlength="11"
-              v-model="form.phone"
-              placeholder="请输入手机号"
-            />
-          </el-form-item>
-          <el-form-item label="出生日期:" prop="birthday">
-            <el-date-picker
-              type="date"
-              class="ele-fluid"
-              v-model="form.birthday"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择出生日期"
-            />
+        <el-col :span="12">
+          <el-form-item label="用户角色:" prop="roleId">
+            <role-select v-model="form.roleId" />
           </el-form-item>
-          <el-form-item v-if="!isUpdate" label="登录密码:" prop="password">
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="!isUpdate" label="登录密码:" prop="loginPwd">
             <el-input
               show-password
               :maxlength="20"
-              v-model="form.password"
+              v-model="form.loginPwd"
               placeholder="请输入登录密码"
             />
           </el-form-item>
-          <el-form-item label="个人简介:">
-            <el-input
-              :rows="4"
-              clearable
-              type="textarea"
-              :maxlength="200"
-              v-model="form.introduction"
-              placeholder="请输入个人简介"
-            />
-          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+           <el-form-item label="启用状态:" prop="enable">
+             <el-switch
+               v-model="form.enable"
+               active-color="#13ce66"
+               inactive-color="#ff4949"
+               :active-value="1"
+               :inactive-value="0"
+             >
+             </el-switch>
+           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
@@ -101,9 +61,9 @@
 </template>
 
 <script>
-  import { emailReg, phoneReg } from 'ele-admin';
+  // import { emailReg, phoneReg } from 'ele-admin';
   import RoleSelect from './role-select.vue';
-  import { addUser, updateUser, checkExistence } from '@/api/system/user';
+  import { addUsers, putUsers } from '@/api/system/user';
 
   export default {
     components: { RoleSelect },
@@ -115,16 +75,11 @@
     },
     data() {
       const defaultForm = {
-        userId: null,
-        username: '',
-        nickname: '',
-        sex: null,
-        roleIds: [],
-        email: '',
-        phone: '',
-        birthday: '',
-        password: '',
-        introduction: ''
+        id: null,
+        loginName: '',
+        roleId: [],
+        loginPwd: '',
+        enable:1
       };
       return {
         defaultForm,
@@ -132,67 +87,9 @@
         form: { ...defaultForm },
         // 表单验证规则
         rules: {
-          username: [
-            {
-              required: true,
-              trigger: 'blur',
-              validator: (_rule, value, callback) => {
-                if (!value) {
-                  return callback(new Error('请输入用户账号'));
-                }
-                checkExistence('username', value, this.data?.username)
-                  .then(() => {
-                    callback(new Error('账号已经存在'));
-                  })
-                  .catch(() => {
-                    callback();
-                  });
-              }
-            }
-          ],
-          nickname: [
-            {
-              required: true,
-              message: '请输入用户名',
-              trigger: 'blur'
-            }
-          ],
-          sex: [
-            {
-              required: true,
-              message: '请选择性别',
-              trigger: 'blur'
-            }
-          ],
-          roleIds: [
-            {
-              required: true,
-              message: '请选择角色',
-              trigger: 'blur'
-            }
-          ],
-          email: [
-            {
-              pattern: emailReg,
-              message: '邮箱格式不正确',
-              trigger: 'blur'
-            }
-          ],
-          password: [
-            {
-              required: true,
-              pattern: /^[\S]{5,18}$/,
-              message: '密码必须为5-18位非空白字符',
-              trigger: 'blur'
-            }
-          ],
-          phone: [
-            {
-              pattern: phoneReg,
-              message: '手机号格式不正确',
-              trigger: 'blur'
-            }
-          ]
+          loginName: [{required: true, message: '请输入用户账号',trigger: 'blur'}],
+          roleId: [{required: true, message: '请选择角色',trigger: 'blur'}],
+          loginPwd: [{required: true, pattern: /^[\S]{5,18}$/,message: '密码必须为5-18位非空白字符',trigger: 'blur'}]
         },
         // 提交状态
         loading: false,
@@ -214,13 +111,16 @@
             return false;
           }
           this.loading = true;
+          if(!this.isUpdate){
+            delete this.form.id
+          }
           const data = {
             ...this.form,
-            roles: this.form.roleIds.map((d) => {
-              return { roleId: d };
-            })
+            // roleId: this.form.roleIds.map((d) => {
+            //   return { roleId: d };
+            // })
           };
-          const saveOrUpdate = this.isUpdate ? updateUser : addUser;
+          const saveOrUpdate = this.isUpdate ? putUsers : addUsers;
           saveOrUpdate(data)
             .then((msg) => {
               this.loading = false;
@@ -245,8 +145,8 @@
           if (this.data) {
             this.$util.assignObject(this.form, {
               ...this.data,
-              roleIds: this.data.roles.map((d) => d.roleId),
-              password: ''
+              roleId: this.data.roleList.map((d) => d.id),
+              loginPwd: ''
             });
             this.isUpdate = true;
           } else {

ele-admin-template/src/views/system/user/components/user-search.vue

@@ -9,10 +9,10 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="用户账号:">
-          <el-input clearable v-model="where.username" placeholder="请输入" />
+          <el-input clearable v-model="where.loginName" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="用户名:">
           <el-input clearable v-model="where.nickname" placeholder="请输入" />
         </el-form-item>
@@ -29,7 +29,7 @@
             <el-option label="女" :value="2" />
           </el-select>
         </el-form-item>
-      </el-col>
+      </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <div class="ele-form-actions">
           <el-button
@@ -52,9 +52,9 @@
     data() {
       // 默认表单数据
       const defaultWhere = {
-        username: '',
-        nickname: '',
-        sex: undefined
+        loginName: '',
+        // nickname: '',
+        // sex: undefined
       };
       return {
         // 表单数据

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

@@ -41,31 +41,34 @@
           </el-button>
         </template>
         <!-- 用户名列 -->
-        <template v-slot:nickname="{ row }">
+<!--        <template v-slot:nickname="{ row }">
           <router-link :to="'/system/user/details?id=' + row.userId">
             {{ row.nickname }}
           </router-link>
-        </template>
+        </template> -->
         <!-- 角色列 -->
-        <template v-slot:roles="{ row }">
+        <template v-slot:roleList="{ row }">
           <el-tag
-            v-for="item in row.roles"
-            :key="item.roleId"
+            v-for="(item,index) in row.roleList"
+            :key="item.id"
             size="mini"
             type="primary"
             :disable-transitions="true"
           >
-            {{ item.roleName }}
+            {{ item.name }}
           </el-tag>
         </template>
         <!-- 状态列 -->
-        <template v-slot:status="{ row }">
+        <template v-slot:enable="{ row }">
           <el-switch
-            :active-value="0"
-            :inactive-value="1"
-            v-model="row.status"
-            @change="editStatus(row)"
-          />
+            v-model="row.enable"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :active-value="1"
+            :inactive-value="0"
+            @change="changeEnable(row)"
+          >
+          </el-switch>
         </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
@@ -112,10 +115,9 @@
   import UserImport from './components/user-import.vue';
   import {
     pageUsers,
-    removeUser,
-    removeUsers,
-    updateUserStatus,
-    updateUserPassword
+    putUsers,
+    deleteUsers,
+    resetPassword
   } from '@/api/system/user';
 
   export default {
@@ -145,40 +147,18 @@
             fixed: 'left'
           },
           {
-            prop: 'username',
+            prop: 'loginName',
             label: '用户账号',
             sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'nickname',
-            label: '用户名',
-            sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 110,
-            slot: 'nickname'
-          },
-          {
-            prop: 'sexName',
-            label: '性别',
-            sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 80
-          },
-          {
-            prop: 'phone',
-            label: '手机号',
-            sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
-          {
-            columnKey: 'roles',
+            columnKey: 'roleList',
             label: '角色',
             showOverflowTooltip: true,
             minWidth: 110,
-            slot: 'roles'
+            slot: 'roleList'
           },
           {
             prop: 'createTime',
@@ -191,13 +171,13 @@
             }
           },
           {
-            prop: 'status',
+            prop: 'enable',
             label: '状态',
             align: 'center',
             sortable: 'custom',
             width: 80,
             resizable: false,
-            slot: 'status',
+            slot: 'enable',
             showOverflowTooltip: true
           },
           {
@@ -223,7 +203,21 @@
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
-        return pageUsers({ ...where, ...order, page, limit });
+        return pageUsers({ ...where, ...order, pageNum:page, size:limit });
+      },
+      async changeEnable(row) {
+        let params = {...row}
+        params.roleId = row.roleList.map((d) => d.id)
+        delete params.roleList
+        const res = await putUsers(params);
+        if (res.code == 0) {
+          this.$message({
+            type: 'success',
+            message: '修改成功',
+            customClass: 'ele-message-border'
+          });
+          this.reload();
+        }
       },
       /* 刷新表格 */
       reload(where) {
@@ -241,7 +235,7 @@
       /* 删除 */
       remove(row) {
         const loading = this.$loading({ lock: true });
-        removeUser(row.userId)
+        deleteUsers([row.id])
           .then((msg) => {
             loading.close();
             this.$message.success(msg);
@@ -263,7 +257,7 @@
         })
           .then(() => {
             const loading = this.$loading({ lock: true });
-            removeUsers(this.selection.map((d) => d.userId))
+            deleteUsers(this.selection.map((d) => d.id ))
               .then((msg) => {
                 loading.close();
                 this.$message.success(msg);
@@ -283,7 +277,7 @@
         })
           .then(() => {
             const loading = this.$loading({ lock: true });
-            updateUserPassword(row.userId)
+            resetPassword(row.id)
               .then((msg) => {
                 loading.close();
                 this.$message.success(msg);

ele-admin-template/vue.config.js

@@ -15,11 +15,9 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.3.51:18086', // 跨域请求的地址
-        // http://192.168.3.41:8080/
+        target: 'http://192.168.3.51:18086', // 跨域请求的地址
         // target: 'http://192.168.3.35:8080', // kang杨威
-        target: ' http://192.168.3.41:8080', // 何江鹏
-        // target: 'http://192.168.3.31:8080', // 黄峥嵘
+        //target: 'http://192.168.3.25:8080', // 黄峥嵘
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''