diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 8af1e4ed..32fcc26b 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -410,22 +410,22 @@ export default { debugger console.log("计算签到时间", props.datasource); let beginTime = new Date(props.datasource.startTime).getTime(); - let endTime = !props.datasource.info.afterSignIn + let endTime = !props.datasource.afterStart ? new Date(props.datasource.endTime).getTime() : new Date(props.datasource.startTime).getTime(); - if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) { + if (props.datasource.beforeStart && props.datasource.afterStart) { //有开始前有开始后 - beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000; - endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000; + beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; + endTime = endTime + props.datasource.afterStart * 60 * 1000; console.log("1111", beginTime, endTime); - } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) { + } else if (props.datasource.beforeStart && !props.datasource.afterStart) { //只有开始前无开始后 - beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000; + beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; console.log("11112222", beginTime); - } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) { + } else if (!props.datasource.beforeStart && props.datasource.afterStart) { //无开始前有开始后 - endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000; + endTime = endTime + props.datasource.afterStart * 60 * 1000; console.log("1111333", endTime); } @@ -585,7 +585,7 @@ export default { courseId: Number(props.datasource.courseId), routerId: Number(props.datasource.routerId), ids: state.selectedStudents, - taskId: Number(props.datasource.routerTaskId), + taskId: Number(props.datasource.id), taskType: Number(props.datasource.type), type: 1, }; @@ -739,6 +739,7 @@ export default {
{ + debugger console.log("点击签到", value); // 获取当前时间 {/* showsingleqdModal(); */} @@ -748,7 +749,7 @@ export default { courseId: Number(props.datasource.courseId), routerId: Number(props.datasource.routerId), ids: [value.record.studentId], - taskId: Number(props.datasource.routerTaskId), + taskId: Number(props.datasource.id), taskType: Number(props.datasource.type), type: 1, }; @@ -921,7 +922,7 @@ export default { process.env.VUE_APP_BASE_API }/admin/student/exportTaskStudent?currentStageId=${ props.datasource.stageId - }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}` + }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}` ); } diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 3a8ba62c..92e2c36a 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -449,13 +449,20 @@ const disabledRangeTime = () => ({ }); async function confirm() { + debugger + console.log("确定按钮:") await validate().catch(({errorFields}) => { message.warning(errorFields[0].errors.join()); throw Error("数据校验不通过") }); if (taskIndex.value === -1) { - const list = props.taskList - list.push({name: formData.value.liveName, type: props.type, info: formData.value}) + let list = props.taskList + list.push( + {name: formData.value.liveName, + type: props.type, + info: {...formData.value} + }) + console.log("list:" + list) } else { const data = props.taskList[taskIndex.value] data.name = formData.value.liveName @@ -501,9 +508,9 @@ const beforeUpload = (file) => { console.log(res.data.data,45); imageUrl.value = process.env.VUE_APP_FILE_PATH +res.data.data formData.value.liveCover =process.env.VUE_APP_FILE_PATH + res.data.data - - + + // state.hasImgName = file.name; // emit("src", { id: '', src: res.data.data }); } @@ -780,4 +787,4 @@ const beforeUpload = (file) => { } } } - \ No newline at end of file + diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 111314f2..c2c6f10e 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -619,6 +619,7 @@ const closeChangeModal = () => { //暂存 const temporaryStorage = async () => { + debugger templateLoading.value = true await request(ROUTER_DETAIL_MODIFY, routerInfo.value) await getDetail() @@ -2225,4 +2226,4 @@ const cancelStorage = async () => { } } } - \ No newline at end of file + diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index c0418885..db468442 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -720,6 +720,7 @@ const closeDeAll = () => { //暂存 const temporaryStorage = async () => { + debugger templateLoading.value = true await request(PROJECT_DETAIL_MODIFY, projectInfo.value) await getTask() @@ -728,6 +729,7 @@ const temporaryStorage = async () => { }; //确定 const submitStorage = async () => { + debugger confirmLoading.value = true projectInfo.value.projectInfo.status === 3 ? await request(PROJECT_RELEASE, {projectId: route.query.projectId}) : await request(PROJECT_DETAIL_MODIFY, projectInfo.value) message.success("阶段和任务数据已保存")