已修改角色、新增用户、检测源列表、被检设备列表、检测脚本列表

frontend/src/api/user/interface/index.ts

@@ -20,28 +20,21 @@ export namespace User {
 
   // 用户列表
   export interface ResUserList {
-    id: string;
-    username: string;
-    gender: number;
-    age:number;
-    idCard: string;
-    email: string;
-    address: string;
-    createTime: string;
-    status: number;
-    avatar: string;
-    photo: any[];
-    children?: ResUserList[];
+    id: string;       //用户ID，作为唯一标识
+    username: string; //用户名
+    password: string; //密码
+    realname: string; //真实姓名
+    status: number;   //用户状态
+    rolename: string; //角色名称
   }
 
   export interface ReqUserParams extends ReqPage {
-    username: string;
-    gender: number;
-    idCard: string;
-    email: string;
-    address: string;
-    createTime: string[];
-    status: number;
+    id: string;       //用户ID，作为唯一标识
+    username: string; //用户名
+    password: string; //密码
+    realname: string; //真实姓名
+    status: number;   //用户状态
+    rolename: string; //角色名称
   }
 
   export interface ResStatus {
@@ -49,21 +42,5 @@ export namespace User {
     userValue: number;
   }
 
-  export interface ResGender {
-    genderLabel: string;
-    genderValue: number;
-  }
-
-  export interface ResDepartment {
-    id: string;
-    name: string;
-    children?: ResDepartment[];
-  }
-
-  export interface ResRole {
-    id: string;
-    name: string;
-    children?: ResDepartment[];
-  }
 }
 

frontend/src/api/user/login.ts

@@ -7,17 +7,20 @@ import http from '@/api'
  */
 // 用户登录
 export const loginApi = (params: Login.ReqLoginForm) => {
-  return http.post<Login.ResLogin>(`${rePrefix}/login`, params, { loading: false })
+  // return http.post<Login.ResLogin>(`${rePrefix}/login`, params, { loading: false })
+  return http.post<Login.ResLogin>(`/Register1`, params, { loading: false })
 }
 
 // 获取菜单列表
 export const getAuthMenuListApi = () => {
-  return http.get<Menu.MenuOptions[]>(`${rePrefix}/menu/list`, {}, { loading: false })
+  // return http.get<Menu.MenuOptions[]>(`${rePrefix}/menu/list`, {}, { loading: false })
+  return http.post<Menu.MenuOptions[]>(`/Register2`, {}, { loading: false })
 }
 
 // 获取按钮权限
 export const getAuthButtonListApi = () => {
-  return http.get<Login.ResAuthButtons>(`${rePrefix}/auth/buttons`, {}, { loading: false })
+  // return http.get<Login.ResAuthButtons>(`${rePrefix}/auth/buttons`, {}, { loading: false })
+  return http.post<Login.ResAuthButtons>(`/Register3`, {}, { loading: false })
 }
 
 // 用户退出登录

frontend/src/api/user/user.ts

@@ -2,7 +2,6 @@ import { ResPage } from '@/api/interface'
 import { User } from './interface'
 import { ADMIN as rePrefix } from '@/api/config/serviceName'
 import http from '@/api'
-import type { Resource } from '../resource/interface'
 
 /**
  * @name 用户管理模块
@@ -13,9 +12,9 @@ export const getUserList = (params: User.ReqUserParams) => {
 }
 
 // 获取树形用户列表
-export const getUserTreeList = (params: User.ReqUserParams) => {
-  return http.post<ResPage<User.ResUserList>>(`${rePrefix}/user/tree/list`, params)
-}
+// export const getUserTreeList = (params: User.ReqUserParams) => {
+//   return http.post<ResPage<User.ResUserList>>(`${rePrefix}/user/tree/list`, params)
+// }
 
 // 新增用户
 export const addUser = (params: { id: string }) => {
@@ -56,23 +55,3 @@ export const exportUserInfo = (params: User.ReqUserParams) => {
 export const getUserStatus = () => {
   return http.get<User.ResStatus[]>(`${rePrefix}/user/status`)
 }
-
-// 获取用户状态字典
-export const getResourceType = () => {
-  return http.get<Resource.ResType[]>(`${rePrefix}/user/status`)
-}
-
-// 获取用户性别字典
-export const getUserGender = () => {
-  return http.get<User.ResGender[]>(`${rePrefix}/user/gender`)
-}
-
-// 获取用户部门列表
-export const getUserDepartment = () => {
-  return http.get<User.ResDepartment[]>(`${rePrefix}/user/department`)
-}
-
-// 获取用户角色字典
-export const getUserRole = () => {
-  return http.get<User.ResRole[]>(`${rePrefix}/user/role`)
-}

frontend/src/api/user/userData.ts

@@ -1,147 +1,99 @@
 const data = [
   {
     'id': '623689732233728549',
-    'username': '薛霞',
-    'gender': 2,
-    'age': 14,
-    'idCard': '623689732233728549',
-    'email': 'k.ckfkzrnhd@voyvhqubs.sl',
-    'address': '浙江省 温州市',
-    'createTime': '1985-04-15 15:42:29',
+    'username': 'admin_A',
+    'password': '12345678',
+    'realname': '薛霞',
     'status': 0,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRqMK.jpg',
+    'rolename': '管理员',
   },
   {
     'id': '621003764863621316',
-    'username': '冯敏',
-    'gender': 1,
-    'age': 16,
-    'idCard': '621003764863621316',
-    'email': 'h.obqq@cpyirry.bt',
-    'address': '内蒙古自治区 兴安盟',
-    'createTime': '2003-03-24 22:30:36',
+    'username': 'admin_B',
+    'password': '12345678',
+    'realname': '冯敏',
     'status': 1,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRBHS.jpg',
+    'rolename': '管理员',
   },
   {
     'id': '652286556713195552',
-    'username': '潘霞',
-    'gender': 1,
-    'age': 28,
-    'idCard': '652286556713195552',
-    'email': 'b.ttcn@xrxuorb.gov.cn',
-    'address': '河南省 安阳市',
-    'createTime': '1998-01-16 11:23:33',
+    'username': 'operator_A',
+    'password': '12345678',
+    'realname': '潘霞',
     'status': 1,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRqMK.jpg',
+    'rolename': '操作员',
   },
   {
     'id': '373930342176416776',
-    'username': '郝秀英',
-    'gender': 1,
-    'age': 17,
-    'idCard': '373930342176416776',
-    'email': 'x.fatyfu@udqgch.tv',
-    'address': '黑龙江省 哈尔滨市',
-    'createTime': '1987-09-22 06:43:43',
-    'status': 1,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QR57a.jpg',
+    'username': 'operator_B',
+    'password': '12345678',
+    'realname': '郝秀英',
+    'status': 0,
+    'rolename': '操作员',
   },
   {
     'id': '429621442453555775',
-    'username': '吕洋',
-    'gender': 1,
-    'age': 22,
-    'idCard': '429621442453555775',
-    'email': 's.uirhkbc@bkkvzztn.cv',
-    'address': '天津 天津市',
-    'createTime': '1982-10-31 09:42:09',
+    'username': 'operator_C',
+    'password': '12345678',
+    'realname': '吕洋',
     'status': 1,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QR57a.jpg',
+    'rolename': '操作员',
   },
   {
     'id': '387231964476618937',
-    'username': '江磊',
-    'gender': 1,
-    'age': 28,
-    'idCard': '387231964476618937',
-    'email': 'c.pbov@vusetqkrnx.net',
-    'address': '香港特别行政区 九龙',
-    'createTime': '1999-12-24 09:06:37',
+    'username': 'operator_D',
+    'password': '12345678',
+    'realname': '江磊',
     'status': 0,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRqMK.jpg',
+    'rolename': '操作员',
   },
   {
     'id': '604013348875476647',
-    'username': '姚静',
-    'gender': 1,
-    'age': 15,
-    'idCard': '604013348875476647',
-    'email': 'g.nplhpxqmm@bttefv.ru',
-    'address': '西藏自治区 昌都地区',
-    'createTime': '2020-08-05 12:22:15',
+    'username': 'operator_E',
+    'password': '12345678',
+    'realname': '姚静',
     'status': 0,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRa0s.jpg',
+    'rolename': '操作员',
   },
   {
     'id': '028222596330483467',
-    'username': '龙艳',
-    'gender': 1,
-    'age': 17,
-    'idCard': '028222596330483467',
-    'email': 'e.acjsi@bbjk.ci',
-    'address': '云南省 普洱市',
-    'createTime': '1971-03-07 06:13:10',
+    'username': 'operator_F',
+    'password': '12345678',
+    'realname': '龙艳',
     'status': 1,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRqMK.jpg',
+    'rolename': '操作员',
   },
   {
     'id': '739427478368274267',
-    'username': '武涛',
-    'gender': 1,
-    'age': 18,
-    'idCard': '739427478368274267',
-    'email': 'x.hlwyeply@bcvejqss.bt',
-    'address': '香港特别行政区 香港岛',
-    'createTime': '1975-09-27 01:24:19',
+    'username': 'operator_G',
+    'password': '12345678',
+    'realname': '武涛',
     'status': 1,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRa0s.jpg',
+    'rolename': '操作员',
   },
   {
     'id': '448686878612127243',
-    'username': '孙芳',
-    'gender': 1,
-    'age': 17,
-    'idCard': '448686878612127243',
-    'email': 'j.cmwtpc@xovygkdk.sc',
-    'address': '云南省 西双版纳傣族自治州',
-    'createTime': '1987-04-22 14:09:59',
+    'username': 'operator_H',
+    'password': '12345678',
+    'realname': '孙芳',
     'status': 0,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRBHS.jpg',
+    'rolename': '操作员',
   },
   {
     'id': '448686878612127244',
-    'username': '孙芳1',
-    'gender': 1,
-    'age': 17,
-    'idCard': '448686878612127243',
-    'email': 'j.cmwtpc@xovygkdk.sc',
-    'address': '云南省 西双版纳傣族自治州',
-    'createTime': '1987-04-22 14:09:59',
+    'username': 'operator_I',
+    'password': '12345678',
+    'realname': '孙芳1',
     'status': 0,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRBHS.jpg',
+    'rolename': '操作员',
   },
   {
     'id': '448686878612127245',
-    'username': '孙芳2',
-    'gender': 1,
-    'age': 17,
-    'idCard': '448686878612127243',
-    'email': 'j.cmwtpc@xovygkdk.sc',
-    'address': '云南省 西双版纳傣族自治州',
-    'createTime': '1987-04-22 14:09:59',
-    'status': 0,
-    'avatar': 'https://i.imgtg.com/2023/01/16/QRBHS.jpg',
+    'username': 'operator_J',
+    'password': '12345678',
+    'realname': '孙芳2',
+    'status': 1,
+    'rolename': '操作员',
   },
 ]