用户管理

frontend/src/views/authority/user/components/passWordPopup.vue

@@ -0,0 +1,142 @@
+<template>
+    <!-- 基础信息弹出框 -->
+  <el-dialog v-model='dialogVisible' :title="dialogTitle" v-bind="dialogSmall" @close="close">
+    <div>
+        <el-form :model="formContent"
+                  ref='dialogFormRef'
+                  :rules='rules'
+                  >
+        <el-form-item label="原密码" prop='oldPassword' :label-width="100">
+          <el-input type="oldPassword" v-model="formContent.oldPassword" show-password placeholder="请输入原密码" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="新密码" prop='newPassword' :label-width="100">
+          <el-input type="newPassword" v-model="formContent.newPassword" show-password placeholder="请输入新密码" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="确认密码" prop='surePassword' :label-width="100">
+          <el-input type="surePassword" v-model="formContent.surePassword" show-password placeholder="请再次输入确认密码" autocomplete="off" />
+        </el-form-item>
+      </el-form>
+      </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="close()">取消</el-button>
+        <el-button type="primary" @click="save()">
+          保存
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  </template>
+  
+  <script lang="ts" setup>
+  import { ref, type Ref  } from 'vue'
+  import {dialogSmall} from '@/utils/elementBind'
+  import { ElMessage, type FormInstance,type FormItemRule } from 'element-plus'
+  import {updatePassWord} from '@/api/user/user'
+  // 使用 dayjs 库格式化
+  import dayjs from 'dayjs';
+  import { type User } from '@/api/user/interface';
+
+  // 定义弹出组件元信息
+  const dialogFormRef = ref()
+  const dialogTitle = ref('修改密码')
+  const surePassword = ref('')
+  function useMetaInfo() {
+    const dialogVisible = ref(false)
+    const formContent = ref<User.ResPassWordUser>({
+      id: '',       //用户ID，作为唯一标识
+      oldPassword: '',//密码
+      newPassword:'',//
+      surePassword:'',
+    })
+    return { dialogVisible, formContent }
+  }
+  
+  const { dialogVisible, formContent } = useMetaInfo()
+  // 清空formContent
+  const resetFormContent = () => {
+    formContent.value = {
+        id: '',       //用户ID，作为唯一标识
+        oldPassword: '',//密码
+        newPassword:'',//
+        surePassword:'',
+    }
+  }
+  
+  //定义规则
+  const formRuleRef = ref<FormInstance>()
+  // 定义规则
+const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+  oldPassword: [
+    { required: true, message: '原密码必填！', trigger: 'blur' }
+  ],
+  newPassword: [
+    { required: true, message: '新密码必填！', trigger: 'blur' },
+    { pattern: /^(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]).{8,16}$/, message: '密码长度为8-16，需包含特殊字符', trigger: 'blur' }
+  ],
+  surePassword: [
+    { required: true, message: '确认密码必填！', trigger: 'blur' },
+    {
+      validator: (rule: FormItemRule, value: string, callback: Function) => {
+        console.log('1111')
+        if (value !== formContent.value.newPassword) {
+          callback(new Error('两次输入的密码不一致！'));
+        } else {
+          callback();
+        }
+      },
+      trigger: 'blur'
+    }
+  ]
+})
+ 
+  
+ // 关闭弹窗
+ const close = () => {
+    dialogVisible.value = false
+    // 清空dialogForm中的值
+    resetFormContent()
+    // 重置表单
+    dialogFormRef.value?.resetFields()
+  }
+  
+  // 保存数据
+  const save = () => {
+    try {
+        dialogFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+          if (formContent.value.id) {
+                const result = await updatePassWord(formContent.value);
+                if(result.code != 'A0000'){
+                  ElMessage.error({ message: String(result.data)})
+                }else{
+                  ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                }
+          } 
+          close()
+          // 刷新表格
+          await props.refreshTable!()
+        }
+      })
+    } catch (err) {
+      console.error('验证过程中出现错误', err)
+    }
+  }
+  
+  // 打开弹窗是编辑
+  const open = async ( data: User.ResPassWordUser) => {
+    dialogVisible.value = true
+    if (data.id) {
+      formContent.value = { ...data }
+    } 
+  }
+  
+  // 对外映射
+  defineExpose({ open })
+  const props = defineProps<{
+    refreshTable: (() => Promise<void>) | undefined;
+  }>()
+  
+
+  </script>

