diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index ab1092f2..87b495e2 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -26,6 +26,7 @@ export const editGroup = (obj) => http.post('/admin/project/editGroup', obj) export const removeGroupStudent = (obj) => http.post('/admin/project/removeGroupStudent', obj) //查看学员 export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj }) +export const studentRank = (obj) => http.get('/admin/project/studentRank', { params: obj }) //是否优秀学员 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) diff --git a/src/api/indexTask.js b/src/api/indexTask.js index 3edb30c3..ec36f89c 100644 --- a/src/api/indexTask.js +++ b/src/api/indexTask.js @@ -2,7 +2,7 @@ import http from "./config"; // 获取路径图详情-包含关卡及任务列表 -export const GetRouterDetail = (routerId) => http.get(`/admin/router/detail?routerId=${routerId}`) +export const GetRouterDetail = (routerId,useTask="") => http.get(`/admin/router/detail?routerId=${routerId}&useTask=${useTask}`) // 新建或编辑阶段任务 export const ProjectEditTask = (obj) => http.post('/admin/project/editTask',obj) diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index 9b2ab928..3eca704c 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -77,7 +77,7 @@ export default { { id: 1, name: "管理员", - go: "/learningpath", + go: "/manage/learningpath", }, { id: 2, diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 8f5c07be..9dc1ff7f 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -722,7 +722,7 @@ export default { console.log(e); state.isClick = false; message.destroy(); - message.error(`添加失败`); + // message.error(`添加失败`); }); } }; @@ -840,8 +840,9 @@ export default { } }) .catch((err) => { + console.log(err) message.destroy(); - message.error("获取员工失败" + err); + // message.error("获取员工失败" + err); }); }; const handleSearch = debounce((memberValue) => { diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 98ab1fef..93f843de 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -437,8 +437,8 @@ export default { ctx.emit("update:addtestVisible", false); ctx.emit("update:edit", false); ctx.emit("update:EditTestId", state.EditTestId); - ctx.emit("update:testName", state.testName); - console.log("statetestName", state.testName); + ctx.emit("update:testName", state.test.examinationName); + console.log("statetestName", state.test.examinationName); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); state.addLoading = false; @@ -687,7 +687,8 @@ export default { state.paperId = value.paperId; state.paperName = value.testName; state.id = value.id; - state.testName = value.testName; + //state.testName = value.testName; + console.log("value",value); }; const range = (start, end) => { diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index 94b2aaee..4a461f37 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -1,472 +1,480 @@ \ No newline at end of file diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index aced870f..0a546d83 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -1,3 +1,4 @@ +