状态按钮判断

src/views/faceteach/FaceTeach.vue

@@ -78,11 +78,7 @@
 								<div v-for="(el, index) in formateArr(data.planDto?.attach)" :key="index" class="enclosure"
 									:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
 									<div class="enclosureL">
-										<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{
+										<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
-	width: '22px',
-	height: '26px',
-	marginLeft: '10px',
-}"></FileTypeImg>
 										<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
 									</div>
 									<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
@@ -123,7 +119,7 @@
 								此课程无作业
 							</div>
 						</el-tab-pane>
-						<el-tab-pane label="课程考试" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
+						<el-tab-pane label="课程考试" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto?.beginTime))>
 
 							<div class="work" v-if="data.examinationDto?.examinationTestName">
 								<div>
@@ -229,29 +225,29 @@ let timer = null;
 //判断能否签到
 function isSignClick() {
 	timer = setInterval(() => {
-		let beginTime = new Date(data.value.planDto.beginTime).getTime();
+		let beginTime = new Date(data.value.planDto?.beginTime).getTime();
-		let endTime = !data.value.planDto.afterStart
+		let endTime = !data.value.planDto?.afterStart
-			? new Date(data.value.planDto.endTime).getTime()
+			? new Date(data.value.planDto?.endTime).getTime()
-			: new Date(data.value.planDto.beginTime).getTime();
+			: new Date(data.value.planDto?.beginTime).getTime();
 		let nowTime = new Date().getTime();
-		if (data.value.planDto.beforeStart && data.value.planDto.afterStart) {
+		if (data.value.planDto?.beforeStart && data.value.planDto?.afterStart) {
 			//有开始前有开始后
-			beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
+			beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
-			endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
+			endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
 			console.log("1111");
 		} else if (
-			data.value.planDto.beforeStart &&
+			data.value.planDto?.beforeStart &&
-			!data.value.planDto.afterStart
+			!data.value.planDto?.afterStart
 		) {
 			//只有开始前无开始后
-			beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
+			beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
 			console.log("11112222");
 		} else if (
-			!data.value.planDto.beforeStart &&
+			!data.value.planDto?.beforeStart &&
-			data.value.planDto.afterStart
+			data.value.planDto?.afterStart
 		) {
 			//无开始前有开始后
-			endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
+			endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
 			console.log("1111333");
 		}
 		if (nowTime < endTime && nowTime > beginTime) {

src/views/project/ProjectDetails.vue

@@ -377,6 +377,16 @@ const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行
 
 function toFinish(d, sName, chapterOrStageId) {
 	console.log("dddddd", d, sName, chapterOrStageId);
+	if (d.type == 2) {
+		let date1 = new Date(d.endTime).getTime();
+		let date2 = new Date().getTime();
+		if (date1 < date2) {
+			dialogVisibleTip.value = '当前面授课已结束';
+			dialogVisible.value = true;
+
+			//return
+		}
+	}
 	// 作业过期判断
 	if (d.type == 4) {
 		let date1 = new Date(d.endTime).getTime();
@@ -385,7 +395,7 @@ function toFinish(d, sName, chapterOrStageId) {
 			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
 
-			return
+			//return
 		}
 	}
 	// 直播结束时间
@@ -395,7 +405,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前直播已结束';
 			dialogVisible.value = true;
-			return
+			//return
 		}
 	}
 	// 考试 停用
@@ -423,7 +433,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前活动已结束';
 			dialogVisible.value = true;
-			return
+			//return
 		}
 	}
 	// 在线课 停用 -- 暂时没有在线课停用标记

src/views/project/ProjectManage.vue

@@ -31,7 +31,7 @@
 					<el-input v-model="projectname" placeholder="请输入项目名称" />
 				</div>
 				<div style="width: 420px">
-					<el-date-picker v-model="searchTime" type="daterange" range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间" :size="size" @change="selectTime"/>
+					<el-date-picker v-model="searchTime" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" :size="size" @change="selectTime"/>
 					
 				</div>
 

src/views/roadmap/PathDetails.vue

@@ -366,6 +366,16 @@ function toFinish(d) {
 		ElMessage.error("暂时未开放");
 		return;
 	}
+	if (d.type == 2) {
+		let date1 = new Date(d.endTime).getTime();
+		let date2 = new Date().getTime();
+		if (date1 < date2) {
+			dialogVisibleTip.value = '当前面授课已结束';
+			dialogVisible.value = true;
+
+			//return
+		}
+	}
 	if (d.type == 4) {
 		let date1 = new Date(d.endTime).getTime();
 		let date2 = new Date().getTime();
@@ -373,7 +383,7 @@ function toFinish(d) {
 			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
 
-			return
+			//return
 		}
 	}
 	// 直播结束时间
@@ -383,7 +393,7 @@ function toFinish(d) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前直播已结束';
 			dialogVisible.value = true;
-			return
+			//return
 		}
 	}
 	// 考试 停用
@@ -411,7 +421,7 @@ function toFinish(d) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前活动已结束';
 			dialogVisible.value = true;
-			return
+			//return
 		}
 	}
 	// 在线课 停用 -- 暂时没有在线课停用标记