From 8b6b373803f4ea2d92cc604884a0c080d9d18f3f Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 5 Jul 2023 10:57:07 +0800
Subject: [PATCH] =?UTF-8?q?7.5=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/login.js                        |  19 +-
 src/api/admin/post.js                         |   9 +-
 src/api/admin/role.js                         |   7 +
 src/api/admin/sys-api.js                      |   9 +-
 src/api/admin/sys-dept.js                     |   2 +-
 src/api/admin/sys-user.js                     |   6 +-
 src/directive/permission/permission.js        |  13 +-
 src/layout/components/Avatar/index.vue        |   3 +
 src/layout/components/Menu/SubMenu.vue        |   4 +-
 src/main.js                                   |   6 +-
 src/router/index.js                           |   2 +
 src/store/permission.js                       |  59 +++--
 src/store/userInfo.js                         |  14 +-
 src/views/admin/sys-api/index.vue             |  73 +++---
 src/views/admin/sys-dept/index.vue            | 105 ++++----
 src/views/admin/sys-menu/index.vue            |  65 +++--
 src/views/admin/sys-post/index.vue            | 110 ++++----
 src/views/admin/sys-role/index.vue            |  22 +-
 .../admin/sys-user/components/TreeDept.vue    |  16 +-
 src/views/admin/sys-user/index.vue            | 245 ++++++++++++------
 20 files changed, 456 insertions(+), 333 deletions(-)

diff --git a/src/api/admin/login.js b/src/api/admin/login.js
index af3ae91..35b8946 100644
--- a/src/api/admin/login.js
+++ b/src/api/admin/login.js
@@ -1,15 +1,21 @@
 import request from '../../utils/request';
 export function login(data) {
   return request({
-    url:'/admin/basic/login',
+    url:'/admin/login',
     method: 'post',
     data
   })
 }
+export function logout() {
+  return request({
+    url:'/admin/user/loginout',
+    method: 'put'
+  })
+}
 
 export function getCaptcha() {
   return request({
-    url:'/admin/basic/captcha',
+    url:'/admin/captcha',
     method: 'get'
   })
 }
