From 0a7a86a00ef7d45d9383cd33958ca6e0e52f6092 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Sun, 4 Dec 2022 15:00:02 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix:=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddHomework.vue | 3 ++- src/views/learningpath/LevelAdd.vue | 1 + src/views/projectcenter/TaskAdd.vue | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index ea551f0b..80ac0ad9 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -31,6 +31,7 @@
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index cbb4af89..36649fe6 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1914,6 +1914,7 @@ export default { GetRouterDetail(state.routerId) .then((res) => { console.log('router-list',res) + state.fileList = JSON.parse(res.data.data.routerInfo.attach) if (res.data.data.routerInfo.status == 1) { state.nodata = false; } diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 17295e1e..19d4ec2f 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1608,9 +1608,9 @@ export default { }); } else { //默认阶段 - if (state.stageList.length === 1 && !state.stageList.name) { + // if (state.stageList.length === 1 && !state.stageList.name) { - } + // } let obj = { name: state.valuesname, projectId: state.projectId, From db432bfc87f6b32122fe1fbac95d5e5a28c44b5b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 4 Dec 2022 15:05:50 +0800 Subject: [PATCH 02/11] =?UTF-8?q?--=E9=A1=B9=E7=9B=AE=20=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskAdd.vue | 35 +++++++++++++++------------- src/views/projectcenter/TaskPage.vue | 5 ++-- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 17295e1e..e0431530 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -590,6 +590,7 @@ style=" width: 120px; text-align: center; + text-align: center; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -1358,13 +1359,13 @@ export default { }; //获取任务列表 - const getTask = () => { + const getTask = async () => { // console.log("state.projectId", state.projectId); let obj = { projectId: state.projectId, // projectId: 28, }; - api + await api .getTask(obj) .then((res) => { if (res.status == 200) { @@ -1375,9 +1376,7 @@ export default { state.stageList = res.data.data.stageList; let leng = res.data.data.stageList.length; if (leng > 0) { - let stage = localStorage.getItem("stageId") - ? localStorage.getItem("stageId") - : null; + let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null; // console.log("stage",Object.prototype.toString.call(stage)) getStageData(res.data.data.stageList); @@ -1438,6 +1437,8 @@ export default { } else { state.chooseStageId = leng > 0 ? stagearr[0].stageId : null; } + let final = state.level.find((item) => item.id == state.chooseStageId); + getTableData(final.taskList); } }) .catch((err) => { @@ -1579,7 +1580,7 @@ export default { } }; //添加阶段 - const editStage = () => { + const editStage = async () => { if (!state.valuesname) { message.destroy(); return message.warning("请输入阶段名称"); @@ -1591,9 +1592,9 @@ export default { remark: state.valuesnotice, stageId: state.updateStageID, }; - apistage + await apistage .editStage(obj) - .then((res) => { + .then(async (res) => { console.log("修改阶段成功", res); state.valuesname = ""; state.valuesnotice = ""; @@ -1601,31 +1602,33 @@ export default { state.updateStageID = null; message.destroy(); message.success("修改阶段成功"); - getTask(); + await getTask(); + state.chooseStageId = res.data.data.stageId; + let final = state.level.find((item) => item.id == state.chooseStageId); + getTableData(final.taskList); }) .catch((err) => { console.log("添加阶段失败", err); }); } else { - //默认阶段 - if (state.stageList.length === 1 && !state.stageList.name) { - - } let obj = { name: state.valuesname, projectId: state.projectId, remark: state.valuesnotice, }; - apistage + await apistage .editStage(obj) - .then((res) => { + .then(async (res) => { console.log("添加阶段成功", res); state.valuesname = ""; state.valuesnotice = ""; closeModal(); message.destroy(); message.success("添加阶段成功"); - getTask(); + await getTask(); + state.chooseStageId = res.data.data.stageId; + let final = state.level.find((item) => item.id == state.chooseStageId); + getTableData(final.taskList); }) .catch((err) => { console.log("添加阶段失败", err); diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index c7490d9e..53ec7e58 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -343,7 +343,8 @@ 编辑
--> -
+