diff --git a/src/api/indexExam.js b/src/api/indexExam.js index 727dd42c..dbf1e0ab 100644 --- a/src/api/indexExam.js +++ b/src/api/indexExam.js @@ -1,17 +1,14 @@ import http from "./config"; // 创建考试信息接口 -export const createExamination = (obj) => http.post('/examination/createExamination',obj,{ - headers: { - 'token': '123' - } -}); +export const createExamination = (obj) => http.post('/examination/createExamination', obj); // 根据Id删除考试信息 -export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById',obj); +export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById', obj); // 根据ID获取考试信息详情 -export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',obj,{headers: { - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' -} +export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById', obj, { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + } }); // 创建考试信息接口 -export const updateExamination = (obj) => http.post('/examination/updateExamination',obj); +export const updateExamination = (obj) => http.post('/examination/updateExamination', obj); diff --git a/src/api/indexLiveBroadcast.js b/src/api/indexLiveBroadcast.js index f855dcc0..0418e99c 100644 --- a/src/api/indexLiveBroadcast.js +++ b/src/api/indexLiveBroadcast.js @@ -4,25 +4,13 @@ import http from "./config"; export const getLiveBroadcastInfor = (obj) => http.get('/liveBroadcast', { params: obj }) //创建直播接口 -export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj, { - headers: { - 'token': '123' - } -}) +export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj) //直播信息删除接口 -export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj, { - headers: { - 'token': '123' - } -}) +export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj) //直播信息修改接口 -export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj, { - headers: { - 'token': '123' - } -}) +export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj) //获取全部评估信息接口 export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj) \ No newline at end of file diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index b8dfc793..7d41cb19 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -25,4 +25,7 @@ export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) //设置项目积分规则 -export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj) \ No newline at end of file +export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj) + +//获取学员积分明细列表 +export const studentScoreList = (obj) => http.post('/admin/project/studentScoreList', obj) \ No newline at end of file diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 6b01be18..b88140e7 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -1,10 +1,6 @@ import http from "./config"; //获取任务列表 -export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }, { - headers: { - 'token': '123' - } -}) +export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }) //项目里的新建或编辑阶段任务 export const addTask = (obj) => http.post('/admin/project/editTask', obj) diff --git a/src/api/indexWork.js b/src/api/indexWork.js index af189946..827bec68 100644 --- a/src/api/indexWork.js +++ b/src/api/indexWork.js @@ -1,18 +1,14 @@ import http from "./config"; // 创建作业信息接口 export const createWorkTask = (obj) => - http.post("/work/createWorkTask", obj, { - headers: { - token: "123", - }, - }); + http.post("/work/createWorkTask", obj); // 删除作业信息接口 export const deleteWorkTask = (obj) => http.post("/work/deleteWorkTask", obj); // 根据ID获取作业信息详情 -export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById',obj,{ - headers: { - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' - } +export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById', obj, { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + } }); // 修改作业信息接口 export const updateWorkTaskUsing = (obj) => diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 70aa3844..82c753f3 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -175,6 +175,7 @@ export default { state.textV1 = ""; message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); }; const queryDiscuss = () => { if (props.edit) { diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 67e313a3..b818bc91 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -9,16 +9,16 @@
姓名：
-
+
搜索
-
+
重置
@@ -36,6 +36,7 @@ />
@@ -277,16 +279,21 @@ >
- + \ No newline at end of file diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 918c39d7..9e40f8f7 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -213,9 +213,15 @@
- +
@@ -238,11 +244,17 @@
- -
- + + +
@@ -966,8 +978,8 @@ import { reactive, toRefs, onMounted, onUnmounted } from "vue"; import AddStu from "../../components/drawers/AddLevelAddStu"; import ImpStu from "../../components/drawers/AddLevelImportStu"; -import AddOnline from "../../components/drawers/AddOnline.vue" -import AddCase from "../../components/drawers/AddCase.vue" +import AddOnline from "../../components/drawers/AddOnline.vue"; +import AddCase from "../../components/drawers/AddCase.vue"; import AddHomework from "../../components/drawers/AddHomework.vue"; import AddTest from "../../components/drawers/AddTest.vue"; import AddDiscuss from "../../components/drawers/AddDiscuss.vue"; @@ -1221,8 +1233,8 @@ export default { deleteModal: false, // 删除弹窗 deleteID: "", // 要删除的任务的id editID: "", // 要编辑的任务id - EditOnlineId:"", // 要编辑的 workid - EditCaseId:"", + EditOnlineId: "", // 要编辑的 workid + EditCaseId: "", EditWorkId: "", EditTestId: "", EditRefId: "", @@ -1249,8 +1261,8 @@ export default { adddiscussvisible: false, //讨论抽屉 isStudiscuss: false, addactivevisible: false, //活动抽屉 - addonlinevisible:false, - addcasevisible:false, + addonlinevisible: false, + addcasevisible: false, addhomeworkvisible: false, addtestvisible: false, addevalvisible: false, @@ -1272,6 +1284,7 @@ export default { projectId: null, projectTaskId: null, chooseStageId: null, + chooseChapterId: null, }); //新建关卡 @@ -1328,17 +1341,17 @@ export default { state.isLevel = false; }; //在线抽屉 - const showDrawerAddOnline = (id,eleId)=>{ + const showDrawerAddOnline = (id, eleId) => { state.addonlinevisible = true; state.EditWorkId = id; state.routerTaskId = eleId; - } + }; //案例抽屉 - const showDrawerAddCase = (id,eleId)=>{ + const showDrawerAddCase = (id, eleId) => { state.addcasevisible = true; state.EditWorkId = id; state.routerTaskId = eleId; - } + }; // 作业和考试的抽屉 const showDrawerAddHomework = (id, eleId) => { console.log("homework==============", id, state.isactive); @@ -1434,6 +1447,7 @@ export default { GetRouterDetail(state.routerId) .then((res) => { console.log("res.data.data.chapterList", res.data.data.chapterList); + //给level赋初始值 state.level = res.data.data.chapterList; state.styTitle = res.data.data.routerInfo.name; state.creTime = toDate( @@ -1448,8 +1462,14 @@ export default { item["label"] = item.name; }); if (state.level.length > 0) { - dataAssignment(state.level[0].chapterId); - state.isactive = state.level[0].chapterId; + let chapter = localStorage.getItem("chapterId"); + if (chapter !== null) { + dataAssignment(chapter);//用哪个的任务表 + state.isactive = chapter;//哪个亮 + } else { + dataAssignment(state.level[0].chapterId); + state.isactive = state.level[0].chapterId; + } } state.deleteModal = false; }) @@ -1674,6 +1694,7 @@ export default { state.selectRow = []; //选择行 state.selectAll = 0; //0：未选择，1：全选，2：部分选择 dataAssignment(chapterId); + state.chooseChapterId = chapterId; }; const gqxy_hShow = () => { state.gqxy_hs = !state.gqxy_hs; @@ -1811,6 +1832,8 @@ export default { console.log("移动成功", res); message.destroy(); message.success("移动成功"); + localStorage.setItem("chapterId", state.chooseChapterId); + getDetail(); }) .catch((err) => { console.log("移动失败", err); @@ -1910,7 +1933,13 @@ export default { const rowSelection = { onSelect: (selectedRows, selected, selectedRowKeys) => { console.log( - "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected); + "selectedRowKeys", + selectedRowKeys, + "selectedRows", + selectedRows, + "selected", + selected + ); console.log(selectedRows.assessmentId); state.assessmentId = selectedRows.assessmentId; state.assessmentName = selectedRows.name; @@ -1944,35 +1973,35 @@ export default { let arr = res.data.data.rows; if (res.status === 200) { getTableDate(arr); - console.log('---------------项目信息---------------------------'); + console.log("---------------项目信息---------------------------"); } }) .catch((err) => { console.log("获取全部项目信息接口失败", err); - console.log('+++++++++++++++++++++++++++++++++++++++++++++++'); + console.log("+++++++++++++++++++++++++++++++++++++++++++++++"); // state.createLoading = false; }); }; const updateTask = () => { - RouterEditTask({ - chapterId: state.isactive, - courseId: state.assessmentId, - name: state.assessmentName, - routerId: state.routerId, - routerTaskId: state.routerTaskId || 0, - type: 13, + RouterEditTask({ + chapterId: state.isactive, + courseId: state.assessmentId, + name: state.assessmentName, + routerId: state.routerId, + routerTaskId: state.routerTaskId || 0, + type: 13, + }) + .then((res) => { + console.log(res, 11111); + message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`); + // ctx.emit("changeData", false); + closeDrawer(); + state.addLoading = false; }) - .then((res) => { - console.log(res, 11111); - message.success(`${state.editproj ? '编辑' : '新增'}关卡任务成功`) - // ctx.emit("changeData", false); - closeDrawer(); - state.addLoading = false; - }) - .catch((err) => { - console.log(err, 1111); - }); - } + .catch((err) => { + console.log(err, 1111); + }); + }; onMounted(() => { // createCase(); getAllProjText(); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 8a83b195..48725a2e 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1395,6 +1395,7 @@ export default { //获取任务列表 const getTask = () => { + // console.log("state.projectId", state.projectId); let obj = { projectId: state.projectId, // projectId: 28, @@ -1409,28 +1410,30 @@ export default { state.picUrl = res.data.data.projectInfo.picUrl; let leng = res.data.data.stageList.length; if (leng > 0) { - // let stage = localStorage.getItem("stageId") - // ? localStorage.getItem("stageId") - // : null; - // if (stage !== null) { - // // console.log("找到了origin", originStageList); - // let originStageList = res.data.data.stageList.find((item) => { - // item.stageId == stage; - // }); - // getTableData(originStageList.taskList); - // console.log("找到了origin", originStageList); - // } else { - // let arr = res.data.data.stageList[0].taskList; - // console.log("任务列表", arr); - // getTableData(arr); - // } - let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null; - let arr = res.data.data.stageList[0].taskList; - console.log("任务列表", stage, arr); - getTableData(arr); + console.log("zhaodaole", stage); + + if (stage !== null) { + let stageList = res.data.data.stageList; //阶段数组 + let result = stageList.find((item) => item.stageId == stage); + console.log("又找到了", result); + getTableData(result.taskList); + } else { + let arr = res.data.data.stageList[0].taskList; + console.log("任务列表", arr); + getTableData(arr); + } + // let stageList = res.data.data.stageList; //阶段数组 + // let result = stageList.find((item) => item.stageId == stage); + // console.log("又找到了", result); + // getTableData(result.taskList); + + // 每次都获取了第一条taskList + // let arr = res.data.data.stageList[0].taskList; + // console.log("任务列表", stage, arr); + // getTableData(arr); } let stagearr = res.data.data.stageList;