diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index caa01c8e..b40ab272 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -243,7 +243,6 @@ export default { }, setup(props, ctx) { - debugger const state = reactive({ Evisible: false, //录入成绩抽屉 name: null, @@ -394,10 +393,11 @@ export default { }; const getTableData = () => { + debugger // debugger - console.log('当前是项目还是路径图 1 路径图 2 项目', props) - console.log('当前是项目还是路径图 1 路径图 2 项目', props.types) - if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) { + console.log('当前是项目还是路径图 1 项目 2 路径图', props) + console.log('当前是项目还是路径图 1 项目 2 路径图', props.types) + if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 console.log("我是传递的查询参数", { pageNo: state.currentPage, @@ -442,14 +442,14 @@ export default { state.tableDataTotalLoading = false; state.tableData = []; }); - } else if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) { + } else if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 console.log("我是传递的查询参数", { pageNo: state.currentPage, pageSize: state.pageSize, currentStageId: props.datasource.stageId, type: 1, - pid: props.datasource.projectId, + pid: props.datasource.id, taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, @@ -718,7 +718,7 @@ export default { // 1是项目 2路径图 3开课 console.log(obj1, obj2) state.tableDataTotalLoading = true; - api.AttendanceSign(props.types === 1 ? obj1 : obj2).then(res => { + api.AttendanceSign(props.types === '1' ? obj1 : obj2).then(res => { console.log('res----签到是否成功', res) message.destroy() message.info('签到成功') diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 8155c1b3..52f00722 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -64,7 +64,7 @@ style="margin-right: 10px" src="../../assets/images/courseManage/add0.png" /> - 添加组员 + 添加组员1