fix: 用户模块修改

.env.development

@@ -5,7 +5,7 @@ VITE_PORT = 8092
 VITE_PUBLIC_PATH = /
 
 # 是否开启mock
-VITE_USE_MOCK = true
+VITE_USE_MOCK = false
 
 # 网站前缀
 VITE_BASE_URL = /

mock/login/routers.ts

@@ -102,7 +102,7 @@ const list = [
     redirect: '/cameras/overview',
     meta: {
       icon: 'CameraOutlined',
-      title: '相机配置',
+      title: '相机管理',
       noCache: false,
       hidden: false,
       isFrame: '1',
@@ -116,7 +116,7 @@ const list = [
         name: 'cameras-overview',
         component: '/cameras/overview/CamerasOverview',
         meta: {
-          title: '相机管理',
+          title: '相机配置',
           noCache: false,
           hidden: false,
           isFrame: '1',

src/views/auth/dept/columns.ts

@@ -1,16 +1,28 @@
 import { BasicColumn } from '@/components/Table';
 
 export const columns: BasicColumn[] = [
+  // {
+  //   label: '部门名称',
+  //   prop: 'deptName',
+  // },
+  // {
+  //   label: '上级部门名称',
+  //   prop: 'parentName',
+  // },
+  // {
+  //   label: '排序',
+  //   prop: 'orderNum',
+  // },
   {
-    label: '部门名称',
+    label: '组织名称',
     prop: 'deptName',
   },
   {
-    label: '上级部门名称',
+    label: '上级组织名称',
     prop: 'parentName',
   },
   {
-    label: '排序',
-    prop: 'orderNum',
+    label: '组织代码',
+    prop: 'code',
   },
 ];

src/views/system/user/columns.ts

@@ -6,12 +6,20 @@ export const columns: BasicColumn[] = [
   {
     type: 'selection',
   },
+  // {
+  //   label: '账号',
+  //   prop: 'username',
+  // },
   {
-    label: '账号',
+    label: '工号',
     prop: 'username',
   },
+  // {
+  //   label: '用户名',
+  //   prop: 'nickname',
+  // },
   {
-    label: '用户名',
+    label: '姓名',
     prop: 'nickname',
   },
   {
@@ -37,24 +45,29 @@ export const columns: BasicColumn[] = [
     label: '角色',
     prop: 'roleName',
   },
+  // {
+  //   label: '租户',
+  //   prop: 'tenantName',
+  // },
+  // {
+  //   label: '部门',
+  //   prop: 'deptName',
+  // },
   {
-    label: '租户',
-    prop: 'tenantName',
-  },
-  {
-    label: '部门',
-    prop: 'deptName',
-  },
-  {
-    label: '岗位',
+    label: '组织',
     prop: 'postName',
   },
   // {
+  //   label: '岗位',
+  //   prop: 'postName',
+  // },
+  // {
   //   label: '描述',
   //   prop: 'remark',
   // },
   {
     label: '创建时间',
     prop: 'createTime',
+    minWidth: 100,
   },
 ];

src/views/system/user/types/index.ts

@@ -1,3 +1,19 @@
+// export interface formParamsType {
+//   userId?: number | null;
+//   roleIds?: number[];
+//   isEnable: boolean;
+//   email: string;
+//   mobile: string;
+//   nickname: string;
+//   password: string;
+//   passwordRe: string;
+//   remark: string;
+//   sex: string;
+//   username: string;
+//   deptId?: null;
+//   postId?: number[];
+// }
+
 export interface formParamsType {
   userId?: number | null;
   roleIds?: number[];