diff --git a/src/pages/department/index.tsx b/src/pages/department/index.tsx index 8f7a978..6752be7 100644 --- a/src/pages/department/index.tsx +++ b/src/pages/department/index.tsx @@ -51,7 +51,7 @@ const DepartmentPage = () => { const getData = () => { setLoading(true); department.departmentList().then((res: any) => { - const departments = res.data.departments; + const departments: DepartmentsBoxModel = res.data.departments; if (JSON.stringify(departments) !== "{}") { const new_arr: Option[] = checkArr(departments, 0); setTreeData(new_arr); @@ -61,7 +61,7 @@ const DepartmentPage = () => { }); }; - const checkArr = (departments: any[], id: number) => { + const checkArr = (departments: DepartmentsBoxModel, id: number) => { const arr = []; for (let i = 0; i < departments[id].length; i++) { if (!departments[departments[id][i].id]) { diff --git a/src/pages/resource/resource-category/index.tsx b/src/pages/resource/resource-category/index.tsx index d42bc20..c0312b6 100644 --- a/src/pages/resource/resource-category/index.tsx +++ b/src/pages/resource/resource-category/index.tsx @@ -50,7 +50,7 @@ const ResourceCategoryPage = () => { const getData = () => { setLoading(true); resourceCategory.resourceCategoryList().then((res: any) => { - const categories = res.data.categories; + const categories: CategoriesBoxModel = res.data.categories; if (JSON.stringify(categories) !== "{}") { const new_arr: Option[] = checkArr(categories, 0); setTreeData(new_arr); @@ -59,7 +59,7 @@ const ResourceCategoryPage = () => { }); }; - const checkArr = (categories: any[], id: number) => { + const checkArr = (categories: CategoriesBoxModel, id: number) => { const arr = []; for (let i = 0; i < categories[id].length; i++) { if (!categories[categories[id][i].id]) { diff --git a/src/playedu.d.ts b/src/playedu.d.ts index 5ccb4e5..644b204 100644 --- a/src/playedu.d.ts +++ b/src/playedu.d.ts @@ -47,6 +47,18 @@ declare global { title: string; } + interface CategoriesBoxModel { + [key: number]: CategoriesItemModel[]; + } + + interface CategoriesItemModel { + id: number; + name: string; + parent_chain: string; + parent_id: number; + sort: number; + } + interface CategoriesModel { [key: number]: string; } @@ -62,6 +74,20 @@ declare global { interface CategoryIdsModel { [key: number]: number[]; } + + interface DepartmentsBoxModel { + [key: number]: DepartmentsItemModel[]; + } + + interface DepartmentsItemModel { + created_at: string; + id: number; + name: string; + parent_chain: string; + parent_id: number; + sort: number; + updated_at: string; + } } export {};