@@ -24,7 +30,14 @@ export function getAppConfig() {
 // 根据角色获取菜单
 export function getUserMenuRole() {
   return request({
-    url:'/admin/role/menu',//'https://www.fastmock.site/mock/ebb1956b65d6078940cacb295a06be27/mock/menu', //
+    url:'/admin/user/menu',//'https://www.fastmock.site/mock/ebb1956b65d6078940cacb295a06be27/mock/menu', //
+    method: 'get'
+  })
+}
+// 根据角色获取按钮权限Button
+export function getUserButtonRole() {
+  return request({
+    url:'/admin/user/button',//'https://www.fastmock.site/mock/ebb1956b65d6078940cacb295a06be27/mock/menu', //
     method: 'get'
   })
 }
\ No newline at end of file
diff --git a/src/api/admin/post.js b/src/api/admin/post.js
index aafdc82..9ab4043 100644
--- a/src/api/admin/post.js
+++ b/src/api/admin/post.js
@@ -1,6 +1,6 @@
 import request from '../../utils/request'
 
-const url = '/api/v1/post';
+const url = '/admin/post';
 
 export function getPost(params) {
   return request({
@@ -9,6 +9,13 @@ export function getPost(params) {
     params
   })
 }
+export function getPostList(params){
+  return request({
+    url:'/admin/post/list',
+    method: 'get',
+    params
+  })
+}
 
 export function addPost(data) {
   return request({
diff --git a/src/api/admin/role.js b/src/api/admin/role.js
index eefb4b4..74569a6 100644
--- a/src/api/admin/role.js
+++ b/src/api/admin/role.js
@@ -8,6 +8,13 @@ export function getRole(params) {
     params
   })
 }
+export function getRoleList(params) {
+  return request({
+    url:'/admin/role/list',
+    method: 'get',
+    params,
+  })
+}
 
 export function addRole(data) {
   return request({
diff --git a/src/api/admin/sys-api.js b/src/api/admin/sys-api.js
index ea12824..446fc05 100644
--- a/src/api/admin/sys-api.js
+++ b/src/api/admin/sys-api.js
@@ -1,6 +1,6 @@
 import request from '../../utils/request';
 
-const url = '/api/v1/sys-api';
+const url = '/admin/api';
 
 export function getSysApi(params) {
   return request({
@@ -9,7 +9,12 @@ export function getSysApi(params) {
     params
   })
 }
-
+export function getSysApiList() {
+  return request({
+    url:'/admin/api/list',
+    method: 'get'
+  })
+}
 export function addSysApi(data) {
   return request({
     url,
diff --git a/src/api/admin/sys-dept.js b/src/api/admin/sys-dept.js
index 1d8a8ea..b7ca6e2 100644
--- a/src/api/admin/sys-dept.js
+++ b/src/api/admin/sys-dept.js
@@ -1,6 +1,6 @@
 import request from '../../utils/request';
 
-const url = '/api/v1/dept';
+const url = '/admin/dept';
 
 export function getDept(params) {
   return request({
diff --git a/src/api/admin/sys-user.js b/src/api/admin/sys-user.js
index deec462..6e88063 100644
--- a/src/api/admin/sys-user.js
+++ b/src/api/admin/sys-user.js
@@ -34,9 +34,9 @@ export function removeUser(data) {
   })
 }
 
-export function updateUser(data) {
+export function updateUser(data,id) {
   return request({
-    url,
+    url:`${url}/${id}`,
     method: 'put',
     data,
   })
@@ -52,7 +52,7 @@ export function updateUserStatus(data) {
 
 export function resetUserPwd(data) {
   return request({
-    url:'/api/v1/user/pwd/reset',
+    url:'/admin/user/password',
     method: 'put',
     data
   })
diff --git a/src/directive/permission/permission.js b/src/directive/permission/permission.js
index 59c185d..64058fb 100644
--- a/src/directive/permission/permission.js
+++ b/src/directive/permission/permission.js
@@ -1,15 +1,16 @@
-import { useUserStore } from '@/store/userInfo';
+import { usePermissionStore } from '@/store/permission';
 
 export default {
   checkPermission(el, binding) {
-    const store = useUserStore();
+    const store = usePermissionStore();
     const { value } = binding;
-    const all_permission = '*:*:*'
-    const permissions = store.userInfo && store.userInfo.permissions;
-
+    const permissions = store.buttonPermissions;
+    const all_permission = '*'
+    console.log('permissions-------');
+    console.log(permissions);
     if (typeof value === 'string') {
       const hasPermission = permissions.some((permission) => {
-        return all_permission === permission || value === permission;
+        return all_permission==permission || value === permission;
       })
   
       if (!hasPermission) {
diff --git a/src/layout/components/Avatar/index.vue b/src/layout/components/Avatar/index.vue
index 1d49fda..0c7d455 100644
--- a/src/layout/components/Avatar/index.vue
+++ b/src/layout/components/Avatar/index.vue
@@ -42,11 +42,14 @@ const { userInfo } = storeToRefs(store);
 const { proxy } = getCurrentInstance();
 
 const handleLogout = () => {
+ 
   proxy.$modal.warning({
     title: '提示',
     content: '确定注销并退出登陆系统吗？',
     hideCancel: false,
     onOk: () => {
+      const store = useUserStore();
+      store.userLogut();
       window.sessionStorage.removeItem('token');
       clearLocalStorage();
       proxy.$router.push('/login');
diff --git a/src/layout/components/Menu/SubMenu.vue b/src/layout/components/Menu/SubMenu.vue
index f79b702..a15bcbb 100644
--- a/src/layout/components/Menu/SubMenu.vue
+++ b/src/layout/components/Menu/SubMenu.vue
@@ -7,13 +7,13 @@
        <template #icon>
         <component :is="menu.icon" v-if="menu.icon"/>
       </template> 
-      <template #title>{{ menu.menu_name }}</template>
+      <template #title>{{ menu.menu_title }}</template>
       <sub-menu :menuList="menu.children" />
     </a-sub-menu>
     <a-menu-item
       v-if="menu.parent_id!=0 && isRouteParams(menu.path)"
       :key="menu.path"
-      >{{ menu.menu_name }}</a-menu-item>
+      >{{ menu.menu_title }}</a-menu-item>
   </template>
 </template> 
 <script setup>
diff --git a/src/main.js b/src/main.js
index a707c4a..8646924 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,18 +8,16 @@ import router from './router/';
 import { parseTime } from '@/utils/parseTime';
 
 // Directive
-//import permission from '@/directive/permission/permission';
+import permission from '@/directive/permission/permission';
 
 // 引入 Arco 图标库
 import * as ArcoIconModules from '@arco-design/web-vue/es/icon';
 
-console.log(import.meta.env);
-
 // Initialize the Pinia instance
 const pinia = createPinia();
 const app = createApp(App);
 
-// app.directive('has', permission.checkPermission);
+app.directive('has', permission.checkPermission);
 
 // 挂载全局变量
 app.config.globalProperties.message = Message;
diff --git a/src/router/index.js b/src/router/index.js
index 895b989..9e1664c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -80,7 +80,9 @@ router.beforeEach(async (to, from, next) => {
     console.log(store.token,permissionStore.addRouters.length)
     if (store.token && permissionStore.addRouters.length==0) {
       //store.getUserInfo();
+      await permissionStore.getButtonRole();
       await permissionStore.getMenuRole();
+      console.log(permissionStore.addRouters)
        permissionStore.addRouters.forEach((route) => {
         router.addRoute('/', route);
       });
diff --git a/src/store/permission.js b/src/store/permission.js
index 542497b..b01cfdb 100644
--- a/src/store/permission.js
+++ b/src/store/permission.js
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia';
-import { getUserMenuRole } from '@/api/admin/login';
-
-
+import { getUserMenuRole,getUserButtonRole } from '@/api/admin/login';
+// import {  getCurrentInstance} from 'vue';
+// const { proxy } = getCurrentInstance();
 const modules = import.meta.glob('../views/**/*.vue');
 
 export const usePermissionStore = defineStore('permisson', {
@@ -9,6 +9,7 @@ export const usePermissionStore = defineStore('permisson', {
     return {
       addRouters: [],
       menuList: [],
+      buttonPermissions:[]
     };
   },
   getters: {
@@ -19,43 +20,45 @@ export const usePermissionStore = defineStore('permisson', {
       this.menuList = menus;
     },
     GenerateRoutes(routeList) {
-     try {
       const routes = [];
-
+      const buttons=[];
       routeList.forEach((item) => {
            const route = {};
-            route.path = item.path;
-            route.name = item.menu_title;
-            if (item.parent_id==0) {
-              route.component = modules[`../views/index.vue`];
-            } else{
-              route.component = modules[`../views${item.component}.vue`] || modules['../views/error-page/888.vue'];
+            if (item.menu_type ==1 || item.menu_type ==2) {
+              route.path = item.path;
+              route.name = item.menu_name;
+              if (item.menu_type ==1) {
+                route.component = modules[`../views/index.vue`];
+              } else if (item.menu_type ==2) {
+                route.component = modules[`../views${item.component}.vue`] || modules['../views/error-page/888.vue'];
+              }
+              route.meta = {
+                title: item.menu_title,
+                permission: item.permission,
+              };
+             
+            } 
+           
+            if (item.children) {
+              route.children = this.GenerateRoutes(item.children);
             }
-            route.meta = {
-              title: item.menu_name,
-              permission: item.permission,
-            };
-
-          if (item.children) {
-            route.children = this.GenerateRoutes(item.children);
-          }
           routes.push(route);
         // }
       });
-    
       return routes;
-     } catch (error) {
-      
-     }
     },
     async getMenuRole() {
       const res = await getUserMenuRole();
-      console.log(res.data);
       this.setMenuList(res.data);
-      this.addRouters = await this.GenerateRoutes(res.data);
-      console.log("--------this.addRouters");
-      console.log(this.addRouters);
-
+      this.addRouters =await this.GenerateRoutes(res.data);
+    },
+    async getButtonRole() {
+      const {code,data,message} = await getUserButtonRole();
+      if(code==200){
+        this.buttonPermissions=data;
+      }else{
+        //proxy.$notification.error(message);
+      }
     },
     ClearMenuList() {
       this.menuList = [];
diff --git a/src/store/userInfo.js b/src/store/userInfo.js
index 1678d03..fdf41dc 100644
--- a/src/store/userInfo.js
+++ b/src/store/userInfo.js
@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia';
 import { setLocalStorage, getLocalStorage } from '@/utils/storage';
+import {logout} from '@/api/admin/login'
 import { getInfo } from '@/api/admin/sys-user';
 import { getAppConfig } from '@/api/admin/login';
 
@@ -9,6 +10,7 @@ export const useUserStore = defineStore('user', {
       token: window.sessionStorage.getItem('token') || '',
       uid: window.sessionStorage.getItem('uid') || '',
       sysConfig: getLocalStorage('sysConfig'),
+      buttonPermissions:[],
       userInfo:window.sessionStorage.getItem('manage-userInfo')?JSON.parse(window.sessionStorage.getItem('manage-userInfo')):''
     }
   },
@@ -46,10 +48,14 @@ export const useUserStore = defineStore('user', {
       } catch (err) {
         console.error(err);
       }
+    },
+  async userLogut() {
+    const {code} = await logout();
+    if(code==200){
+      this.token = null;
+      this.userInfo = null;
     }
-  },
-  userLogout() {
-    this.token = null;
-    this.userInfo = null;
+   
   }
+}
 })
diff --git a/src/views/admin/sys-api/index.vue b/src/views/admin/sys-api/index.vue
index 4f442f4..558fda9 100644
--- a/src/views/admin/sys-api/index.vue
+++ b/src/views/admin/sys-api/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <a-form :model="queryForm" ref="queryFormRef" layout="inline">
-      <a-form-item field="title" label="标题">
-        <a-input v-model="queryForm.title" placeholder="请输入标题" @press-enter="handleQuery" />
+      <a-form-item field="api_name" label="标题">
+        <a-input v-model="queryForm.api_name" placeholder="请输入标题" @press-enter="handleQuery" />
       </a-form-item>
-      <a-form-item field="path" label="地址">
-        <a-input v-model="queryForm.path" placeholder="请输入地址" @press-enter="handleQuery" />
+      <a-form-item field="api_path" label="地址">
+        <a-input v-model="queryForm.api_path" placeholder="请输入地址" @press-enter="handleQuery" />
       </a-form-item>
       <a-form-item field="action" label="类型">
-        <a-select v-model="queryForm.action" placeholder="请选择类型">
+        <a-select v-model="queryForm.api_method" placeholder="请选择类型">
           <a-option>GET</a-option>
           <a-option>POST</a-option>
           <a-option>PUT</a-option>
@@ -43,12 +43,12 @@
         'show-total': true,
         'show-jumper': true,
         'show-page-size': true,
-        total: pager.count,
+        total: pager.total,
         current: currentPage,
       }"
       row-key="id"
       @page-change="handlePageChange"
-      @page-size-change="handlePageSizeChange"
+      @page-size-change="handlepage_sizeChange"
     > 
       <template #reqType="{ record }">
         <a-tag v-if="record.action.toLowerCase() === 'get'" color="cyan">{{record.action}}</a-tag>
@@ -71,25 +71,12 @@
     >
       <template #title> 修改接口管理 </template>
       <a-form :model="drawerForm" ref="drawerFormRef" :rules="rules">
-        <a-form-item field="handle" label="Handle">
-          <a-input v-model="drawerForm.handle" placeholder="请输入Handle" />
-        </a-form-item>
-        <a-form-item field="title" label="标题">
-          <a-input v-model="drawerForm.title" placeholder="请输入标题" />
-        </a-form-item>
-        <a-form-item field="type" label="类型">
-          <a-select
-            v-model="drawerForm.type"
-            placeholder="请选择类型"
-            allow-clear
-          >
-            <a-option>SYS</a-option>
-            <a-option>BUS</a-option>
-          </a-select>
+        <a-form-item field="api_name" label="标题">
+          <a-input v-model="drawerForm.api_name" placeholder="请输入标题" />
         </a-form-item>
         <a-form-item field="action" label="方式">
           <a-select
-            v-model="drawerForm.action"
+            v-model="drawerForm.api_method"
             placeholder="请选择请求方式"
             allow-clear
           >
@@ -100,7 +87,7 @@
           </a-select>
         </a-form-item>
         <a-form-item field="path" label="路径">
-          <a-input v-model="drawerForm.path" disabled />
+          <a-input v-model="drawerForm.api_path" disabled />
         </a-form-item>
       </a-form>
     </a-drawer>
@@ -119,9 +106,9 @@ const currentPage = ref(1);
 
 // Pager
 const pager = {
-  count: 0,
-  pageIndex: 1,
-  pageSize: 10,
+  total: 0,
+  page: 1,
+  page_size: 10,
 };
 
 // From 定义
@@ -139,10 +126,10 @@ const drawerVisible = ref(false);
 
 // Table Columns
 const columns = [
-  { title: '标题', dataIndex: 'title' },
-  { title: '请求类型', dataIndex: 'action', slotName: 'reqType' },
-  { title: '请求信息', dataIndex: 'path' },
-  { title: '创建时间', dataIndex: 'createdAt', slotName: 'createdAt' },
+  { title: '标题', dataIndex: 'api_name' },
+  { title: '请求类型', dataIndex: 'api_method', slotName: 'api_method' },
+  { title: '请求链接', dataIndex: 'api_path' },
+  { title: '创建时间', dataIndex: 'created_at', slotName: 'created_at' },
   { title: '操作', slotName: 'action' },
 ];
 
@@ -155,19 +142,19 @@ const handleDrawerSubmit = (done) => {
   proxy.$refs.drawerFormRef.validate(async (valid) => {
     if (!valid) {
       let res;
-      if (!drawerForm.id) {
-        const { code, msg } = await addSysApi(drawerForm);
+      if (!drawerForm.api_id) {
+        const { code, message } = await addSysApi(drawerForm);
         if (code == 200 ) {
           proxy.$notification.success('新增成功');
         } else {
-          proxy.$notification.error(msg);
+          proxy.$notification.error(message);
         }
       } else {
-        const { code, msg } = await updateSysApi(drawerForm, drawerForm.id);
+        const { code, message } = await updateSysApi(drawerForm, drawerForm.api_id);
         if (code == 200 ) {
           proxy.$notification.success('修改成功');
         } else {
-          proxy.$notification.error(msg);
+          proxy.$notification.error(message);
         }
       }
       drawerVisible.value = false;
@@ -211,7 +198,7 @@ const handleUpdate = async (record) => {
  * @param {Number} [page]
  */
 const handlePageChange = (page) => {
-  pager.pageIndex = page;
+  pager.page = page;
 
   // 修改当前页码
   currentPage.value = page;
@@ -219,19 +206,19 @@ const handlePageChange = (page) => {
 };
 
 // 每页数据量
-const handlePageSizeChange = (pageSize) => {
-  pager.pageSize = pageSize;
+const handlepage_sizeChange = (page_size) => {
+  pager.page_size = page_size;
   getSysApiInfo({ ...pager, ...queryForm });
 };
 
 // 获取接口信息
 const getSysApiInfo = async (params = {}) => {
-  const { data, code, msg } = await getSysApi(params);
+  const { data, code, message } = await getSysApi(params);
   if ( code == 200 ) {
-    tableData.value = data.list;
-    Object.assign(pager, { count: data.count, pageIndex: data.pageIndex, pageSize: data.pageSize });
+    tableData.value = data.data;
+    Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
   } else {
-    proxy.$notification.error(msg);
+    proxy.$notification.error(message);
   }
 };
 
diff --git a/src/views/admin/sys-dept/index.vue b/src/views/admin/sys-dept/index.vue
index 1e067a0..c10f2ba 100644
--- a/src/views/admin/sys-dept/index.vue
+++ b/src/views/admin/sys-dept/index.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <a-form :model="queryForm" ref="queryFormRef" layout="inline">
-      <a-form-item field="deptName" label="部门名称">
-        <a-input v-model="queryForm.deptName" placeholder="请输入部门名称" @press-enter="handleQuery" />
+      <a-form-item field="dept_name" label="部门名称">
+        <a-input v-model="queryForm.dept_name" placeholder="请输入部门名称" @press-enter="handleQuery" />
       </a-form-item>
-      <a-form-item field="status" label="部门状态">
-        <a-select v-model="queryForm.status" placeholder="请选择部门状态">
+      <a-form-item field="dept_status" label="部门状态">
+        <a-select v-model="queryForm.dept_status" placeholder="请选择部门状态">
           <a-option :value="2">正常</a-option>
           <a-option :value="1">停用</a-option>
         </a-select>
       </a-form-item>
       <a-form-item>
         <a-space>
-          <a-button v-has="'admin:sysDept:query'" type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+          <a-button  type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
           <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
         </a-space>
       </a-form-item>
@@ -21,7 +21,7 @@
     <a-divider />
 
     <div class="action">
-      <a-button v-has="'admin:sysDept:add'" type="primary" @click="handleAdd()"><icon-plus /> 新增</a-button>
+      <a-button  type="primary" @click="handleAdd()"><icon-plus /> 新增</a-button>
     </div>
 
     <!-- 异步数据需要defualt-expanded-keys 传入所有行Key才能默认展开 -->
@@ -32,17 +32,17 @@
       :default-expanded-keys="[1]"
       row-key="deptId"
     >
-      <template #status="{ record }">
-        <a-tag color="green" v-if="record.status === 2">正常</a-tag>
+      <template #dept_status="{ record }">
+        <a-tag color="green" v-if="record.dept_status === 2">正常</a-tag>
         <a-tag color="red" v-else> 停用 </a-tag>
       </template>
-      <template #createdAt="{ record }">
-        {{ parseTime(record.createdAt) }}
+      <template #created_at="{ record }">
+        {{ parseTime(record.created_at) }}
       </template>
       <template #action="{ record }">
-        <a-button v-has="'admin:sysDept:edit'" type="text" @click="handleUpdate(record)"><icon-edit /> 修改</a-button>
-        <a-button v-has="'admin:sysDept:add'" type="text" @click="handleAdd(record)"><icon-plus /> 新增</a-button>
-        <a-button v-has="'admin:sysDept:remove'" type="text" @click="() => { deleteVisible = true; deleteData = [record.deptId];  }"><icon-delete /> 删除</a-button>
+        <a-button  type="text" @click="handleUpdate(record)"><icon-edit /> 修改</a-button>
+        <a-button  type="text" @click="handleAdd(record)"><icon-plus /> 新增</a-button>
+        <a-button  type="text" @click="() => { deleteVisible = true; deleteData = [record.dept_id];  }"><icon-delete /> 删除</a-button>
       </template>
     </a-table>
 
@@ -57,29 +57,29 @@
       <a-form :model="modalForm" :rules="rules" ref="modalFormRef">
         <a-form-item field="parentId" label="上级部门">
           <a-tree-select
-            v-model="modalForm.parentId"
+            v-model="modalForm.parent_id"
             :data="tableData"
-            :field-names="{ key: 'deptId', title: 'deptName' }"
+            :field-names="{ key: 'dept_id', title: 'dept_name' }"
             placeholder="请选择上级部门"
             allow-clear
           />
         </a-form-item>
-        <a-form-item field="deptName" label="部门名称">
-          <a-input v-model="modalForm.deptName" placeholder="请输入部门名称" />
+        <a-form-item field="dept_name" label="部门名称">
+          <a-input v-model="modalForm.dept_name" placeholder="请输入部门名称" />
         </a-form-item>
-        <a-form-item field="leader" label="负责人">
+        <!-- <a-form-item field="leader" label="负责人">
           <a-input v-model="modalForm.leader" placeholder="请输入负责人" />
-        </a-form-item>
+        </a-form-item> 
         <a-form-item field="phone" label="联系电话">
           <a-input v-model="modalForm.phone" placeholder="请输入联系电话" />
         </a-form-item>
         <a-form-item field="email" label="邮箱">
           <a-input v-model="modalForm.email" placeholder="请输入邮箱" />
-        </a-form-item>
+        </a-form-item>-->
         <a-form-item field="status" label="部门状态">
           <a-radio-group v-model="modalForm.status">
-            <a-radio :value="2">正常</a-radio>
-            <a-radio :value="1">停用</a-radio>
+            <a-radio :value="1">正常</a-radio>
+            <a-radio :value="2">删除</a-radio>
           </a-radio-group>
         </a-form-item>
       </a-form>
@@ -89,6 +89,7 @@
     <DeleteModal 
       :data="deleteData" 
       :visible="deleteVisible" 
+      :delType="'dept_ids'"
       :apiDelete="removeDept" 
       @deleteVisibleChange="() => deleteVisible = false"
     />
@@ -120,35 +121,31 @@ const modalTitle = ref('默认标题');
 // Form
 const queryForm = reactive({});
 const modalForm = reactive({
-  status: 2,
+  status: 1,
 });
 
 // rules
 const rules = {
-  parentId: [{ required: true, message: '请选择上级部门' }],
-  deptName: [{ required: true, message: '请输入部门名称' }],
-  leader: [{ required: true, message: '请输入负责人' }],
+  parent_id: [{ required: true, message: '请选择上级部门' }],
+  dept_name: [{ required: true, message: '请输入部门名称' }],
+  // leader: [{ required: true, message: '请输入负责人' }],
 };
 
 // Columns
 const columns = [
   {
     title: '部门名称',
-    dataIndex: 'deptName',
-  },
-  {
-    title: '排序',
-    dataIndex: 'sort',
-  },
-  {
-    title: '状态',
-    dataIndex: 'status',
-    slotName: 'status',
+    dataIndex: 'dept_name',
   },
+  // {
+  //   title: '状态',
+  //   dataIndex: 'dept_status',
+  //   slotName: 'dept_status',
+  // },
   {
     title: '创建时间',
-    dataIndex: 'createdAt',
-    slotName: 'createdAt',
+    dataIndex: 'created_at',
+    slotName: 'created_at',
   },
   {
     title: '操作',
@@ -173,11 +170,11 @@ const handleResetQuery = () => {
 }
 
 // 新增
-const handleAdd = ({ deptId, status = 2 } = {}) => {
+const handleAdd = ({ dept_id, dept_status = 2 } = {}) => {
   modalVisible.value = true;
   modalTitle.value = '新增部门';
 
-  if (deptId) Object.assign(modalForm, {parentId: deptId, status});
+  if (dept_id) Object.assign(modalForm, {parent_id:  dept_id, dept_status});
 };
 
 // 修改
@@ -186,15 +183,15 @@ const handleUpdate = async (record) => {
   modalTitle.value = '修改部门信息';
 
   await nextTick();
-  const { parentId, deptName, leader, phone, email, status, deptId } = record;
+  const { parent_id, dept_name, leader, phone, email, dept_status, dept_id } = record;
   Object.assign(modalForm, {
-    parentId,
-    deptName,
+    parent_id,
+    dept_name,
     leader,
     phone,
     email,
-    status,
-    deptId,
+    dept_status,
+    dept_id,
   });
 };
 
@@ -203,9 +200,9 @@ function deepDelChildren(data) {
   const depts = data;
   let len = depts?.length;
   // let len = depts && depts.length;
-
+  
   for (let i = 0; i < len; i++) {
-    if (depts[i].children.length > 0) {
+    if (depts[i].children && depts[i].children.length >0) {
       deepDelChildren(depts[i].children);
     } else {
       delete depts[i].children;
@@ -220,19 +217,19 @@ const handleBeforeOk = (done) => {
   proxy.$refs.modalFormRef.validate(async (err) => {
     if (!err) {
       let res;
-      if (Reflect.has(modalForm, 'deptId')) {
-        const { code, msg } = await updateDept(modalForm, modalForm.deptId);
+      if (Reflect.has(modalForm, 'dept_id')) {
+        const { code, message } = await updateDept(modalForm, modalForm.dept_id);
         if (code == 200 ) {
           proxy.$notification.success('修改成功');
         } else {
-          proxy.$notification.error(msg);
+          proxy.$notification.error(message);
         }
       } else {
-        const { code, msg } = await addDept(modalForm);
+        const { code, message } = await addDept(modalForm);
         if (code == 200 ) {
           proxy.$notification.success('新增成功');
         } else {
-          proxy.$notification.error(msg);
+          proxy.$notification.error(message);
         }
       }
       done();
@@ -246,11 +243,11 @@ const handleBeforeOk = (done) => {
 
 // 获取部门信息
 const getDeptInfo = async (params = {}) => {
-  const { data, code, msg } = await getDept(params);
+  const { data, code, message } = await getDept(params);
   if ( code == 200 ) {
     tableData.value = deepDelChildren(data);
   } else {
-    proxy.$notification.error(msg);
+    proxy.$notification.error(message);
   }
 };
 
diff --git a/src/views/admin/sys-menu/index.vue b/src/views/admin/sys-menu/index.vue
index 9c4e2fd..738a0ec 100644
--- a/src/views/admin/sys-menu/index.vue
+++ b/src/views/admin/sys-menu/index.vue
@@ -53,7 +53,7 @@
     </a-table>
 
     <!-- 菜单管理新增与提交弹窗 -->
-    <a-modal v-model:visible="modalVisible" :title="modalTitle" title-align="start" :width="800" modal-class="menu-modal" @before-ok="handleSubmit" @close="() => {$refs.modalFormRef.resetFields(); modalForm.menuId = null;}">
+    <a-modal v-model:visible="modalVisible" :title="modalTitle" title-align="start" width="800" modal-class="menu-modal" @before-ok="handleSubmit" @close="() => {$refs.modalFormRef.resetFields(); modalForm.menuId = null;}">
       <a-form :model="modalForm" :rules="modalRules" ref="modalFormRef" auto-label-width label-align="left">
         <a-form-item field="menu_type" label="菜单类型">
           <a-radio-group v-model="modalForm.menu_type">
@@ -65,12 +65,12 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item field="parent_id" label="上级菜单">
-              <a-tree-select v-model="modalForm.parent_id" :data="tableData" :field-names="{ key: 'menu_id', icon: '_' ,title:'menu_name'}" :allow-search="true" :filter-tree-node="filterTreeNode" placeholder="请选择上级菜单"/>
+              <a-tree-select v-model="modalForm.parent_id"  :data="tableData" :field-names="{ key: 'menu_id', icon: '_' ,title:'menu_title'}" :allow-search="true" :filter-tree-node="filterTreeNode" placeholder="请选择上级菜单"/>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item field="menu_name" label="菜单标题">
-              <a-input v-model="modalForm.menu_name" placeholder="请输入菜单标题" />
+            <a-form-item field="menu_title" label="菜单标题">
+              <a-input v-model="modalForm.menu_title" placeholder="请输入菜单标题" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -94,7 +94,7 @@
   
            <a-col :span="12" v-if="modalForm.menu_type !== 3 && modalForm.menu_type">
             <a-form-item field="menu_title" label="路由名称">
-              <a-input v-model="modalForm.menu_title" placeholder="请输入路由名称" />
+              <a-input v-model="modalForm.menu_name" placeholder="请输入路由名称" />
             </a-form-item>
           </a-col> 
           <a-col :span="12" v-if="modalForm.menu_type !== 3 && modalForm.menu_type">
@@ -109,11 +109,11 @@
               <a-input v-model="modalForm.path" placeholder="请输入路由地址" />
             </a-form-item>
           </a-col>
-          <!-- <a-col :span="12" v-if="modalForm.menuType === 'C' || modalForm.menuType === 'F'">
+          <a-col :span="12" v-if="modalForm.menu_type == 2 || modalForm.menu_type == 3">
             <a-form-item field="permission" label="权限标识">
               <a-input v-model="modalForm.permission" placeholder="请输入权限标识"/>
             </a-form-item>
-          </a-col>  -->
+          </a-col> 
         </a-row>
         <!-- <a-form-item field="isFrame" label="是否外链" v-if="modalForm.menuType !== 'F'">
           <a-radio-group v-model="modalForm.isFrame">
@@ -122,14 +122,18 @@
           </a-radio-group>
         </a-form-item> -->
         <a-form-item field="menu_status" label="菜单状态" v-if="modalForm.menuType !== 'F'">
-          <a-radio-group v-model="modalForm.menu_status">
+          <a-radio-group v-model="modalForm.menu_status" :disabled="modalForm.menu_id?true:false">
             <a-radio :value="0">显示</a-radio>
             <a-radio :value="1">隐藏</a-radio>
           </a-radio-group>
         </a-form-item>
-        <a-form-item field="api_ids" label="API权限" v-if="modalForm.menu_type !== 1 && modalForm.menu_type">
-          <a-transfer v-model:model-value="modalForm.api_ids" :data="transferData" :title="['未授权', '已授权']" show-search />
-        </a-form-item>
+        <a-row :gutter="24">
+          <a-col :span="24">
+          <a-form-item field="apis"  label="API权限" v-if="modalForm.menu_type !== 1 && modalForm.menu_type">
+            <a-transfer v-model:model-value="modalForm.apis" :data="transferData" :title="['未授权', '已授权']" show-search />
+          </a-form-item>
+        </a-col>
+      </a-row>
       </a-form>
     </a-modal>
 
@@ -149,7 +153,7 @@
 import { onMounted, reactive, ref, getCurrentInstance, computed, watch, watchEffect } from 'vue';
 import * as ArcoIconModules from '@arco-design/web-vue/es/icon';
 import { getMenu } from '@/api/admin/menu';
-import { getSysApi } from '@/api/admin/sys-api';
+import { getSysApiList } from '@/api/admin/sys-api';
 import { addMenu, removeMenu, updateMenu, getMenuDetails } from '@/api/admin/menu';
 
 // Akiraka 20230210 删除数据
@@ -161,7 +165,7 @@ watch(() => deleteVisible.value ,(value) => {
   if ( value == false ) {
     getSysMenuInfo(pager);
   }
-})
+});
 
 const { proxy } = getCurrentInstance();
 
@@ -193,7 +197,11 @@ function useQueryData() {
 // 默认表单
 const modalForm = reactive({
   menu_type: '',
-  menu_status: 0,
+  menu_status: null,
+  menu_id:'',
+  api_ids:[],
+  menu_name:'',
+  menu_title:'',
 });
 
 // 表单校验
@@ -225,7 +233,7 @@ watchEffect(() => {
 
 // Table
 const columns = [
-  { title: '菜单名称', dataIndex: 'menu_name',width: "220" },
+  { title: '菜单名称', dataIndex: 'menu_title',width: "220" },
   // { title: '图标', dataIndex: 'icon', slotName: 'icon' },
   { title: '路由地址', dataIndex: 'path', width: "400" },
   { title: '组件地址', dataIndex: 'component', width: "300" },
@@ -245,16 +253,16 @@ const modalVisible = ref(false);
 const modalTitle = ref('默认标题');
 
 // 创建新菜单
-const handleAddMenu = (parentId = null) => {
+const handleAddMenu = (parent_id = null) => {
   modalVisible.value = true;
   modalTitle.value = '新增菜单';
-  if (parentId) modalForm.parentId = parentId;
+  if (parent_id) modalForm.parent_id = parent_id;
   getSysMenuInfo();
 };
 
 // TreeSearchFilter
 const filterTreeNode = (searchVal, nodeData) => {
-  return nodeData.title.indexOf(searchVal) > -1;
+  return nodeData.menu_name.indexOf(searchVal) > -1;
 };
 
 // 修改菜单
@@ -270,6 +278,9 @@ const handleUpdate = async (record) => {
 const handleSubmit = (done) => {
   proxy.$refs.modalFormRef.validate(async (valid) => {
     if (!valid) {
+        if(modalForm.menu_type==3){
+          modalForm.menu_name=modalForm.menu_title
+        };
       if (!modalForm.menu_id) {
         console.log("dasdasd",modalForm)
         const {code,message} = await addMenu(modalForm);
@@ -297,24 +308,24 @@ const handleSubmit = (done) => {
 
 // 获取菜单信息
 const getSysMenuInfo = async (params = {}) => {
-  const { code, data, msg } = await getMenu(params);
+  const { code, data, message } = await getMenu(params);
   console.log(data);
   if ( code == 200 ) {
      tableData.value = data;
   } else {
-    proxy.$notification.error(msg)
+    proxy.$notification.error(message)
   }
 };
 
 // 获取API接口信息
 const getSysApiInfo = async () => {
-  const { code, data, msg } = await getSysApi({ pageSize: 10000, type: 'BUS' });
+  const { code, data, message } = await getSysApiList();
   if ( code == 200 ) {
-    transferData.value = data.list.map((item) => {
-      return { value: item.id, label: item.title };
+    transferData.value = data.map((item) => {
+      return { value: item.api_id, label: item.api_name };
     });
   } else {
-    proxy.$notification.error(msg)
+    proxy.$notification.error(message)
   }
 };
 
@@ -330,10 +341,13 @@ const parseIconName = computed(() => {
 
   return iconNameList;
 });
+const parent_id=computed(()=>{
+  return modalForm.parent_id==0?'无':modalForm.parent_id
+})
 
 onMounted(() => {
   getSysMenuInfo();
-  //getSysApiInfo();
+  getSysApiInfo();
 });
 </script>
 
@@ -351,6 +365,7 @@ onMounted(() => {
 
  /* 覆盖默认穿梭框样式 */
 .menu-modal {
+  width:800px;
   .arco-transfer-view {
     height: 350px;
     width: 250px;
diff --git a/src/views/admin/sys-post/index.vue b/src/views/admin/sys-post/index.vue
index e0b6184..6b880cf 100644
--- a/src/views/admin/sys-post/index.vue
+++ b/src/views/admin/sys-post/index.vue
@@ -1,21 +1,13 @@
 <template>
   <div class="app-container">
     <a-form :model="queryForm" ref="queryFormRef" layout="inline">
-      <a-form-item field="postCode" label="岗位编码">
-        <a-input v-model="queryForm.postCode" placeholder="请输入岗位编码" @press-enter="handleQuery" />
-      </a-form-item>
+  
       <a-form-item field="postName" label="岗位名称">
-        <a-input v-model="queryForm.postName" placeholder="请输入岗位名称" @press-enter="handleQuery" />
-      </a-form-item>
-      <a-form-item field="status" label="岗位状态">
-        <a-select v-model="queryForm.status" placeholder="请选择岗位状态" :style="{ width: '181px' }">
-          <a-option :value="2">正常</a-option>
-          <a-option :value="1">停用</a-option>
-        </a-select>
+        <a-input v-model="queryForm.post_name" placeholder="请输入岗位名称" @press-enter="handleQuery" />
       </a-form-item>
       <a-form-item>
         <a-space>
-          <a-button v-has="'admin:sysPost:query'" type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+          <a-button  type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
           <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
         </a-space>
       </a-form-item>
@@ -26,9 +18,8 @@
     <!-- action -->
     <div class="action">
       <a-space>
-        <a-button v-has="'admin:sysPost:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
-        <a-button v-has="'admin:sysPost:remove'" type="primary" status="danger" @click="() => { deleteVisible = true; }"><icon-delete /> 批量删除 </a-button>
-        <a-button type="primary" status="warning" disabled><icon-download /> 导出 </a-button>
+        <a-button v-has="'admin:sysPost:add'"  type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
+        <a-button v-has="'admin:sysPost:remove'"  type="primary" status="danger" @click="() => { deleteVisible = true; }"><icon-delete /> 批量删除 </a-button>
       </a-space>
     </div>
 
@@ -36,24 +27,24 @@
     <a-table
       :columns="columns"
       :data="tableData"
-      :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.count, current: currentPage }"
+      :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
       :row-selection="{ type: 'checkbox', showCheckedAll: true }"
-      row-key="postId"
+      row-key="post_id"
       @selection-change="(selection) => {deleteData = selection;}" 
       @page-change="handlePageChange"
-      @page-size-change="handlePageSizeChange"
+      @page-size-change="handlepage_sizeChange"
     >
       <template #createdAt="{ record }">
         {{ parseTime(record.createdAt) }}
       </template>
-      <template #status="{ record }">
-        <a-tag v-if="record.status == 2" color="green">正常</a-tag>
-        <a-tag v-else color="red">停用</a-tag>
-      </template>
+      <!-- <template #dept_status="{ record }">
+        <a-tag v-if="record.dept_status == 1" color="green">正常</a-tag>
+        <a-tag v-else color="red">删除</a-tag>
+      </template> -->
       <template #action="{ record }">
         <a-space>
           <a-button v-has="'admin:sysPost:edit'" type="text" @click="handleUpdate(record)"><icon-edit /> 修改</a-button>
-          <a-button v-has="'admin:sysPost:remove'" type="text" @click="() => { deleteVisible = true; deleteData = [record.postId];  }"><icon-delete /> 删除</a-button>
+          <a-button v-has="'admin:sysPost:remove'" type="text" @click="() => { deleteVisible = true; deleteData = [record.post_id];  }"><icon-delete /> 删除</a-button>
         </a-space>
       </template>
     </a-table>
@@ -64,24 +55,14 @@
       :title="modalTitle"
       title-align="start"
       @before-ok="handleSubmit"
-      @close="() => {$refs.modalFormRef.resetFields(); modalForm.postId = null;}"
+      @close="() => {$refs.modalFormRef.resetFields(); modalForm.post_id = null;}"
     >
       <a-form :model="modalForm" :rules="rules" ref="modalFormRef">
-        <a-form-item field="postName" label="岗位名称">
-          <a-input v-model="modalForm.postName" placeholder="请输入岗位名称" />
+        <a-form-item field="post_name" label="岗位名称">
+          <a-input v-model="modalForm.post_name" placeholder="请输入岗位名称" />
         </a-form-item>
-        <a-form-item field="postCode" label="岗位编码">
-          <a-input v-model="modalForm.postCode" placeholder="请输入岗位编码" />
-        </a-form-item>
-        <a-form-item field="sort" label="岗位排序">
-          <a-input-number
-            v-model="modalForm.sort"
-            mode="button"
-            :default-value="0"
-            :style="{ width: '150px' }"
-          />
-        </a-form-item>
-        <a-form-item field="status" label="岗位状态">
+      
+        <!-- <a-form-item field="status" label="岗位状态">
           <a-radio-group v-model="modalForm.status">
             <a-radio :value="2"> 正常 </a-radio>
             <a-radio :value="1"> 停用 </a-radio>
@@ -89,7 +70,7 @@
         </a-form-item>
         <a-form-item field="remark" label="备注">
           <a-textarea v-model="modalForm.remark" placeholder="请输入备注内容" />
-        </a-form-item>
+        </a-form-item> -->
       </a-form>
     </a-modal>
 
@@ -125,22 +106,20 @@ const { proxy } = getCurrentInstance();
 const currentPage = ref(1);
 // Pager
 const pager = {
-  count: 0,
-  pageIndex: 1,
-  pageSize: 10,
+  total: 0,
+  page: 1,
+  page_size: 10,
 };
 // form
 const queryForm = reactive({});
 const modalForm = reactive({
   sort: 0,
-  status: 2,
+  status: 1,
 });
 
 // Rules
 const rules = {
-  postName: [{ required: true, message: '请输入岗位名称' }],
-  postCode: [{ required: true, message: '请输入岗位编码' }],
-  sort: [{ required: true, message: '请选择岗位排序' }],
+  post_name: [{ required: true, message: '请输入岗位名称' }]
 };
 
 // Modal
@@ -152,12 +131,9 @@ let batchList = [];
 
 // Table Columns
 const columns = [
-  { title: '岗位编号', dataIndex: 'postId' },
-  { title: '岗位编码', dataIndex: 'postCode' },
-  { title: '岗位名称', dataIndex: 'postName' },
-  { title: '岗位排序', dataIndex: 'sort' },
-  { title: '状态', dataIndex: 'status', slotName: 'status' },
-  { title: '创建时间', dataIndex: 'createdAt', slotName: 'createdAt' },
+  { title: '岗位编号', dataIndex: 'post_id' },
+  { title: '岗位名称', dataIndex: 'post_name' },
+  { title: '创建时间', dataIndex: 'created_at', slotName: 'created_at' },
   { title: '操作', slotName: 'action' },
 ];
 
@@ -185,19 +161,21 @@ const handleSubmit = (done) => {
   proxy.$refs.modalFormRef.validate(async (valid) => {
     if (!valid) {
       let res;
-      if (!modalForm.postId) {
-        const { code, msg } = await addPost(modalForm);
+      if (!modalForm.post_id) {
+        const { code, message } = await addPost(modalForm);
         if (code == 200 ) {
           proxy.$notification.success('新增成功');
         } else {
-          proxy.$notification.error(msg);
+          proxy.$notification.error(message);
         }
       } else {
-        const { code, msg } = await updatePost(modalForm, modalForm.postId);
+        console.log("post_id:"+modalForm.post_id)
+
+        const { code, message } = await updatePost(modalForm, modalForm.post_id);
         if (code == 200 ) {
           proxy.$notification.success('更新成功');
         } else {
-          proxy.$notification.error(msg);
+          proxy.$notification.error(message);
         }
       }
       done();
@@ -218,7 +196,7 @@ const handleBatchDelete = () => {
       hideCancel: false,
       onOk: async () => {
         const res = await removePost({ ids: batchList });
-        proxy.$message.success(res.msg);
+        proxy.$message.success(res.message);
         getPostInfo(pager);
       },
       onCancel: () => {
@@ -235,7 +213,7 @@ const handleBatchDelete = () => {
  * @param {Number} [page]
  */
  const handlePageChange = (page) => {
-  pager.pageIndex = page;
+  pager.page = page;
 
   // 修改当前页码
   currentPage.value = page;
@@ -243,27 +221,27 @@ const handleBatchDelete = () => {
 };
 
 // 每页数据量
-const handlePageSizeChange = (pageSize) => {
-  pager.pageSize = pageSize;
+const handlepage_sizeChange = (page_size) => {
+  pager.page_size = page_size;
   getPostInfo({ ...pager, ...queryForm });
 };
 
 // 获取岗位信息
 const getPostInfo = async (params = {}) => {
-  const { data, code, msg } = await getPost(params);
+  const { data, code, message } = await getPost(params);
   if ( code == 200 ) {
-    tableData.value = data.list;
-    Object.assign(pager, { count: data.count, pageIndex: data.pageIndex, pageSize: data.pageSize });
+    tableData.value = data.data;
+    Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
   } else {
-    proxy.$notification.error(msg);
+    proxy.$notification.error(message);
   }
 };
 
 // 查询岗位信息
 const handleQuery = async () => {
   const params = {
-    pageIndex: pager.pageIndex,
-    pageSize: pager.pageSize,
+    page: pager.page,
+    page_size: pager.page_size,
     ...queryForm,
   };
 
diff --git a/src/views/admin/sys-role/index.vue b/src/views/admin/sys-role/index.vue
index 70970b3..9c4af4c 100644
--- a/src/views/admin/sys-role/index.vue
+++ b/src/views/admin/sys-role/index.vue
@@ -101,15 +101,15 @@
             <a-radio :value="1">是</a-radio>
           </a-radio-group>
         </a-form-item>
-
+        <div>{{checkedKeys}}</div>
         <a-form-item label="权限设置">
           <a-tree
             v-model:checked-keys="checkedKeys"
             :checkable="true"
             :check-strictly="false"
             :data="treeData"
-            :default-expand-all="false"
-            :field-names="{ key: 'menu_id', title: 'menu_name',icon: '_'  }"
+            :default-expand-all="true"
+            :field-names="{ key: 'menu_id', title: 'menu_title',icon: '_'}"
           />
         </a-form-item>
        <!--
@@ -329,19 +329,21 @@
     const { code, data, message } = await roleDetail(record.role_id);
     if (code == 200) {
       Object.assign(modalForm, data);
-      checkedKeys.value = data.menu_ids;
+       checkedKeys.value = data.menu_ids;
+      // console.log(data.menu_ids)
+       // 显示勾选的菜单，checkedKeys 传入id数组即可
+     
     } else {
       proxy.$notification.error(message);
     }
     //await nextTick();
     //Object.assign(modalForm, record);
 
-    // 显示勾选的菜单，checkedKeys 传入id数组即可
-    // const menuIdsChecked = [];
-    // record.sysMenu.forEach((item) => {
-    //   menuIdsChecked.push(new String(item.menu_id));
-    // });
-    // checkedKeys.value = menuIdsChecked;
+    const menuIdsChecked = [];
+      data.menu_ids.forEach((item) => {
+        menuIdsChecked.push(item);
+      });
+       checkedKeys.value = menuIdsChecked;
   };
 
   // 分配数据权限
diff --git a/src/views/admin/sys-user/components/TreeDept.vue b/src/views/admin/sys-user/components/TreeDept.vue
index 433c25f..e2c45bc 100644
--- a/src/views/admin/sys-user/components/TreeDept.vue
+++ b/src/views/admin/sys-user/components/TreeDept.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="tree-container">
     <a-tree
+      ref="treeRef"
       :data="props.data"
-      :field-names="{ key: 'deptId', title: 'deptName' }"
+      :field-names="{ key: 'dept_id', title: 'dept_name' }"
       block-node
       @select="handleTreeSelect"
     />
@@ -10,18 +11,25 @@
 </template>
 
 <script setup>
+  import {ref} from 'vue'
 const props = defineProps({
   data: {
     type: Array,
     default: () => [],
   },
 });
-
+const treeRef=ref(null)
 const emits = defineEmits(['nodeClick']);
+const resetTree=()=>{
 
-const handleTreeSelect = (selectKeys) => {
-  emits('nodeClick', { deptId: `/${selectKeys}/` });
+  treeRef.value.selectAll(false)
 }
+const handleTreeSelect = (selectKeys) => {
+  emits('nodeClick', { dept_id: `${selectKeys}` });
+}
+defineExpose({
+  resetTree
+});
 </script>
 
 <style lang="scss">
diff --git a/src/views/admin/sys-user/index.vue b/src/views/admin/sys-user/index.vue
index a771924..0c70c97 100644
--- a/src/views/admin/sys-user/index.vue
+++ b/src/views/admin/sys-user/index.vue
@@ -2,11 +2,11 @@
   <div class="app-container">
     <!-- Query -->
     <a-form ref="queryFormRef" :model="queryForm" layout="inline">
-      <a-form-item field="deptName" label="部门名称">
-        <a-input v-model="queryForm.deptName" placeholder="请输入部门名称" @press-enter="handleQuery" />
+      <a-form-item field="dept_name" label="部门名称">
+        <a-input v-model="queryForm.dept_name" placeholder="请输入部门名称" @press-enter="handleQuery" />
       </a-form-item>
-      <a-form-item field="username" label="用户名称">
-        <a-input v-model="queryForm.nick_name" placeholder="请输入用户名称" @press-enter="handleQuery" />
+      <a-form-item field="access" label="用户昵称">
+        <a-input v-model="queryForm.nick_name" placeholder="请输入昵称" @press-enter="handleQuery" />
       </a-form-item>
       <a-form-item field="phone" label="手机号码">
         <a-input v-model="queryForm.phone" placeholder="请输入用户手机号" @press-enter="handleQuery" />
@@ -17,12 +17,36 @@
           placeholder="请选择用户状态"
           :style="{ width: '205px' }"
         >
-          <a-option :value="2">正常</a-option>
-          <a-option :value="1">停用</a-option>
+            <!-- 1:正常 2:审核中 3:审核失败） -->
+          <a-option :value="1">正常</a-option>
+          <a-option :value="2">审核中</a-option>
+          <a-option :value="3">审核失败</a-option>
         </a-select>
-      </a-form-item>
+      </a-form-item> 
 
-      <a-divider direction="vertical" :style="{ height: '30px' }" />
+     <!-- <a-divider direction="vertical" :style="{ height: '30px' }" />  -->
+     <a-form-item field="is_deleted" label="删除状态">
+      <a-select
+        v-model="queryForm.is_deleted"
+        placeholder="请选择删除状态"
+        :style="{ width: '182px' }"
+      >
+          <!-- 1:正常 2:审核中 3:审核失败） -->
+        <a-option :value="1">是</a-option>
+        <a-option :value="0">否</a-option>
+      </a-select>
+    </a-form-item> 
+    <a-form-item field="is_disabled" label="禁用状态">
+      <a-select
+        v-model="queryForm.is_disabled"
+        placeholder="请选择禁用状态"
+        :style="{ width: '182px' }"
+      >
+          <!-- 1:正常 2:审核中 3:审核失败） -->
+        <a-option :value="1">是</a-option>
+        <a-option :value="0">否</a-option>
+      </a-select>
+    </a-form-item> 
       <a-form-item class="form-action">
         <a-space size="medium">
           <a-button  type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
@@ -38,7 +62,7 @@
     <a-row>
       <a-col :span="4">
         <!-- tree组件只在组件第一次渲染时展开，此处等待数据加载完成再渲染组件 -->
-        <tree-dept v-if="treeDeptData" :data="treeDeptData" @node-click="getSysUserInfo" />
+        <tree-dept v-if="treeDeptData" ref="treeRef_parent" :data="treeDeptData" @nodeClick="getSysUserInfo" :selectedKeys="queryForm.dept_id" />
       </a-col>
       <a-col :span="20">
         <!-- Action -->
@@ -59,19 +83,17 @@
           @page-change="handlePageChange"
           @page-size-change="handlePageSizeChange"
         >
+        <template #user_id="{record,rowIndex}">
+          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+       </template>
         <template #role_name="{ record }">
           {{ record.role.role_name}}
         </template>
-          <template #dept="{ record }">
-            {{ record.dept.dept_name }}
-          </template>
-          <template #role_status="{ record }">
-            <a-switch
-              v-model="record.role_status"
-              :checked-value="2"
-              :unchecked-value="1"
-              @change="handleSwitchChange(record)"
-            />
+        <template #dept_name="{ record }">
+          {{ record.dept?.dept_name }}
+        </template>
+          <template #status="{ record }">
+           
           </template>
           <template #created_at="{ record }">
             {{ parseTime(record.created_at) }}
@@ -104,19 +126,27 @@
       >
         <a-row :gutter="16">
           <a-col :span="12">
-            <a-form-item field="nickName" label="用户昵称">
+            <a-form-item field="access" label="账号名称">
               <a-input
-                v-model="modalForm.nickName"
+                v-model="modalForm.access"
+                placeholder="请输入账号名称"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="nick_name" label="用户昵称">
+              <a-input
+                v-model="modalForm.nick_name"
                 placeholder="请输入用户昵称"
               />
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item field="deptId" label="所属部门">
+            <a-form-item field="dept_id" label="所属部门">
               <a-tree-select
-                v-model="modalForm.deptId"
+                v-model="modalForm.dept_id"
                 :data="treeDeptData"
-                :field-names="{ key: 'deptId', title: 'deptName' }"
+                :field-names="{ key: 'dept_id', title: 'dept_name' }"
                 placeholder="请选择所属部门"
               />
             </a-form-item>
@@ -126,19 +156,29 @@
               <a-input v-model="modalForm.phone" placeholder="请输入手机号码" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+         <a-col :span="12">
             <a-form-item field="email" label="邮箱">
               <a-input v-model="modalForm.email" placeholder="请输入邮箱" />
             </a-form-item>
-          </a-col>
+          </a-col> 
           <a-col :span="12">
-            <a-form-item field="username" label="用户名称">
-              <a-input
-                v-model="modalForm.username"
-                placeholder="请输入用户名称"
-              />
+            <a-form-item field="is_deleted" label="是否删除">
+              <!-- 1:正常 2:审核中 3:审核失败） -->
+              <a-radio-group v-model="modalForm.is_deleted">
+                <a-radio :value="1"> 是 </a-radio>
+                <a-radio :value="0">否 </a-radio>
+              </a-radio-group>
             </a-form-item>
-          </a-col>
+          </a-col> 
+          <a-col :span="12">
+            <a-form-item field="is_deleted" label="是否禁用">
+              <!-- 1:正常 2:审核中 3:审核失败） -->
+              <a-radio-group v-model="modalForm.is_disabled">
+                <a-radio :value="1"> 是 </a-radio>
+                <a-radio :value="0">否 </a-radio>
+              </a-radio-group>
+            </a-form-item>
+          </a-col> 
           <a-col v-if="!modalForm.user_id" :span="12">
             <a-form-item field="password" label="用户密码">
               <a-input-password
@@ -150,47 +190,46 @@
           <a-col :span="12">
             <a-form-item field="sex" label="用户性别">
               <a-select v-model="modalForm.sex" placeholder="请选择用户性别">
-                <a-option value="0"> 男 </a-option>
-                <a-option value="1"> 女 </a-option>
+                <a-option :value="1"> 男 </a-option>
+                <a-option :value="2"> 女 </a-option>
               </a-select>
             </a-form-item>
-          </a-col>
+          </a-col> 
           <a-col :span="12">
             <a-form-item field="status" label="状态">
+              <!-- 1:正常 2:审核中 3:审核失败） -->
               <a-radio-group v-model="modalForm.status">
-                <a-radio value="2"> 正常 </a-radio>
-                <a-radio value="1"> 停用 </a-radio>
+                <a-radio :value="1"> 正常 </a-radio>
+                <a-radio :value="2"> 审核中 </a-radio>
+                <a-radio :value="3"> 审核失败 </a-radio>
               </a-radio-group>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item field="postId" label="岗位">
-              <a-select v-model="modalForm.postId" placeholder="请选择岗位">
+            <a-form-item field="post_id" label="岗位">
+              <a-select  v-model="modalForm.post_id" placeholder="请选择岗位">
                 <a-option
                   v-for="item in postList"
-                  :key="item.postId"
-                  :value="item.postId"
-                  :label="item.postName"
+                  :key="item.post_id"
+                  :value="item.post_id"
+                  :label="item.post_name"
                 />
               </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item field="roleId" label="角色">
-              <a-select v-model="modalForm.roleId" placeholder="请选择角色">
+            <a-form-item field="role_id" label="角色">
+              <a-select v-model="modalForm.role_id"   placeholder="请选择角色">
                 <a-option
+                 :key="item.role_id"
                   v-for="item in roleList"
-                  :key="item.roleId"
-                  :value="item.roleId"
-                  :label="item.roleName"
+                  :value="item.role_id"
+                  :label="item.role_name"
                 />
               </a-select>
             </a-form-item>
           </a-col>
         </a-row>
-        <a-form-item field="remark" label="备注">
-          <a-textarea placeholder="请输入备注" allow-clear />
-        </a-form-item>
       </a-form>
     </a-modal>
 
@@ -206,16 +245,16 @@
         :rules="resetPwdRules"
         auto-label-width
       >
-        <a-form-item field="password" label="新密码">
+        <a-form-item field="password" label="原密码">
           <a-input-password
             v-model="resetPwdForm.password"
-            placeholder="请输入新密码"
+            placeholder="请输入原密码"
           />
         </a-form-item>
-        <a-form-item field="repeatPwd" label="确认密码">
+        <a-form-item field="password" label="新密码">
           <a-input-password
-            v-model="resetPwdForm.repeatPwd"
-            placeholder="请输入确认密码"
+            v-model="resetPwdForm.new_password"
+            placeholder="请输入新密码"
           />
         </a-form-item>
       </a-form>
@@ -225,6 +264,7 @@
     <DeleteModal 
       :data="deleteData" 
       :visible="deleteVisible" 
+      :delType="'user_ids'"
       :apiDelete="removeUser" 
       @deleteVisibleChange="() => deleteVisible = false"
     />
@@ -233,13 +273,14 @@
 </template>
 
 <script setup>
-import { reactive, ref, getCurrentInstance, onMounted, watch } from 'vue';
+import { reactive, ref, getCurrentInstance, onMounted, watch,nextTick} from 'vue';
 import { IconSearch, IconLoop } from '@arco-design/web-vue/es/icon';
 import TreeDept from './components/TreeDept.vue';
 import { getUser, addUser, updateUser, removeUser, updateUserStatus, resetUserPwd } from '@/api/admin/sys-user';
-import { getRole } from '@/api/admin/role';
-import { getPost } from '@/api/admin/post';
+import { getRoleList } from '@/api/admin/role';
+import { getPostList } from '@/api/admin/post';
 import { getDept } from '@/api/admin/sys-dept';
+const treeRef_parent = ref(null);
 
 // Akiraka 20230210 删除数据
 const deleteData = ref([])
@@ -262,7 +303,7 @@ const { currentPage, getSysPostInfo, getSysRoleInfo, getSysDeptTreeInfo, getSysU
 
 // Pager
 const pager = reactive({
-  total: 0,
+  total: 1,
   page: 1,
   page_size: 10
 });
@@ -311,13 +352,33 @@ function useQueryData() {
 
   // 重置查询
   const handleResetQuery = () => {
-    proxy.$refs.queryFormRef.resetFields();
 
+    proxy.$refs.queryFormRef.resetFields();
+    treeRef_parent.value.resetTree();
+    queryForm.dept_id='';
+    queryForm.nick_name='';
     getSysUserInfo(queryForm);
   };
 
   return { queryForm, handleQuery, handleResetQuery };
 }
+// const changeSelect=(value,type)=>{
+//   console.log(value)
+//  if(type=='role'){
+//   console.log(value.role_name)
+//   role_name.value=value.role_name;
+//   modalForm.role={
+//     role_name:value.role_name,
+//     role_id:value.role_id
+//   }
+//  }else if(type=='post'){
+//   post_name.value=value.post_name;
+//   modalForm.post={
+//     post_name:value.post_name,
+//     post_id:value.post_id
+//   }
+//  }
+// };
 
 function useResetPwd() {
   const resetPwdVisible = ref(false);
@@ -355,8 +416,14 @@ function useResetPwd() {
     proxy.$refs.resetPwdFormRef.validate(async (err) => {
       if (!err) {
         resetParams.password = resetPwdForm.password;
-        const { msg } = await resetUserPwd(resetParams);
-        proxy.$message.success(msg);
+        resetParams.new_password=resetPwdForm.new_password;
+        const { message,code } = await resetUserPwd(resetParams);
+        if(code==200){
+          proxy.$message.success('密码设置成功');
+        }else{
+          proxy.$message.error(message);
+        }
+       
         done();
         getSysUserInfo();
       } else {
@@ -381,10 +448,12 @@ function useApiInfo() {
    * @param {*} [params]
    */
   const getSysUserInfo = async (params = {}) => {
+    queryForm.dept_id=params.dept_id;
+    console.log(params)
     const { data, code, message } = await getUser(params);
     if ( code == 200 ) {
       tableData.value = data.data;
-      Object.assign(pager, { count: data.total, pageIndex: data.page, page_size: data.page_size });
+      Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
     } else {
       proxy.$notification.error(message);
     }
@@ -392,14 +461,27 @@ function useApiInfo() {
 
   // 获取角色信息
   const getSysRoleInfo = async () => {
-    const res = await getRole();
-    roleList.value = res.data.list;
+    const {data,code,message} = await getRoleList({
+      role_name:''
+    });
+       if (code == 200 ) {
+           roleList.value = data;
+          } else {
+            proxy.$notification.error(message);
+          }
   };
 
   // 获取岗位信息
   const getSysPostInfo = async () => {
-    const res = await getPost();
-    postList.value = res.data.list;
+    const {data,code,message} = await getPostList({
+      post_name:'' 
+    });
+        if (code == 200 ) {
+          postList.value = data;
+          } else {
+            proxy.$notification.error(message);
+          }
+   
   };
 
   // 获取部门树信息
@@ -428,6 +510,7 @@ function useTableList() {
     {
       title: '编号',
       dataIndex: 'user_id',
+      slotName: 'user_id',
     },
     {
       title: '角色',
@@ -435,13 +518,13 @@ function useTableList() {
       slotName: 'role_name',
     },
     {
-      title: '昵称',
+      title: '用户昵称',
       dataIndex: 'nick_name',
     },
     {
       title: '部门',
       dataIndex: 'dept_name',
-      slotName: 'dept',
+      slotName: 'dept_name',
     },
     {
       title: '手机号',
@@ -449,8 +532,8 @@ function useTableList() {
     },
     {
       title: '状态',
-      dataIndex: 'role_status',
-      slotName: 'role_status',
+      dataIndex: 'status',
+      slotName: 'status',
     },
     {
       title: '创建时间',
@@ -480,6 +563,7 @@ function useTableList() {
 
   // 每页数据量
   const handlePageSizeChange = (page_size) => {
+    console.log(queryForm);
     pager.page_size = page_size;
     getSysUserInfo({ ...pager, ...queryForm });
   };
@@ -520,18 +604,22 @@ function useModalOperate() {
   const modalTitle = ref('默认标题');
 
   // Form
-  const modalForm = reactive({ status: '2' });
+  const modalForm = reactive({ status: null });
 
   // AddRules
   const rules = {
-    nickName: [{ required: true, message: '请输入用户昵称' }],
-    deptId: [{ required: true, message: '请选择所属部门' }],
+    nick_name: [{ required: true, message: '请输入用户昵称' }],
+    dept_id: [{ required: true, message: '请选择所属部门' }],
     phone: [{ required: true, message: '请输入手机号' }],
+    sex: [{ required: true, message: '请选择性别' }],
+    role_id: [{ required: true, message: '请选择角色' }],
+    status:[{ required: true, message: '请选择状态' }],
+    post_id:[{ required: true, message: '请选择岗位' }],
     email: [
-      { required: true, message: '请输入邮箱' },
+      { required: false, message: '请输入邮箱' },
       { type: 'email', message: '请输入正确的邮箱格式' },
     ],
-    username: [{ required: true, message: '请输入用户名称' }],
+    access: [{ required: true, message: '请输入用户名称' }],
     password: [{ required: true, message: '请输入用户密码' }],
   };
 
@@ -554,6 +642,9 @@ function useModalOperate() {
    */
   const handleUpdate = (val) => {
     modalVisible.value = true;
+    modalTitle.value = '修改用户';
+    // role_name.value= val.role.role_name;
+    // post_name.value= val.post.post_name;
     Object.assign(modalForm, val);
   };
 
@@ -615,7 +706,7 @@ onMounted(() => {
 <style lang="scss">
 @media screen and (max-width: 1720px) {
   .form-action {
-    margin-top: 12px;
+    margin-top: 0px;
   }
 }