From 432d47bd7fa2eac4f084f7f1dfdef452de760ae8 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 02 九月 2024 10:21:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

---
 src/api/authority.ts |   92 ++++++++++++++++++++++++----------------------
 1 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/src/api/authority.ts b/src/api/authority.ts
index 6ef6840..8f445ae 100644
--- a/src/api/authority.ts
+++ b/src/api/authority.ts
@@ -1,19 +1,20 @@
-import axios from 'axios';
-import { Pagination } from '@/types/global';
+import axios from "axios";
+import { Pagination } from "@/types/global";
 
 export interface User {
   userId: string;
+  loginName: string;
   userName: string;
   nickName: string;
   email: string;
   phoneNumber: string;
   dept: any;
-  deptName:string;
-  resources: any;
-  knowledges: any;
-  dialogs: any;
+  deptName: string;
   createTime: string;
   status: string;
+  psw: string;
+  role: string[];
+  roleName: string;
 }
 
 export interface Organization {
@@ -64,116 +65,119 @@
 }
 
 export interface Role {
-  roleId:  string;
-  createTime:  string;
-  updateTime:  string;
-  roleName:  string;
-  remark:  string;
-  iconCls:  string;
-  roleSort:  string;
-  status:  string;
-  roleKey:  string;
-  dataScope:  string;
+  roleId: string;
+  createTime: string;
+  updateTime: string;
+  roleName: string;
+  remark: string;
+  iconCls: string;
+  roleSort: string;
+  status: string;
+  roleKey: string;
+  dataScope: string;
   dept: any;
   resources: any;
+  knowledges: any;
+  dialogs: any;
+  agents: any;
 }
 
 export function RoleList(params: Pagination) {
-  return axios.get<Result<Role[]>>('/base/system/role/list', { params });
+  return axios.get<Result<Role[]>>("/base/system/role/list", { params });
 }
 
 export function RoleDelete(id) {
-  return axios.delete('/base/system/role/' + id);
+  return axios.delete("/base/system/role/" + id);
 }
 
 export function RoleEdit(role) {
-  return axios.put('/base/system/role', { role });
+  return axios.put("/base/system/role", { role });
 }
 
 export function RoleAdd(role) {
-  return axios.post('/base/system/role', { role });
+  return axios.post("/base/system/role", { role });
 }
 
 export function Rolestatus(roleId, status) {
-  return axios.put('/base/system/role/changeStatus', {
+  return axios.put("/base/system/role/changeStatus", {
     roleId: roleId,
-    status: status,
+    status: status
   });
 }
 
 export function UserList(params: Pagination) {
-  return axios.get<Result<User[]>>('/base/system/user/list', { params });
+  return axios.get<Result<User[]>>("/base/system/user/list", { params });
 }
 
 export function Userstatus(userID, status) {
-  return axios.put('/base/system/user/changeStatus', {
+  return axios.put("/base/system/user/changeStatus", {
     userId: userID,
-    status: status,
+    status: status
   });
 }
 
 export function UserChangePwd(userId) {
-  return axios.put('/base/system/user/profile/updatePwd', { userId: userId });
+  return axios.put("/base/system/user/profile/updatePwd", { userId: userId });
 }
 
 export function UserEdit(user) {
-  return axios.put('/base/system/user', { user });
+  return axios.put("/base/system/user", { user });
 }
 
 export function UserAdd(user) {
-  return axios.post('/base/system/user', { user });
+  return axios.post("/base/system/user", { user });
 }
 
 export function UserDelete(id) {
-  return axios.delete('/base/system/user/' + id);
+  return axios.delete("/base/system/user/" + id);
 }
 
 export function OrganizationList(key: string) {
-  return axios.post<Result<Organization[]>>('/base/system/dept/list', {
-    deptName: key,
+  return axios.post<Result<Organization[]>>("/base/system/dept/list", {
+    deptName: key
   });
 }
 
 export function OrganizationAdd(organization) {
-  return axios.post('/base/system/dept', { organization });
+  return axios.post("/base/system/dept", { organization });
 }
 
 export function OrganizationDelete(id) {
-  return axios.delete('/base/system/dept/' + id);
+  return axios.delete("/base/system/dept/" + id);
 }
 
 export function OrganizationUpdate(organization) {
-  return axios.put('/base/system/dept', { organization });
+  return axios.put("/base/system/dept", { organization });
 }
 
 export function OrganizationById(id) {
-  return axios.get<Result<Organization>>('/base/system/dept/' + id);
+  return axios.get<Result<Organization>>("/base/system/dept/" + id);
 }
 
 export function ResourceList(key: string) {
-  return axios.get<Result<Resource[]>>('/base/system/menu/treeselect');
+  return axios.get<Result<Resource[]>>("/base/system/menu/treeselect");
 }
 
 export function ResourceAdd(resource) {
-  return axios.post('/base/system/menu', { resource });
+  return axios.post("/base/system/menu", { resource });
 }
 
 export function ResourceDelete(id) {
-  return axios.delete('/base/system/menu/' + id);
+  return axios.delete("/base/system/menu/" + id);
 }
 
 export function ResourceUpdate(resource) {
-  return axios.put('/base/system/menu', { resource });
+  return axios.put("/base/system/menu", { resource });
 }
 
 export function ResourceById(id) {
-  return axios.get<Result<Resource>>('/base/system/menu/' + id);
+  return axios.get<Result<Resource>>("/base/system/menu/" + id);
 }
 
-export function KnowledgeList() {
-  return axios.get<Result<Knowledge>>('/base/system/knowledge/list');
+export function KnowledgeList(role: string) {
+  return axios.get<Result<Knowledge>>("/base/system/knowledge/list" + "?role=" + role);
 }
 
-export function DialogList() {
-  return axios.get<Result<Knowledge>>('/base/system/dialog/list');
+export function DialogList(role: string) {
+  return axios.get<Result<any>>("/base/system/dialog/list" + "?role=" + role);
 }

--
Gitblit v1.8.0