@@ -1078,7 +1078,9 @@
路径信息
-
当前路径共0个关卡，0个任务
+
+ 当前路径共{{ routeChapters }}个关卡，{{ routeTasks }}个任务
+
学员信息
@@ -1255,6 +1257,8 @@ export default {
dcopyModal: false, //复制弹窗
closeBack: false,
routeStudentsNum: null,
+ routeChapters: null,
+ routeTasks: null,
dcloseCopy: false,
dicloseCopy: false,
stopModal: false, //结束弹窗
@@ -1733,7 +1737,9 @@ export default {
message.destroy();
message.success("发布成功");
state.pub = false;
+ state.nodata = false;
// getLearnPath();
+
reget();
})
.catch((err) => {
@@ -1744,33 +1750,19 @@ export default {
const showPub = () => {
state.pub = true;
// state.releasePathId = routerId;
- //获取学员总数
- let obj = {
- pageNo: 0,
- pageSize: 0,
- routerId: state.routerId,
- };
api
- .getStudent(obj)
+ .getLearnCount(state.routerId)
.then((res) => {
if (res.status === 200) {
- // console.log("res", res.data.data);
- state.routeStudentsNum = res.data.data.total;
+ // console.log("获取关卡、任务、学员统计数据", res.data);
+ state.routeStudentsNum = res.data.students;
+ state.routeChapters = res.data.chapters;
+ state.routeTasks = res.data.tasks;
}
})
.catch((err) => {
console.log("err", err);
});
-
- //获取学习路径详细信息
- // api
- // .getRouterDetail(routerId)
- // .then((res) => {
- // console.log("学习路径详情", res);
- // })
- // .catch((err) => {
- // console.log("学习路径详情获取错误", err);
- // });
};
//显示撤回弹窗
const showBackModal = () => {
@@ -1794,6 +1786,7 @@ export default {
message.success("撤回成功");
state.backModal = false;
reget();
+ state.nodata = true;
})
.catch((err) => {
console.log("撤回失败", err);
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 71e868cd..8a05bf87 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -524,7 +524,7 @@
-
@@ -785,7 +785,7 @@
-
@@ -907,7 +907,9 @@
- 请确认是否批量删除学员
+ 请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}
@@ -1203,6 +1205,8 @@ export default {
chooseProjectList: null, //选择的阶段下的任务列表
curLevel: null, //选择移动到的关卡名称
+
+ deleteType: null, //批量删除学员/任务 1：任务 2：学员
});
const showModal = (element) => {
@@ -1618,12 +1622,14 @@ export default {
const gqxy_hShow = () => {
state.gqxy_hs = !state.gqxy_hs;
};
- const showDeleteALLModal = () => {
+ const showDeleteALLModal = (type) => {
state.deleteAll = true;
+ state.deleteType = type;
};
const delete_exit = () => {
state.deleteAll = false;
deletecTaskAll();
+ state.deleteType = null;
};
const showDeleteModal = (id) => {
state.deleteID = id;
@@ -1751,6 +1757,8 @@ export default {
message.destroy();
message.success("移动成功");
localStorage.setItem("chapterId", state.chooseChapterId);
+ state.selectRow = []; //选择行
+ state.selectAll = 0; //0：未选择，1：全选，2：部分选择
getDetail();
})
.catch((err) => {
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 866384f2..dc3b891f 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -586,7 +586,17 @@
+
{{ element.creater }}
@@ -1127,7 +1137,7 @@ export default {
voteId: "", //删除投票id
deleteID: "",
selectRow: [], //选择行
- curLevel: [], //阶段名称
+ curLevel: null, //阶段名称
selectAll: 0, //0：未选择，1：全选，2：部分选择
updateStageID: null, //编辑阶段id
@@ -1209,7 +1219,7 @@ export default {
taskList: value.taskList,
value: value.stageId,
label: value.name,
- courseId: value.courseId ? value.courseId : null
+ courseId: value.courseId ? value.courseId : null,
};
array.push(obj);
}
@@ -1365,7 +1375,7 @@ export default {
let stage = localStorage.getItem("stageId")
? localStorage.getItem("stageId")
: null;
-
+
// console.log("stage",Object.prototype.toString.call(stage))
getStageData(res.data.data.stageList);
if (stage != null) {
@@ -1373,49 +1383,48 @@ export default {
let stageList = res.data.data.stageList; //阶段数组
let result = stageList.find((item) => item.stageId == stage);
console.log("又找到了", result);
- if(result!=null){
+ if (result != null) {
getTableData(result.taskList);
- }else{
- //没有选中的阶段时，获取全部的任务
+ } else {
+ //没有选中的阶段时，获取全部的任务
console.log(stage);
let stageList = res.data.data.stageList; //阶段数组
- if(stageList!=null){
+ if (stageList != null) {
let taskListAll;
stageList.forEach((item) => {
- taskListAll=[...item.taskList];
+ taskListAll = [...item.taskList];
});
- console.log("taskListAll",taskListAll);
+ console.log("taskListAll", taskListAll);
getTableData(taskListAll);
}
}
-
- } else{
+ } else {
console.log(stage);
- let stageList = res.data.data.stageList; //阶段数组
- if(stageList!=null){
- let taskListAll;
- stageList.forEach((item) => {
- taskListAll=[...item.taskList];
- });
- console.log("taskListAll",taskListAll);
- getTableData(taskListAll);
- }
+ let stageList = res.data.data.stageList; //阶段数组
+ if (stageList != null) {
+ let taskListAll;
+ stageList.forEach((item) => {
+ taskListAll = [...item.taskList];
+ });
+ console.log("taskListAll", taskListAll);
+ getTableData(taskListAll);
+ }
}
// 每次都获取了第一条taskList
// let arr = res.data.data.stageList[0].taskList;
// console.log("任务列表", stage, arr);
// getTableData(arr);
}
- //获取阶段列表
+ // //获取阶段列表
let stagearr = res.data.data.stageList;
- let arrlist = state.curLevel;
+ // let arrlist = state.curLevel;
console.log(stagearr, 111111);
if (stagearr.length > 0) {
getStageData(stagearr);
- stagearr.map((value) => {
- console.log(value);
- arrlist.push(value);
- });
+ // stagearr.map((value) => {
+ // console.log(value);
+ // // arrlist.push(value);
+ // });
}
//给阶段id赋初始值
let stageid = localStorage.getItem("stageId")
@@ -1489,8 +1498,11 @@ export default {
console.log("移动成功", res);
message.destroy();
message.success("移动成功");
+ state.selectRow = []; //选择行
+ state.selectAll = 0; //0：未选择，1：全选，2：部分选择
console.log(state.removeStageId);
getTask();
+
localStorage.setItem("stageId", state.chooseStageId);
})
.catch((err) => {
@@ -1636,7 +1648,7 @@ export default {
console.log("删除阶段成功", res);
message.success("删除阶段成功");
closeDeleteStage();
- localStorage.setItem("stageId", "")
+ localStorage.setItem("stageId", "");
getTask();
})
.catch((err) => {
@@ -1661,7 +1673,7 @@ export default {
"0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
});
const showDrawerOnline = (id, eleId) => {
- console.log('id, eleId',id, eleId);
+ console.log("id, eleId", id, eleId);
state.addonlinevisible = true;
state.EditOnlineId = id;
state.projectTaskId = eleId;