frontend/src/views/authority/user/components/userPopup.vue

@@ -3,7 +3,7 @@
   <el-dialog v-model='dialogVisible' :title="dialogTitle" v-bind="dialogSmall" @close="close">
     <div>
         <el-form :model="formContent"
-                  ref='formRuleRef'
+                  ref='dialogFormRef'
                   :rules='rules'
                   >
         <el-form-item label="用户名" prop='name' :label-width="100">
@@ -12,24 +12,26 @@
         <el-form-item label="登录名" prop='loginName'  :label-width="100">
           <el-input v-model="formContent.loginName" placeholder="请输入登录名" autocomplete="off" />
         </el-form-item>
-        <el-form-item label="密码" prop='password' :label-width="100">
-          <el-input type="password" v-model="formContent.password" placeholder="请输入密码" autocomplete="off" />
+        <el-form-item label="密码" prop='password' :label-width="100" v-if="IsPasswordShow">
+          <el-input type="password" v-model="formContent.password" show-password placeholder="请输入密码" autocomplete="off" />
         </el-form-item>
+        <el-form-item label='角色' :label-width='100' prop='roles'>
+            <el-select v-model="formContent.roleIds"  multiple   placeholder="请选择角色">
+              <el-option
+              v-for="item in roleList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+          </el-form-item>
         <el-form-item label="手机号码" prop='phone' :label-width="100">
           <el-input v-model="formContent.phone" placeholder="请输入手机号码" autocomplete="off" />
         </el-form-item>
         <el-form-item label="邮箱地址" prop='email' :label-width="100">
           <el-input v-model="formContent.email" placeholder="请输入邮箱地址" autocomplete="off" />
         </el-form-item>
-        <el-form-item label="最后一次登录时间" prop='loginTime' :label-width="100">
-          <el-input v-model="formContent.loginTime" placeholder="请输入最后一次登录时间" autocomplete="off" />
-        </el-form-item>
-        <el-form-item label="登录错误次数" prop='loginErrorTimes' :label-width="100">
-          <el-input v-model="formContent.loginErrorTimes" placeholder="请输入登录错误次数" autocomplete="off" />
-        </el-form-item>
-        <el-form-item label="用户密码错误锁定时间" prop='lockTime' :label-width="100">
-          <el-input v-model="formContent.lockTime" placeholder="请输入用户密码错误锁定时间" autocomplete="off" />
-        </el-form-item>
+   
       </el-form>
       </div>
     <template #footer>
@@ -50,14 +52,18 @@
   import { ElMessage, type FormInstance,type FormItemRule } from 'element-plus'
   import {
     addUser,
-    updateUser
+    updateUser,
   } from '@/api/user/user'
   // 使用 dayjs 库格式化
   import dayjs from 'dayjs';
   import { type User } from '@/api/user/interface';
+  import { useDictStore } from '@/stores/modules/dict'
+  import { type Role } from '@/api/role/interface';
+  const dictStore = useDictStore()
   // 定义弹出组件元信息
   const dialogFormRef = ref()
-
+  const IsPasswordShow = ref(false)
+  const roleList = ref<Role.RoleBO[]>([])
   function useMetaInfo() {
     const dialogVisible = ref(false)
     const titleType = ref('add')
@@ -71,6 +77,7 @@
       loginTime: '',//最后一次登录时间
       loginErrorTimes: 0,//登录错误次数
       lockTime: '', //用户密码错误锁定时间
+      state: 1, //
     })
     return { dialogVisible, titleType, formContent }
   }
@@ -88,6 +95,7 @@
       loginTime: '',//最后一次登录时间
       loginErrorTimes: 0,//登录错误次数
       lockTime: '', //用户密码错误锁定时间
+      state: 1, //
     }
   }
   
@@ -100,10 +108,13 @@
     const formRuleRef = ref<FormInstance>()
   //定义校验规则
   const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-    name: [{ required: true, message: '名称必填！', trigger: 'blur' }],
