diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index a19141f..4fa26dd 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -274,6 +274,30 @@ export default [ }, ], }, + { + path: "/archives/semester", + meta: { title: "一期一档", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "archives/semester/index", + }, + { + path: "/archives/semester/catalogue", + meta: { + title: "档案目录", + activeMenu: "/archives/semester", + }, + component: "archives/corp/catalogue", + }, + ], + }, + { + path: "/archives/corp", + meta: { title: "一企一档", isSubMenu: false }, + component: "archives/corp/index", + }, ], }, { diff --git a/src/request/archives.js b/src/request/archives.js index 2f9244d..a5d628c 100644 --- a/src/request/archives.js +++ b/src/request/archives.js @@ -4,7 +4,8 @@ export const getUserList = (params) => post("/user/list", params); // 档案管 export const getUserInfo = (params) => post("/user/goEditUser", params); // 档案管理-一人一档-获取人员详情 -export const getTaskList = (params) => post("/studytask/userlist", params); // 档案管理-一人一档-获取任务详情列表 +export const getTaskListByUser = (params) => + post("/studytask/userlist", params); // 档案管理-一人一档-获取任务详情列表 export const getStudyTaskInfo = (params) => post("/studytask/goEdit", params); // 档案管理-一人一档-档案详情-获取任务信息 @@ -19,3 +20,5 @@ export const getSignByStudyTask = (params) => export const getUserExamScoreByStudyTaskId = (params) => post("/stageexam/getUserExamScoreByStudystaskId", params); // 档案管理-一人一档-档案详情-??? + +export const getTaskList = (params) => post("/studytask/list", params); // 档案管理-一期一档-获取任务列表 diff --git a/src/views/archives/corp/catalogue.vue b/src/views/archives/corp/catalogue.vue new file mode 100644 index 0000000..07185d3 --- /dev/null +++ b/src/views/archives/corp/catalogue.vue @@ -0,0 +1,79 @@ + + diff --git a/src/views/archives/corp/components/edit.vue b/src/views/archives/corp/components/edit.vue new file mode 100644 index 0000000..8da245a --- /dev/null +++ b/src/views/archives/corp/components/edit.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/archives/corp/index.vue b/src/views/archives/corp/index.vue new file mode 100644 index 0000000..cc9f323 --- /dev/null +++ b/src/views/archives/corp/index.vue @@ -0,0 +1,40 @@ + + diff --git a/src/views/archives/semester/index.vue b/src/views/archives/semester/index.vue new file mode 100644 index 0000000..24bcd5b --- /dev/null +++ b/src/views/archives/semester/index.vue @@ -0,0 +1,154 @@ + + diff --git a/src/views/archives/user/task_list.vue b/src/views/archives/user/task_list.vue index 02e2743..d41c949 100644 --- a/src/views/archives/user/task_list.vue +++ b/src/views/archives/user/task_list.vue @@ -9,7 +9,10 @@ - + @@ -20,6 +23,7 @@ format="YYYY-MM-DD" type="date" clearable + placeholder="请选择开始时间" /> @@ -31,12 +35,17 @@ format="YYYY-MM-DD" type="date" clearable + placeholder="请选择结束时间" /> - + import LayoutTable from "@/components/table/index.vue"; import LayoutCard from "@/components/card/index.vue"; -import { getTaskList } from "@/request/archives.js"; +import { getTaskListByUser } from "@/request/archives.js"; import useListData from "@/assets/js/useListData.js"; import { reactive } from "vue"; import { useRoute, useRouter } from "vue-router"; @@ -157,7 +166,7 @@ const route = useRoute(); const { USER_ID } = route.query; const { list, pagination, searchForm, fnGetData, fnResetPagination } = - useListData(getTaskList, { + useListData(getTaskListByUser, { otherParams: { STUDY_USER_ID: USER_ID, }, diff --git a/src/views/platform_resource_library/courseware/data.vue b/src/views/platform_resource_library/courseware/data.vue index 751e7e6..7004aaa 100644 --- a/src/views/platform_resource_library/courseware/data.vue +++ b/src/views/platform_resource_library/courseware/data.vue @@ -9,7 +9,10 @@ - + @@ -17,12 +20,13 @@ - + - + @@ -17,12 +20,13 @@ - + - + @@ -17,6 +20,7 @@ diff --git a/src/views/platform_resource_library/paper/list.vue b/src/views/platform_resource_library/paper/list.vue index 00631b9..c7cafc7 100644 --- a/src/views/platform_resource_library/paper/list.vue +++ b/src/views/platform_resource_library/paper/list.vue @@ -9,7 +9,10 @@ - + @@ -17,6 +20,7 @@