فهرست منبع

pref: 用户管理优化,时间序列化优化

wuwenyi 2 هفته پیش
والد
کامیت
c60eb0f157
3فایلهای تغییر یافته به همراه19 افزوده شده و 32 حذف شده
  1. 2 8
      src/router/index.ts
  2. 4 11
      src/utils/format.ts
  3. 13 13
      src/views/system/user/index.vue

+ 2 - 8
src/router/index.ts

@@ -146,12 +146,6 @@ const router = createRouter({
           name: 'FlowExecute',
           name: 'FlowExecute',
           component: () => import('@/views/flow/execute/index.vue'),
           component: () => import('@/views/flow/execute/index.vue'),
           meta: { title: '流程执行', icon: 'Pointer' }
           meta: { title: '流程执行', icon: 'Pointer' }
-        },
-        {
-          path: 'all',
-          name: 'AllInstance',
-          component: () => import('@/views/flow/instance/all.vue'),
-          meta: { title: '流程明细', icon: 'Document' }
         }
         }
       ]
       ]
     }
     }
@@ -164,8 +158,8 @@ const publicPaths = new Set(['/login'])
 const permissionPaths: Record<string, Set<string>> = {
 const permissionPaths: Record<string, Set<string>> = {
   common_user: new Set(['/', '/dashboard', '/login', '/profile', '/approval/todo', '/approval/handled', '/approval/mine', '/approval/execute', '/approval/cc']),
   common_user: new Set(['/', '/dashboard', '/login', '/profile', '/approval/todo', '/approval/handled', '/approval/mine', '/approval/execute', '/approval/cc']),
   dept_manager: new Set(['/', '/dashboard', '/login', '/profile', '/system/user', '/system/role', '/approval/todo', '/approval/handled', '/approval/mine', '/approval/execute', '/approval/cc']),
   dept_manager: new Set(['/', '/dashboard', '/login', '/profile', '/system/user', '/system/role', '/approval/todo', '/approval/handled', '/approval/mine', '/approval/execute', '/approval/cc']),
-  flow_manager: new Set(['/', '/dashboard', '/login', '/profile', '/flow/designer', '/flow/definition', '/flow/instance/all', '/approval/todo', '/approval/handled', '/approval/mine', '/approval/execute', '/approval/cc', '/analysis']),
-  super_admin: new Set(['/', '/dashboard', '/login', '/profile', '/system/user', '/system/role', '/flow/designer', '/flow/definition', '/flow/instance/all', '/approval/todo', '/approval/handled', '/approval/mine', '/approval/execute', '/approval/cc', '/analysis'])
+  flow_manager: new Set(['/', '/dashboard', '/login', '/profile', '/flow/designer', '/flow/definition', '/approval/todo', '/approval/handled', '/approval/mine', '/approval/execute', '/approval/cc', '/analysis']),
+  super_admin: new Set(['/', '/dashboard', '/login', '/profile', '/system/user', '/system/role', '/flow/designer', '/flow/definition', '/approval/todo', '/approval/handled', '/approval/mine', '/approval/execute', '/approval/cc', '/analysis'])
 }
 }
 
 
 function isPathAllowed(allowedSet: Set<string>, path: string): boolean {
 function isPathAllowed(allowedSet: Set<string>, path: string): boolean {

+ 4 - 11
src/utils/format.ts

@@ -1,15 +1,8 @@
 const employeeTypeMap: Record<string, string> = {
 const employeeTypeMap: Record<string, string> = {
   common_user: '普通用户',
   common_user: '普通用户',
-  dept_manager: '部门经理',
-  flow_manager: '流程管理员',
-  super_admin: '超级管理员'
-}
-
-const adminEmployeeTypeMap: Record<string, string> = {
-  common_user: '普通管理员',
-  dept_manager: '部门管理员',
-  flow_manager: '流程管理员',
-  super_admin: '系统管理员'
+  dept_manager: '部门运维',
+  flow_manager: '流程运维',
+  super_admin: '管理员'
 }
 }
 
 
 export function employeeTypeLabel(type?: string): string {
 export function employeeTypeLabel(type?: string): string {
@@ -17,5 +10,5 @@ export function employeeTypeLabel(type?: string): string {
 }
 }
 
 
 export function adminEmployeeTypeLabel(type?: string): string {
 export function adminEmployeeTypeLabel(type?: string): string {
-  return adminEmployeeTypeMap[type || ''] || type || '-'
+  return employeeTypeMap[type || ''] || type || '-'
 }
 }

+ 13 - 13
src/views/system/user/index.vue

@@ -3,8 +3,8 @@
     <el-card>
     <el-card>
       <template #header>
       <template #header>
         <div class="card-header">
         <div class="card-header">
-          <span>管理员列表</span>
-          <el-button type="primary" @click="handleAdd">新增管理员</el-button>
+          <span>用户列表</span>
+          <el-button type="primary" @click="handleAdd">新增用户</el-button>
         </div>
         </div>
       </template>
       </template>
 
 
@@ -28,7 +28,7 @@
         <el-table-column type="index" label="序号" width="60" />
         <el-table-column type="index" label="序号" width="60" />
         <el-table-column prop="username" label="账号" />
         <el-table-column prop="username" label="账号" />
         <el-table-column prop="realName" label="姓名" />
         <el-table-column prop="realName" label="姓名" />
-        <el-table-column prop="employeeType" label="管理员类型">
+        <el-table-column prop="employeeType" label="用户类型">
           <template #default="{ row }">
           <template #default="{ row }">
             {{ adminEmployeeTypeLabel(row.employeeType) }}
             {{ adminEmployeeTypeLabel(row.employeeType) }}
           </template>
           </template>
@@ -118,12 +118,12 @@
             style="width: 100%"
             style="width: 100%"
           />
           />
         </el-form-item>
         </el-form-item>
-        <el-form-item label="管理员类型" prop="employeeType">
-          <el-select v-model="form.employeeType" placeholder="请选择管理员类型" style="width: 100%">
-            <el-option label="普通管理员" value="common_user" />
-            <el-option label="部门管理员" value="dept_manager" />
-            <el-option label="流程管理员" value="flow_manager" />
-            <el-option label="系统管理员" value="super_admin" />
+        <el-form-item label="用户类型" prop="employeeType">
+          <el-select v-model="form.employeeType" placeholder="请选择用户类型" style="width: 100%">
+            <el-option label="普通用户" value="common_user" />
+            <el-option label="部门运维" value="dept_manager" />
+            <el-option label="流程运维" value="flow_manager" />
+            <el-option label="管理员" value="super_admin" />
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item label="状态">
         <el-form-item label="状态">
@@ -197,7 +197,7 @@ const formRules: FormRules = {
     },
     },
     trigger: 'blur'
     trigger: 'blur'
   }],
   }],
