Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

# Conflicts:
#	frontend/src/views/plan/autoTest/components/tree.vue

frontend/src/api/function/index.ts

@@ -3,24 +3,32 @@ import { ADMIN as rePrefix } from "@/api/config/serviceName";
 import type { Function } from "@/api/function/interface";
 
 
-//获取菜单列表
-export const getFunctionList = (params: Function.ReqFunctionParams) => {
-    return http.post(`/function/list`, params);
-  };
-  
+
+// 获取资源
+export const getFunctionList = () => {
+  return http.get<Function.ResFunction>(`/sysFunction/functionTree`)
+}
+
+
+// 获取资源不包括按钮
+export const getFunctionListNoButton = () => {
+  return http.get<Function.ResFunction>(`/sysFunction/functionTreeNoButton`)
+}
+
+
   //添加菜单列表
   export const addFunction = (params: Function.ResFunction) => {
-    return http.post(`/function/add`,params);
+    return http.post(`/sysFunction/add`,params);
   };
   
   //删除菜单列表
-  export const deleteFunction = (params: { id: string[] }) => {
-    return http.post(`/function/delete`, { data: params });
+  export const deleteFunction = (params: Function.ResFunction) => {
+    return http.post(`/sysFunction/delete?id=${params.id}`);
   };
   
   //编辑菜单列表
   export const updateFunction = (params: Function.ResFunction) => {
-    return http.put(`/function/update`, params);
+    return http.put(`/sysFunction/update`, params);
   };