From fee1f921264be20d3d0f2a695230a033c0e10243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 7 Nov 2022 11:12:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=92=8C=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexLevel.js | 16 ++++++- src/components/drawers/AddActive.vue | 24 ++++++++-- src/components/drawers/AddDiscuss.vue | 24 ++++++++-- src/views/learningpath/LevelAddDetail.vue | 54 ++++++++++++++++++++++- src/views/projectcenter/TaskAdd.vue | 13 ++++-- 5 files changed, 117 insertions(+), 14 deletions(-) diff --git a/src/api/indexLevel.js b/src/api/indexLevel.js index b7b1b400..5cfdb606 100644 --- a/src/api/indexLevel.js +++ b/src/api/indexLevel.js @@ -11,4 +11,18 @@ export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj headers: { 'token': '123' } -}); \ No newline at end of file +}); + +//删除任务 +export const deleteTask = (obj) => http.delete('/admin/router/deleteTask',{params: obj}, { + headers: { + 'token': '123' + } +}); + +//移动任务到关卡 +export const moveTask = (obj) => http.post('/admin/router/moveTask',obj,{ + headers: { + 'token': '123' + } +}); diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 3867f3e1..655b7a3f 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -257,6 +257,22 @@ export default { type: Boolean, default: false, }, + isactive: { + type: Number, + default: null, + }, + routerId: { + type: Number, + default: null, + }, + projectId: { + type: Number, + default: null, + }, + chooseStageId: { + type: Number, + default: null, + } }, setup(props, ctx) { //console.log("学习路径",props.isStudiscuss); @@ -356,12 +372,12 @@ export default { console.log("学习路径",props.isStudiscuss); if(props.isStudiscuss){ let editObj1 = { - chapterId:36, + chapterId:props.isactive, courseId: 0, duration: obj.activityDuration, flag: true, name: obj.activityName, - routerId: 92, + routerId: props.routerId, routerTaskId: 0, type: 9, } @@ -378,9 +394,9 @@ export default { duration: obj.activityDuration, flag: true, name: obj.activityName, - projectId: 28, + projectId: props.projectId, projectTaskId: 0, - stageId: 3, + stageId: props.chooseStageId, type: 9, }) .then((res) => { diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index fd16928c..8c6548ea 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -102,6 +102,22 @@ export default { isStudiscuss: { type: Boolean, default: false, + }, + isactive: { + type: Number, + default: null, + }, + routerId: { + type: Number, + default: null, + }, + projectId: { + type: Number, + default: null, + }, + chooseStageId: { + type: Number, + default: null, } }, setup(props, ctx) { @@ -152,12 +168,12 @@ export default { console.log("学习路径",props.isStudiscuss); if(props.isStudiscuss){ let editObj1 = { - chapterId:36, + chapterId:props.isactive, courseId: 0, duration: 0, flag: true, name: obj.discussName, - routerId: 92, + routerId: props.routerId, routerTaskId: 0, type: 8, } @@ -175,9 +191,9 @@ export default { duration: 0, flag: true, name: obj.discussName, - projectId: 28, + projectId: props.projectId, projectTaskId: 0, - stageId: 3, + stageId: props.chooseStageId, type: 8, }) .then((res) => { diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 4201cc67..e483883d 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -341,7 +341,7 @@ 任务列表
-
+
移动到任务阶段
@@ -729,6 +729,8 @@
@@ -737,6 +739,8 @@
@@ -1073,7 +1077,6 @@ export default { addevalvisible: false, addinvistvisible: false, addvotevisible: false, - updateChapterID: null, //修改关卡id // 表示当前触发列表的id,用来发送编辑和删除 ListChoosedId: 0, selectRow: [], //选择行 @@ -1567,6 +1570,7 @@ export default { }; const delete_exit = () => { state.deleteAll = false; + deletecTaskAll(); }; const showDeleteModal = (id) => { state.deleteID = id; @@ -1656,6 +1660,50 @@ export default { state.tableData = arr; state.selectRow = array; }; + //批量删除任务 + const deletecTaskAll = () => { + let arr = state.selectRow; + console.log("选择的行信息",arr); + arr.map( value => { + let obj = { + routerTaskIds: value, + } + console.log("value",value); + api + .deleteTask(obj) + .then((res) => { + console.log(res); + message.destroy(); + message.success("批量删除成功"); + }) + .catch((err) => { + console.log(err); + }); + }) + } + //移动任务到关卡 + const moveTask = () => { + let arr = state.selectRow; + console.log("选择的行信息",arr); + console.log("选择的关卡id",state.isactive); + arr.map( value => { + console.log("value:",value); + let obj = { + chapterId: state.isactive, + routerTaskIdList: value, + } + api + .moveTask(obj) + .then((res) => { + console.log("移动成功",res); + message.destroy(); + message.success("移动成功"); + }) + .catch((err) => { + console.log("移动失败",err); + }) + }) + }; return { ...toRefs(state), tableDataFunc, @@ -1691,6 +1739,8 @@ export default { showDrawerAddActive, selectRowAll, changeRow, + deletecTaskAll, + moveTask, }; }, }; diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 00176535..409dd168 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -206,6 +206,8 @@
@@ -223,6 +225,8 @@
@@ -1004,7 +1008,7 @@ export default { state.valuesname = "", state.valuesnotice = "", state.stage = false; - message.default(); + message.destroy(); message.success("添加阶段成功"); }) .catch((err) => { @@ -1703,13 +1707,13 @@ export default { console.log("value:",value); let obj = { chapterId: state.chooseStageId, - routerTaskIdList: [], + routerTaskIdList: value, } apimove .moveTask(obj) .then((res) => { console.log("移动成功",res); - message.default(); + message.destroy(); message.success("移动成功"); }) .catch((err) => { @@ -1729,6 +1733,9 @@ export default { .deleteTask(obj) .then((res) => { console.log(res); + message.destroy(); + message.success("批量删除成功"); + getTask(); }) .catch((err) => { console.log(err);