-  employeeType: [{ required: true, message: '请选择管理员类型', trigger: 'change' }]
+  employeeType: [{ required: true, message: '请选择用户类型', trigger: 'change' }]
 }
 }
 
 
 async function loadDepts() {
 async function loadDepts() {
@@ -244,7 +244,7 @@ function resetQuery() {
 
 
 function handleAdd() {
 function handleAdd() {
   isEdit.value = false
   isEdit.value = false
-  dialogTitle.value = '新增管理员'
+  dialogTitle.value = '新增用户'
   Object.assign(form, {
   Object.assign(form, {
     id: undefined,
     id: undefined,
     username: '',
     username: '',
@@ -261,7 +261,7 @@ function handleAdd() {
 
 
 function handleEdit(row: User) {
 function handleEdit(row: User) {
   isEdit.value = true
   isEdit.value = true
-  dialogTitle.value = '编辑管理员'
+  dialogTitle.value = '编辑用户'
   Object.assign(form, {
   Object.assign(form, {
     id: row.id,
     id: row.id,
     username: row.username,
     username: row.username,
@@ -278,7 +278,7 @@ function handleEdit(row: User) {
 
 
 async function handleDelete(row: User) {
 async function handleDelete(row: User) {
   try {
   try {
-    await ElMessageBox.confirm(`确认删除管理员 "${row.username}" 吗?`, '提示', { type: 'warning' })
+    await ElMessageBox.confirm(`确认删除用户 "${row.username}" 吗?`, '提示', { type: 'warning' })
     await deleteUser(row.id)
     await deleteUser(row.id)
     ElMessage.success('删除成功')
     ElMessage.success('删除成功')
     loadData()
     loadData()