diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 8318992..451f3ba 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -25,8 +25,8 @@
{{ dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " +
- dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM')
- }}
+ dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM')
+}}
@@ -35,17 +35,17 @@
-
- {{ data.signFlag ? "已签到" : "签到" }}
+
+ {{ data.signFlag ? "已签到" : "签到" }}
评估
{{ data.isSurvery ? "已评估" : "评估" }}
+ background: `${new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+}" class="btn" @click="toSurvery" v-else>{{ data.isSurvery ? "已评估" : "评估" }}
@@ -79,10 +79,10 @@
:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
+ width: '22px',
+ height: '26px',
+ marginLeft: '10px',
+}">
{{ el.slice(el.indexOf('-') + 1) }}
@@ -111,10 +111,10 @@
-
+
+ class="submit" @click="toWork">
交作业
@@ -137,8 +137,8 @@
考试
-
-
去考试
@@ -349,8 +349,7 @@ function toWork() {
query: {
courseId: data.value.workDto.workId,
id: taskId,
- taskId: taskId,
- taskIds: taskId,
+ infoId: taskId,
chapterOrStageId: 0,
type,
pName: "面授课",
@@ -365,7 +364,7 @@ function toExamItem(obj) {
let date2 = new Date().getTime()
if (date1 > date2) {
ElMessage.warning("未到开始时间,请耐心等待!");
-
+
}
}
console.log("obj", obj.examinationTestId);
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index ef926b6..eae6107 100644
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -47,21 +47,23 @@
观看
+ background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`,
+}" @click="showClick">观看
-
- {{ data.signFlag ? "已签到" : "签到" }}
+
+ {{ data.signFlag ? "已签到" : "签到" }}
-
+
评估
{{ data.isSurvery ? "已评估": "评估"}}
+ background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{ data.isSurvery ? "已评估" :
+ "评估"
+}}
@@ -138,7 +140,7 @@