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 85615138..53dfd95b 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -4,19 +4,21 @@
-
{{ taskIndex >= 0 ? "编辑" : "添加" }}直播
+
+ {{ taskIndex >= 0 ? "编辑" : "添加" }}直播 +
@@ -25,18 +27,18 @@
直播名称:
@@ -44,18 +46,18 @@
直播链接:
@@ -64,23 +66,23 @@
直播时间:
@@ -88,19 +90,19 @@
直播时长:
分钟
@@ -109,16 +111,16 @@
授课老师:
@@ -126,60 +128,60 @@
直播封面:
- - avatar -
-
-
-
-
-
-
-
-
- 支持图片格式为jpg/jpeg/png 图片最大为2MB + + avatar +
+
+
+
+
+
+
+ 支持图片格式为jpg/jpeg/png 图片最大为2MB +
+
直播公告:
@@ -189,8 +191,9 @@ 回放设置:
-
@@ -201,10 +204,10 @@
@@ -216,12 +219,12 @@
@@ -240,37 +243,37 @@
直播开始前: 分钟允许签到分钟允许签到
直播开始后: 分钟允许签到分钟允许签到
@@ -281,22 +284,26 @@ 评估:
- 需要评估 + 需要评估
- +
- {{ formData.assessmentName }} + {{ + formData.assessmentName + }}
@@ -317,43 +324,43 @@