-    loginName: [{ required: true, message: '登录名必填！', trigger: 'blur' }],
-    password: [{ required: true, message: '密码必填！', trigger: 'blur' }],
-    loginErrorTimes: [{ required: true, message: '登录错误次数必填！', trigger: 'blur' }],
+    name: [{ required: true, message: '名称必填！', trigger: 'blur' },
+       // 指定正则，此处是数字正则
+       { pattern: /^[A-Za-z\u4e00-\u9fa5]{1,16}$/, message: '名称需1~16位的英文或汉字', trigger: 'blur' }],
+      loginName: [{ required: true, message: '登录名必填！', trigger: 'blur' },
+      { pattern: /^[a-zA-Z_.]{1}[a-zA-Z0-9_.]{2,15}$/, message: '登录名需2-15位的字母数字符号', trigger: 'blur' }],
+      password: [{ required: true, message: '密码必填！', trigger: 'blur' },
+      { pattern: /^(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]).{8,16}$/, message: '密码长度为8-16，需包含特殊字符', trigger: 'blur' }],
   })
  
   
@@ -121,7 +132,6 @@
     try {
         dialogFormRef.value?.validate(async (valid: boolean) => {
         if (valid) {
-          formContent.value.lockTime = dayjs(formContent.value.lockTime).format('YYYY-MM-DD');
           if (formContent.value.id) {
                 const result = await updateUser(formContent.value);
                 if(result.code != 'A0000'){
@@ -148,12 +158,16 @@
   }
   
   // 打开弹窗，可能是新增，也可能是编辑
-  const open = (sign: string, data: User.ResUser) => {
+  const open = async (sign: string, data: User.ResUser,roleParams: Role.RoleBO[]) => {
+    // 获取角色列表
+    roleList.value = roleParams
     titleType.value = sign
     dialogVisible.value = true
     if (data.id) {
+      IsPasswordShow.value = false
       formContent.value = { ...data }
     } else {
+      IsPasswordShow.value = true
       resetFormContent()
     }
   }

frontend/src/views/authority/user/index.vue

@@ -18,33 +18,45 @@
         <template #operation='scope'>
           <el-button type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
           <el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
+          <el-button type='primary' link :icon='Delete' @click='EditPassWord(scope.row)'>修改密码</el-button>
           </template>
 
       </ProTable>
     </div>
     <UserPopup :refresh-table='proTable?.getTableList' ref='userPopup' />
+
+    <PassWordPopup :refresh-table='proTable?.getTableList' ref='passWordPopup' />
+
     </template>
 
   <script setup lang='tsx' name='useRole'>
   import TimeControl from '@/components/TimeControl/index.vue'
   import { type User } from '@/api/user/interface'
   import { useHandleData } from '@/hooks/useHandleData'
-  import { useDownload } from '@/hooks/useDownload'
-  import { useAuthButtons } from '@/hooks/useAuthButtons'
   import ProTable from '@/components/ProTable/index.vue'
   import UserPopup from './components/userPopup.vue'
+  import PassWordPopup from './components/passWordPopup.vue'
   import ImportExcel from '@/components/ImportExcel/index.vue'
   import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
   import { CirclePlus, Delete, EditPen} from '@element-plus/icons-vue'
   import { useDictStore } from '@/stores/modules/dict'
-  import {getUserList, deleteUser,} from '@/api/user/user'
-  import { reactive, ref } from 'vue'
-
+  import {getUserList, deleteUser,getRoleList} from '@/api/user/user'
+  import { onMounted, reactive, ref } from 'vue'
+  import { type Role } from '@/api/role/interface'
+  const roleList = ref<Role.RoleBO[]>([])
   const dictStore = useDictStore()
   const userPopup = ref()
+  const passWordPopup = ref()
   // ProTable 实例
   const proTable = ref<ProTableInstance>()
 
+
+  // 初始化时获取角色列表
+  onMounted(async () => {
+    const response = await getRoleList()
+    roleList.value = response.data as unknown as Role.RoleBO[]
+  })
+
   // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
   // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
   const getTableList = (params: any) => {
@@ -54,8 +66,6 @@
   return getUserList(newParams)
 }
 
-
-
   // 表格配置项
   const columns = reactive<ColumnProps<User.ResUser>[]>([
     { type: 'selection', fixed: 'left', width: 70 },
@@ -69,22 +79,30 @@
     {
       prop: 'loginName',
       label: '登录名',
-      minWidth: 180,
+      minWidth: 150,
     },
     {
-      prop: 'password',
-      label: '密码',
-      minWidth: 180,
+      prop: 'roleNames',
+      label: '角色',
+      minWidth: 250,
+      render: (scope) => {
+      const roleNames = scope.row.roleNames;
+      const roleArray = Array.isArray(roleNames) ? roleNames : [roleNames];
+      if (roleArray.length > 1) {
+        return roleArray.join(', ');
+      }
+      return roleArray[0] || ''; // 添加默认值
     },
+  },
     {
       prop: 'phone',
       label: '手机号',
-      minWidth: 180,
+      minWidth: 150,
     },
     {
       prop: 'email',
       label: '邮箱',
-      minWidth: 180,
+      minWidth: 150,
     },
     {
       prop: 'loginTime',
@@ -105,19 +123,56 @@
     },
     },
     {
-      prop: 'loginErrorTimes',
-      label: '登录错误次数',
-      minWidth: 180,
-    },
-    {
-      prop: 'lockTime',
-      label: '用户密码错误锁定时间',
-      minWidth: 180,
+      prop: 'state',
+      label: '状态',
+      minWidth: 100,
+      enum: dictStore.getDictData('state'),
+      fieldNames: { label: 'label', value: 'code' },
+      render: (scope: { row: { state: any } }) => {
+      const { tagType, tagText } = getTagTypeAndText(scope.row.state);
+      return (<el-tag type={tagType}>{tagText}</el-tag>);
+    }
     },
     { prop: 'operation', label: '操作', fixed: 'right', width: 330 },
   ])
 
 
+  // 提取出生成 tag 的逻辑
+  const getTagTypeAndText = (state: number) => {
+  let tagType = 'danger'; // 默认标签类型为 'danger'
+  let tagText = '';
+
+  switch(state) {
+    case 1:
+      tagType = 'success'; // 正常
+      tagText = '正常';
+      break;
+    case 2:
+      tagType = 'warning'; // 锁定
+      tagText = '锁定';
+      break;
+    case 3:
+      tagType = 'info'; // 待审核
+      tagText = '待审核';
+      break;
+    case 4:
+      tagType = 'default'; // 休眠
+      tagText = '休眠';
+      break;
+    case 5:
+      tagType = 'warning'; // 密码过期
+      tagText = '密码过期';
+      break;
+    case 0:
+    default:
+      tagType = 'danger'; // 删除
+      tagText = '删除';
+      break;
+  }
+
+  return { tagType, tagText };
+}
+
   // 处理日期变化的回调函数
 const startDate = ref('')
 const endDate = ref('')
@@ -128,17 +183,17 @@ const handleDateChange = (startDateTemp: string, endDateTemp: string) => {
 
 // 打开 drawer(新增、编辑)
 const openDialog = (titleType: string, row: Partial<User.ResUser> = {}) => {
- userPopup.value?.open(titleType, row)
+ userPopup.value?.open(titleType, row,roleList.value)
 
 }
 
   // 删除用户信息
   const handleDelete = async (params: User.ResUser) => {
-    await useHandleData(deleteUser, { id: [params.id] }, `删除【${params.name}】用户`)
+    await useHandleData(deleteUser,  [params.id] , `删除【${params.name}】用户`)
     proTable.value?.getTableList()
   }
 
-  // 批量删除角色信息
+  // 批量删除用户信息
   const batchDelete = async (id: string[]) => {
     await useHandleData(deleteUser, { id }, '删除所选用户信息')
     proTable.value?.clearSelection()
@@ -146,7 +201,11 @@ const openDialog = (titleType: string, row: Partial<User.ResUser> = {}) => {
   }
 
 
+  // 修改密码
+  const EditPassWord = async (row: User.ResPassWordUser) => {
+    passWordPopup.value?.open(row)
 
+  }
 
 
   </script>