diff --git a/src/constant/dict.js b/src/constant/dict.js
index fcc2dc8..d59e318 100644
--- a/src/constant/dict.js
+++ b/src/constant/dict.js
@@ -1,21 +1,43 @@
-export const sys_normal_disable = [{
-    label: "禁用",
-    value: "0",
-    elTagType: "warning"
-},
+export const sys_normal_disable = [
     {
         label: "正常",
         value: "1",
         elTagType: "success"
-    }]
+    },
+    {
+    label: "禁用",
+    value: "0",
+    elTagType: "warning"
+    }
+]
 
-export const menu_show_hide = [{
+export const sys_user_gender = [
+    {
+        label: "男",
+        value: "0",
+        elTagType: "success"
+    },
+    {
+        label: "女",
+        value: "1",
+        elTagType: "warning"
+    },
+    {
+        label: "未知",
+        value: "2",
+        elTagType: "warning"
+    }
+]
+
+export const menu_show_hide = [
+    {
     label: "隐藏",
     value: "0",
     elTagType: "warning"
-},
+    },
     {
         label: "显示",
         value: "1",
         elTagType: "success"
-    }]
\ No newline at end of file
+    }
+]
\ No newline at end of file
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 4efca08..598f374 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -55,15 +55,17 @@ export function resetForm(refName) {
 
 // 添加日期范围
 export function addDateRange(params, dateRange, propName) {
-  let search = params;
-  search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
+  let search = JSON.parse(JSON.stringify(params));
   dateRange = Array.isArray(dateRange) ? dateRange : [];
+  if(dateRange.length < 2){
+    return search;
+  }
   if (typeof (propName) === 'undefined') {
-    search.params['beginTime'] = dateRange[0];
-    search.params['endTime'] = dateRange[1];
+    search['beginTime'] = dateRange[0] + ' 00:00:00';
+    search['endTime'] = dateRange[1] + ' 23:59:59';
   } else {
-    search.params['begin' + propName] = dateRange[0];
-    search.params['end' + propName] = dateRange[1];
+    search['begin' + propName] = dateRange[0] + ' 00:00:00';
+    search['end' + propName] = dateRange[1] + ' 23:59:59';
   }
   return search;
 }
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index f168190..6a24a16 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -155,7 +155,6 @@ import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} f
 import {sys_normal_disable} from "@/constant/dict";
 
 const {proxy} = getCurrentInstance();
-// const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
 const deptList = ref([]);
 const open = ref(false);
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 21bae99..ea0ffe5 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -10,16 +10,16 @@
                         @keyup.enter="handleQuery"
                 />
             </el-form-item>
-            <!--            <el-form-item label="状态" prop="status">-->
-            <!--                <el-select v-model="queryParams.status" clearable placeholder="菜单状态" style="width: 200px">-->
-            <!--                    <el-option-->
-            <!--                            v-for="dict in sys_normal_disable"-->
-            <!--                            :key="dict.value"-->
-            <!--                            :label="dict.label"-->
-            <!--                            :value="dict.value"-->
-            <!--                    />-->
-            <!--                </el-select>-->
-            <!--            </el-form-item>-->
+            <el-form-item label="展示状态" prop="isVisible">
+                <el-select v-model="queryParams.isVisible" clearable placeholder="展示状态" style="width: 200px">
+                    <el-option
+                            v-for="dict in sys_normal_disable"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                    />
+                </el-select>
+            </el-form-item>
             <el-form-item>
                 <el-button icon="Search" type="primary" @click="handleQuery">搜索</el-button>
                 <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -309,7 +309,7 @@ import SvgIcon from "@/components/SvgIcon";
 import IconSelect from "@/components/IconSelect";
 import {ClickOutside as vClickOutside} from 'element-plus'
 import {menu_show_hide} from "@/constant/dict";
-
+import {sys_normal_disable} from "@/constant/dict";
 const {proxy} = getCurrentInstance();
 
 const menuList = ref([]);
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 6fd1b64..f569dd1 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -146,9 +146,9 @@
 
 <script setup name="Post">
 import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post";
