From 8c05c89bd0c89c1a921545d119f3463531d01ac0 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Wed, 30 Nov 2022 23:12:54 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9B=B4=E6=92=ADbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddCase.vue | 4 +-- src/components/drawers/AddFaceteach.vue | 2 +- src/components/drawers/AddHomework.vue | 2 +- src/components/vote/AddVote.vue | 2 +- src/views/projectcenter/ClassAdd.vue | 2 +- src/views/projectcenter/TaskAdd.vue | 40 +++++++++++++++---------- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index c050de77..f6f3b511 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -281,7 +281,7 @@ export default { .addTask({ courseId: state.apiTaskList[i].casesId, name: state.apiTaskList[i].title, - projectTemplateId: props.projectTemplateId, + projectId: props.projectId, projectTaskId: props.projectTaskId, stageId: Number(props.chooseStageId), type: 3, @@ -305,7 +305,7 @@ export default { duration: 0, flag: true, name: state.apiTaskList[i].caseName, - projectId: props.projectId, + projectTaskId: props.projectTaskId, projectTemplateId: props.projectTemplateId, stageId: props.chooseStageId || 0, type: 3, diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 6ba63ad6..9ceaf882 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -608,7 +608,7 @@ export default { editPlan(obj) .then((res) => { message.destroy(); - message.error(`添加成功`); + message.sucsess(`添加成功`); updateTask(res); ctx.emit("changeData", false); closeDrawer(); diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index f1411773..fcd6d625 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -364,7 +364,7 @@ export default { let editObj = { courseId: res.data.data.workId, name: res.data.data.workName, - projectId: props.EditWorkId > 0 ? props.projectId : 0, + projectId: props.projectId , projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0 , type: 4, diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 8785f24a..5aa04497 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -386,7 +386,7 @@ export default { } let obj = { - voteId: props.edit?state.EditVoteId : 0, + voteId: props.edit?props.EditVoteId : 0, voteName: state.inputV1, voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue index 36ff6937..b15c9424 100644 --- a/src/views/projectcenter/ClassAdd.vue +++ b/src/views/projectcenter/ClassAdd.vue @@ -13,7 +13,7 @@
-
+
s
item.stageId == stage); console.log("又找到了", result); if(result!=null){ getTableData(result.taskList); + }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); + } } - } else { - //没有选中的阶段时，获取全部的任务 + } else{ 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); - } - + 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); @@ -1628,6 +1637,7 @@ export default { console.log("删除阶段成功", res); message.success("删除阶段成功"); closeDeleteStage(); + localStorage.setItem("stageId", "") getTask(); }) .catch((err) => { From d110b8f0ed4cebe24d30e72e9fc6b6ec6168cc3a Mon Sep 17 00:00:00 2001 From: wuyx Date: Wed, 30 Nov 2022 23:33:24 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexVote.js | 20 +-- src/components/vote/CreateVote.vue | 263 +++++++++++++---------------- 2 files changed, 126 insertions(+), 157 deletions(-) diff --git a/src/api/indexVote.js b/src/api/indexVote.js index 5bc1b809..9cacddc1 100644 --- a/src/api/indexVote.js +++ b/src/api/indexVote.js @@ -42,10 +42,10 @@ import qs from 'qs'; // 接口-请求 //基础票数上传接口 -export const baseVoteupload = (obj) => http.post('/vote/baseVoteupload', obj,{ +export const baseVoteupload = (obj) => http.post('/vote/baseVoteupload', obj, { headers: { 'token': '123', - 'Content-Type' : 'multipart/form-data', + 'Content-Type': 'multipart/form-data', } }) @@ -60,7 +60,7 @@ export const createVote = (obj) => http.post('/vote/createVote', obj) export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj }) //删除题干信息接口 -export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', obj,{ +export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', obj, { headers: { 'token': '123', 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', @@ -74,12 +74,7 @@ export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOpti export const editVote = (obj) => http.post('/vote/editVote', obj) //根据题干ID获取题干信息 -export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', obj,{ - headers: { - 'token': '123', - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', - } - }) +export const queryStemByStemId = (ballotId) => http.post(`/vote/queryStemByStemId?ballotId=${ballotId}`) //修改题干信息接口 export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj); @@ -87,12 +82,7 @@ export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', o //上传组件 export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj })); //根据题干ID获取投票任务 -export const queryVoteDetailById = (obj) => http.post('/vote/queryVoteDetailById', obj,{ - headers: { - 'token': '123', - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', - } -}) +export const queryVoteDetailById = (obj) => http.post('/vote/queryVoteDetailById', obj) // 测试方法 // import * as api from '../../api/index' diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue index d1c85439..8d4f23d2 100644 --- a/src/components/vote/CreateVote.vue +++ b/src/components/vote/CreateVote.vue @@ -1,20 +1,12 @@