From efdfb705d50891486a9a227340bfaf5d3330aef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com> Date: Tue, 22 Nov 2022 17:20:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=82=E6=A8=A1=E6=9D=BF=E4=BB=BB=E5=8A=A1=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexTemplate.js | 4 +- src/views/projectcenter/LibraryAdd.vue | 4 +- src/views/projectcenter/temTask.vue | 92 ++++++++++--------------- src/views/projectcenter/templateAdd.vue | 53 +++++++++----- 4 files changed, 78 insertions(+), 75 deletions(-) diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js index 212aafee..be42523c 100644 --- a/src/api/indexTemplate.js +++ b/src/api/indexTemplate.js @@ -6,9 +6,9 @@ export const templateEdit = (obj) => http.post('/admin/project/template/edit',ob // 模板详情 export const templateDetail = (id) => http.get(`/admin/project/template/detail?projectTemplateId=${id}`); // 删除阶段 -export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage`,{stageId:id}); +export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage?stageId=${id}`); //删除任务 -export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask`,{projectTaskIds:id}); +export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask?projectTaskIds=${id}`); // 移动任务到阶段 export const moveTask = (obj) => http.post('/admin/project/template/moveTask',obj); // 新建或编辑阶段 diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index f44e4414..9ca65c2e 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -55,7 +55,7 @@
任务大纲
- + { routered.push({ - path: "/manage/templateAdd", + path: "/templateAdd", query: { projectId: state.projectId, name: state.name, diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index df5be070..8d8420c9 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -149,7 +149,7 @@ - +
{ let obj = { - id: value.projectTaskId, - key: value.projectTaskId, + id: value.templateTaskId, + key: value.templateTaskId, lei: value.type == 1 ? "在线" @@ -1351,7 +1349,7 @@ checked: false, //是否选中类型 courseId: value.courseId, projectId: value.projectId, - stageId: value.stageId, + templateStageId: value.templateStageId, type: value.type, }; array.push(obj); @@ -1365,11 +1363,11 @@ let array = []; data.map((value) => { let obj = { - id: value.stageId, + id: value.templateStageId, tit: value.name, name: value.remark, taskList: value.taskList, - value: value.stageId, + value: value.templateStageId, label: value.name, }; array.push(obj); @@ -1491,8 +1489,7 @@ { - showDelete(); - state.deleteID = text.record.id; + showDelete(text.record.id); }} > 删除 @@ -1508,23 +1505,19 @@ //获取任务列表 const getTask = () => { - // console.log("state.projectId", state.projectId); - let obj = { - projectId: state.projectId, - // projectId: 28, - }; + state.tableData = [] api - .getTask(obj) + // .templateDetail(state.projectId || 1) + .templateDetail(1) .then((res) => { if (res.status == 200) { console.log("22222", res.data.data.stageList); - // console.log("22222", res.data.data.stageList); - state.projectTitle = res.data.data.projectInfo.name; - state.picUrl = res.data.data.projectInfo.picUrl; + state.projectTitle = res.data.data.projectTemplateInfo.name; + state.picUrl = res.data.data.projectTemplateInfo.picUrl; let leng = res.data.data.stageList.length; if (leng > 0) { - let stage = localStorage.getItem("stageId") - ? localStorage.getItem("stageId") + let stage = localStorage.getItem("templateStageId") + ? localStorage.getItem("templateStageId") : null; console.log("zhaodaole", stage); // console.log("stage",Object.prototype.toString.call(stage)) @@ -1532,7 +1525,7 @@ if (stage !== "null") { console.log(stage); let stageList = res.data.data.stageList; //阶段数组 - let result = stageList.find((item) => item.stageId == stage); + let result = stageList.find((item) => item.templateStageId == stage); console.log("又找到了", result); getTableData(result.taskList); } else { @@ -1540,7 +1533,7 @@ console.log("任务列表", arr); getTableData(arr); // state.isActive = true; - changebgc(res.data.data.stageList[0].stageId); + changebgc(res.data.data.stageList[0].templateStageId); } // 每次都获取了第一条taskList @@ -1560,13 +1553,13 @@ }); } //给阶段id赋初始值 - let stageid = localStorage.getItem("stageId") - ? localStorage.getItem("stageId") + let stageid = localStorage.getItem("templateStageId") + ? localStorage.getItem("templateStageId") : null; if (stageid !== "null") { state.chooseStageId = stageid; } else { - state.chooseStageId = leng > 0 ? stagearr[0].stageId : null; + state.chooseStageId = leng > 0 ? stagearr[0].templateStageId : null; } } }) @@ -1589,12 +1582,11 @@ //删除任务 const deleteTask = () => { - let obj = { projectTaskIds: state.deleteID }; api - .deleteTask(obj) + .deleteTask(state.deleteID) .then((res) => { console.log(res, "gggggggggggggggg"); - // deleteVoteText(); + getTask() }) .catch((err) => { console.log(err); @@ -1624,10 +1616,10 @@ } else { { let obj = { - stageId: state.removeStageId, - projectTaskId: state.selectRow, + templateStageId: state.removeStageId, + projectTemplateTaskId: state.selectRow, }; - apimove + api .moveTask(obj) .then((res) => { console.log("移动成功", res); @@ -1635,7 +1627,7 @@ message.success("移动成功"); console.log(state.removeStageId); getTask(); - localStorage.setItem("stageId", state.chooseStageId); + localStorage.setItem("templateStageId", state.chooseStageId); }) .catch((err) => { console.log("移动失败", err); @@ -1648,12 +1640,10 @@ const deleteTaskAll = () => { let arr = state.selectRow; console.log("选择的行信息", arr); - arr.map((value) => { - let obj = { - projectTaskIds: value, - }; + arr.map(() => { + api - .deleteTask(obj) + .deleteTask(arr) .then((res) => { console.log(res); message.destroy(); @@ -1716,11 +1706,11 @@ if (state.updateStageID) { let obj = { name: state.valuesname, - projectId: state.projectId, + projectTemplateId: 1, remark: state.valuesnotice, - stageId: state.updateStageID, + stageId:state.updateStageID, }; - apistage + api .editStage(obj) .then((res) => { console.log("修改阶段成功", res); @@ -1738,10 +1728,11 @@ } else { let obj = { name: state.valuesname, - projectId: state.projectId, + projectTemplateId: 1, remark: state.valuesnotice, + stageId:0, }; - apistage + api .editStage(obj) .then((res) => { console.log("添加阶段成功", res); @@ -1771,11 +1762,8 @@ //删除阶段 const deleteStage = () => { console.log("chapterId", state.deleteStageId); - let obj = { - stageId: state.deleteStageId, - }; - apistage - .deleteStage(obj) + api + .deleteStage(state.deleteStageId) .then((res) => { console.log("删除阶段成功", res); message.success("删除阶段成功"); @@ -1793,10 +1781,6 @@ getTask(); }); onUpdated(() => { - // getTask(); - // setTimeout(() => { - // getTask(); - // }, 500); }); onUnmounted(() => { document.getElementsByTagName("main")[0].style.background = "#ffffff"; @@ -1960,7 +1944,7 @@ name: ele.creater, projectId: ele.projectId, projectTaskId: ele.id, - stageId: ele.stageId, + templateStageId: ele.templateStageId, type: ele.type, }; api diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index 05959e27..a763b47d 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -620,8 +620,8 @@ export default { // }; const errorMsgs = { - name: "请输入项目名称", - category: "请选择项目分类", + name: "请输入模板名称", + category: "请选择模板分类", picUrl: "请上传项目封面图", beginTime: "请选择项目开始时间", endTime: "请选择项目结束时间", @@ -636,6 +636,38 @@ export default { const createProject = () => { console.log("我要编辑项目", isEdit.value); let obj = { + "name": state.projectInfo.name, + "category": state.projectInfo.category, + "picUrl": "x", + "beginTime": state.projectInfo.rangevalue || 1, + "endTime": state.projectInfo.rangevalue || 1, + "manager": state.projectInfo.manager, + "managerId": state.projectInfo.managerId || 0, + "sourceBelongId": state.projectInfo.sourceBelongId, + "level": state.projectInfo.level, + "systemId": state.projectInfo.systemId, + "boeFlag": state.projectInfo.boeFlag, + "courseSyncFlag": state.projectInfo.courseSyncFlag, + "notice": "", + "noticeFlag": 0, + "projectTemplateId": 0, + "remark": "", + "status": 0, + + }; + + console.log(obj); + + for (let i in errorMsgs) { + console.log(obj[i]); + if (obj[i] === "" || obj[i] === undefined) { + message.destroy(); + message.warning(errorMsgs[i]); + return; + } + } + api + .templateEdit({ "beginTime": 0, "boeFlag": 0, "category": 0, @@ -653,20 +685,7 @@ export default { "sourceBelongId": 0, "status": 0, "systemId": 0 - }; - - console.log(obj); - - for (let i in errorMsgs) { - console.log(obj[i]); - if (obj[i] === "" || obj[i] === undefined) { - message.destroy(); - message.warning(errorMsgs[i]); - return; - } - } - api - .templateEdit(obj) + }) .then((res) => { console.log(res); if (res.status == 200 && res.data.code == 200) { @@ -674,7 +693,7 @@ export default { message.success("编辑成功"); setTimeout(() => { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); }, 1000); } else {