+import {sys_normal_disable} from "@/constant/dict";
 
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
 const postList = ref([]);
 const open = ref(false);
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 8e66652..e6954fd 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -389,8 +389,8 @@ function handleSelectionChange(selection) {
 
 /** 角色状态修改 */
 function handleStatusChange(row) {
-    let text = row.status === "0" ? "启用" : "停用";
-    proxy.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?').then(function () {
+    let text = row.status === "1" ? "启用" : "停用";
+    proxy.$modal.confirm('确认要' + text + '"' + row.roleName + '"角色吗?').then(function () {
         return changeRoleStatus(row.roleId, row.status);
     }).then(() => {
         proxy.$modal.msgSuccess(text + "成功");
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 0b5c14b..60529fd 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -4,20 +4,21 @@
       <el-form :model="form" label-width="80px">
          <el-row>
             <el-col :span="8" :offset="2">
-               <el-form-item label="用户昵称" prop="nickName">
-                  <el-input v-model="form.nickName" disabled />
+               <el-form-item label="用户昵称" prop="nickname">
+                  <el-input v-model="form.nickname" disabled />
                </el-form-item>
             </el-col>
             <el-col :span="8" :offset="2">
-               <el-form-item label="登录账号" prop="userName">
-                  <el-input v-model="form.userName" disabled />
+               <el-form-item label="登录账号" prop="username">
+                  <el-input v-model="form.username" disabled />
                </el-form-item>
             </el-col>
          </el-row>
       </el-form>
 
       <h4 class="form-header h4">角色信息</h4>
-      <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
+      <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef"
+         @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
          <el-table-column label="序号" width="55" type="index" align="center">
             <template #default="scope">
                <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
@@ -57,56 +58,57 @@ const pageNum = ref(1);
 const pageSize = ref(10);
 const roleIds = ref([]);
 const roles = ref([]);
+
 const form = ref({
-  nickName: undefined,
-  userName: undefined,
-  userId: undefined
+   nickName: undefined,
+   userName: undefined,
+   userId: undefined
 });
 
 /** 单击选中行数据 */
 function clickRow(row) {
-  proxy.$refs["roleRef"].toggleRowSelection(row);
+   proxy.$refs["roleRef"].toggleRowSelection(row);
 };
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  roleIds.value = selection.map(item => item.roleId);
+   roleIds.value = selection.map(item => item.roleId);
 };
 /** 保存选中的数据编号 */
 function getRowKey(row) {
-  return row.roleId;
+   return row.roleId;
 };
 /** 关闭按钮 */
 function close() {
-  const obj = { path: "/system/user" };
-  proxy.$tab.closeOpenPage(obj);
+   const obj = { path: "/system/user" };
+   proxy.$tab.closeOpenPage(obj);
 };
 /** 提交按钮 */
 function submitForm() {
-  const userId = form.value.userId;
-  const rIds = roleIds.value.join(",");
-  updateAuthRole({ userId: userId, roleIds: rIds }).then(response => {
-    proxy.$modal.msgSuccess("授权成功");
-    close();
-  });
+   const userId = form.value.userId;
+   const rIds = roleIds.value.join(",");
+   updateAuthRole({ userId: userId, roleIds: rIds }).then(response => {
+      proxy.$modal.msgSuccess("授权成功");
+      close();
+   });
 };
 
 (() => {
-  const userId = route.params && route.params.userId;
-  if (userId) {
-    loading.value = true;
-    getAuthRole(userId).then(response => {
-      form.value = response.user;
-      roles.value = response.roles;
-      total.value = roles.value.length;
-      nextTick(() => {
-        roles.value.forEach(row => {
-          if (row.flag) {
-            proxy.$refs["roleRef"].toggleRowSelection(row);
-          }
-        });
+   const userId = route.params && route.params.userId;
+   if (userId) {
+      loading.value = true;
+      getAuthRole(userId).then(response => {
+         form.value = response.user;
+         roles.value = response.roles;
+       const   hasRoleIds = response.hasRoleIds
+         total.value = roles.value.length;
+         nextTick(() => {
+            hasRoleIds.forEach((roleId) => {
+               const role = roles.value.find(row => row.roleId === roleId)
+               role && proxy.$refs["roleRef"].toggleRowSelection(role);
+            })
+         });
+         loading.value = false;
       });
-      loading.value = false;
-    });
-  }
+   }
 })();
 </script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d6cfdd6..eaff778 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -29,18 +29,18 @@
          <!--用户数据-->
          <el-col :span="20" :xs="24">
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-               <el-form-item label="用户名称" prop="userName">
+               <el-form-item label="姓名" prop="nickname">
                   <el-input
-                     v-model="queryParams.userName"
-                     placeholder="请输入用户名称"
+                     v-model="queryParams.nickname"
+                     placeholder="请输入姓名"
                      clearable
                      style="width: 240px"
                      @keyup.enter="handleQuery"
                   />
                </el-form-item>
-               <el-form-item label="手机号码" prop="phonenumber">
+               <el-form-item label="手机号码" prop="phone">
                   <el-input
-                     v-model="queryParams.phonenumber"
+                     v-model="queryParams.phone"
                      placeholder="请输入手机号码"
                      clearable
                      style="width: 240px"
@@ -132,16 +132,16 @@
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
                <el-table-column type="selection" width="50" align="center" />
                <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-               <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+               <el-table-column label="登录账号" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+               <el-table-column label="姓名" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+               <el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+               <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible" width="120" />
                <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
                   <template #default="scope">
                      <el-switch
                         v-model="scope.row.status"
-                        active-value="0"
-                        inactive-value="1"
+                        active-value="1"
+                        inactive-value="0"
                         @change="handleStatusChange(scope.row)"
                      ></el-switch>
                   </template>
@@ -183,27 +183,27 @@
          <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
             <el-row>
                <el-col :span="12">
-                  <el-form-item label="用户昵称" prop="nickName">
-                     <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+                  <el-form-item label="姓名" prop="nickname">
+                     <el-input v-model="form.nickname" placeholder="请输入姓名" maxlength="30" />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="归属部门" prop="deptId">
-                     <el-tree-select
-                        v-model="form.deptId"
-                        :data="deptOptions"
-                        :props="{ value: 'id', label: 'label', children: 'children' }"
-                        value-key="id"
-                        placeholder="请选择归属部门"
-                        check-strictly
-                     />
+                  <el-form-item label="性别">
+                     <el-select v-model="form.gender" placeholder="请选择">
+                        <el-option
+                           v-for="dict in sys_user_gender"
+                           :key="dict.value"
+                           :label="dict.label"
+                           :value="dict.value"
+                        ></el-option>
+                     </el-select>
                   </el-form-item>
                </el-col>
             </el-row>
             <el-row>
                <el-col :span="12">
-                  <el-form-item label="手机号码" prop="phonenumber">
-                     <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+                  <el-form-item label="手机" prop="phone">
+                     <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
@@ -214,25 +214,39 @@
             </el-row>
             <el-row>
                <el-col :span="12">
-                  <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-                     <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+                  <el-form-item label="部门" prop="deptId">
+                     <el-tree-select
+                        v-model="form.deptId"
+                        :data="deptOptions"
+                        :props="{ value: 'id', label: 'label', children: 'children' }"
+                        value-key="id"
+                        placeholder="请选择部门"
+                        check-strictly
+                     />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-                     <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+                  <el-form-item label="岗位">
+                     <el-select v-model="form.postIds" multiple placeholder="请选择">
+                        <el-option
+                           v-for="item in postOptions"
+                           :key="item.postId"
+                           :label="item.postName"
+                           :value="item.postId"
+                        ></el-option>
+                     </el-select>
                   </el-form-item>
                </el-col>
             </el-row>
             <el-row>
                <el-col :span="12">
-                  <el-form-item label="用户性别">
-                     <el-select v-model="form.sex" placeholder="请选择">
+                  <el-form-item label="角色">
+                     <el-select v-model="form.roleIds" multiple placeholder="请选择">
                         <el-option
-                           v-for="dict in sys_user_sex"
-                           :key="dict.value"
-                           :label="dict.label"
-                           :value="dict.value"
+                           v-for="item in roleOptions"
+                           :key="item.roleId"
+                           :label="item.roleName"
+                           :value="item.roleId"
                         ></el-option>
                      </el-select>
                   </el-form-item>
@@ -251,29 +265,13 @@
             </el-row>
             <el-row>
                <el-col :span="12">
-                  <el-form-item label="岗位">
-                     <el-select v-model="form.postIds" multiple placeholder="请选择">
-                        <el-option
-                           v-for="item in postOptions"
-                           :key="item.postId"
-                           :label="item.postName"
-                           :value="item.postId"
-                           :disabled="item.status == 1"
-                        ></el-option>
-                     </el-select>
+                  <el-form-item v-if="form.userId == undefined" label="登录账号" prop="username">
+                     <el-input v-model="form.username" placeholder="请输入登录账号" maxlength="30" autocomplete="off"/>
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="角色">
-                     <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                        <el-option
-                           v-for="item in roleOptions"
-                           :key="item.roleId"
-                           :label="item.roleName"
-                           :value="item.roleId"
-                           :disabled="item.status == 1"
-                        ></el-option>
-                     </el-select>
+                  <el-form-item v-if="form.userId == undefined" label="登录密码" prop="password">
+                     <el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="20" show-password autocomplete="off" />
                   </el-form-item>
                </el-col>
             </el-row>
@@ -332,10 +330,9 @@
 <script setup name="User">
 import { getToken } from "@/utils/auth";
 import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
-
+import {sys_normal_disable,sys_user_gender} from "@/constant/dict";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
 
 const userList = ref([]);
 const open = ref(false);
@@ -370,8 +367,8 @@ const upload = reactive({
 // 列显隐信息
 const columns = ref([
   { key: 0, label: `用户编号`, visible: true },
-  { key: 1, label: `用户名称`, visible: true },
-  { key: 2, label: `用户昵称`, visible: true },
+  { key: 1, label: `登录账号`, visible: true },
+  { key: 2, label: `姓名`, visible: true },
   { key: 3, label: `部门`, visible: true },
   { key: 4, label: `手机号码`, visible: true },
   { key: 5, label: `状态`, visible: true },
@@ -383,17 +380,18 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+    isDelete: '0',
     userName: undefined,
-    phonenumber: undefined,
+    phone: undefined,
     status: undefined,
     deptId: undefined
   },
   rules: {
-    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
-    nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
+    userName: [{ required: true, message: "登录账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "登录账号长度必须介于 2 和 20 之间", trigger: "blur" }],
+    nickName: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+    password: [{ required: true, message: "登录密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "登录密码长度必须介于 5 和 20 之间", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
   }
 });
 
@@ -439,6 +437,7 @@ function resetQuery() {
   proxy.resetForm("queryRef");
   queryParams.value.deptId = undefined;
   proxy.$refs.deptTreeRef.setCurrentKey(null);
+  console.log(queryParams.value);
   handleQuery();
 };
 /** 删除按钮操作 */
@@ -459,8 +458,8 @@ function handleExport() {
 };
 /** 用户状态修改  */
 function handleStatusChange(row) {
-  let text = row.status === "0" ? "启用" : "停用";
-  proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
+  let text = row.status === "1" ? "启用" : "停用";
+  proxy.$modal.confirm('确认要' + text + '"' + row.nickname + '"用户吗?').then(function () {
     return changeUserStatus(row.userId, row.status);
   }).then(() => {
     proxy.$modal.msgSuccess(text + "成功");
@@ -488,12 +487,12 @@ function handleAuthRole(row) {
 };
 /** 重置密码按钮操作 */
 function handleResetPwd(row) {
-  proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+  proxy.$prompt('请输入"' + row.nickname + '"的新密码', "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     closeOnClickModal: false,
     inputPattern: /^.{5,20}$/,
-    inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+    inputErrorMessage: "登录密码长度必须介于 5 和 20 之间",
   }).then(({ value }) => {
     resetUserPwd(row.userId, value).then(response => {
       proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
@@ -540,10 +539,11 @@ function reset() {
     userName: undefined,
     nickName: undefined,
     password: undefined,
-    phonenumber: undefined,
+    phone: undefined,
     email: undefined,
-    sex: undefined,
-    status: "0",
+    gender: undefined,
+    status: "1",
+    isDelete: "0",
     remark: undefined,
     postIds: [],
     roleIds: []
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 2d62c84..a5d4083 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -1,7 +1,7 @@
 <template>
    <el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
-      <el-form-item label="用户昵称" prop="nickName">
-         <el-input v-model="user.nickName" maxlength="30" />
+      <el-form-item label="用户昵称" prop="nickname">
+         <el-input v-model="user.nickname" maxlength="30" />
       </el-form-item>
       <el-form-item label="手机号码" prop="phonenumber">
          <el-input v-model="user.phonenumber" maxlength="11" />
@@ -10,7 +10,7 @@
          <el-input v-model="user.email" maxlength="50" />
       </el-form-item>
       <el-form-item label="性别">
-         <el-radio-group v-model="user.sex">
+         <el-radio-group v-model="user.gender">
             <el-radio label="0">男</el-radio>
             <el-radio label="1">女</el-radio>
          </el-radio-group>
@@ -34,7 +34,7 @@ const props = defineProps({
 const { proxy } = getCurrentInstance();
 
 const rules = ref({
-  nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
   email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
   phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
 });