From f4a8c500f8fc0a6b2dc8e2abdc90c6fd15d73e1c Mon Sep 17 00:00:00 2001 From: zhangyc Date: Wed, 30 Nov 2022 15:48:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A0=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=97=B6=E8=BF=94=E5=9B=9E=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddDiscuss.vue | 14 ++++++------- src/components/drawers/AddEval.vue | 12 +++++------ src/views/projectcenter/TaskAdd.vue | 30 +++++++++++++++++++-------- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 46accdb5..090da93c 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -154,7 +154,7 @@ export default { ctx.emit("update:edit", false); state.inputV1 = ""; state.textV1 = ""; - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); }; @@ -198,10 +198,10 @@ export default { }) .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); }) .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); }); } else if (props.isLevel == 2) { apiTask @@ -215,10 +215,10 @@ export default { }) .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); }) .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); }); } else if (props.isLevel == 3) { console.log(""); @@ -232,10 +232,10 @@ export default { }) .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); }) .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); }); } }; diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 756a9338..af7c910f 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -212,12 +212,10 @@ export default { type: 10, }) .then(() => { - message.success( - `${props.EditTestId ? "编辑" : "新增"}关卡任务成功` - ); + //message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`); }) .catch(() => { - message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`); + //message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`); }); } else if (props.isLevel == 2) { apitaskadd @@ -237,7 +235,7 @@ export default { }) .catch(() => { message.destroy() - message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { addTempTask({ @@ -249,10 +247,10 @@ export default { type: 10, }) .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); }) .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } }; diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index cb126a5f..d3ea0f32 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1202,7 +1202,8 @@ export default { let data = tableData; let array = []; data.map((value) => { - let obj = { + if(value.stageId!=0){ + let obj = { id: value.stageId, tit: value.name, name: value.remark, @@ -1211,6 +1212,8 @@ export default { label: value.name, }; array.push(obj); + } + }); state.level = array; }; @@ -1363,7 +1366,7 @@ export default { let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null; - console.log("zhaodaole", stage); + // console.log("stage",Object.prototype.toString.call(stage)) getStageData(res.data.data.stageList); if (stage !== "null") { @@ -1371,13 +1374,23 @@ export default { let stageList = res.data.data.stageList; //阶段数组 let result = stageList.find((item) => item.stageId == stage); console.log("又找到了", result); - getTableData(result.taskList); + if(result!=null){ + getTableData(result.taskList); + } + } else { - let arr = res.data.data.stageList[0].taskList; - console.log("任务列表", arr); - getTableData(arr); - // state.isActive = true; - changebgc(res.data.data.stageList[0].stageId); + //没有选中的阶段时，获取全部的任务 + console.log(stage); + let stageList = res.data.data.stageList; //阶段数组 + if(stageList!=null){ + let taskListAll =null; + stageList.forEach((item) => { + taskListAll =[taskListAll,...item.taskList]; + }); + console.log("taskListAll",taskListAll); + getTableData(taskListAll); + } + } // 每次都获取了第一条taskList @@ -1451,7 +1464,6 @@ export default { //移动任务到阶段 const moveTask = () => { if (state.chooseStageId == state.removeStageId) { - console.log("buneng"); message.destroy(); message.warning("选择的任务已在当前阶段"); } else if (state.removeStageId == null) {