From 7aaa6eed08e0c579c9f15df679a68b380284e5f3 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 25 Dec 2022 14:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=88=B0=E7=82=B9=E7=9A=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8F=90=E7=A4=BA=E6=9C=AA=E5=88=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectDetails.vue |  9 ++--
 src/views/project/ProjectManage.vue  |  6 +--
 src/views/roadmap/PathDetails.vue    | 66 ++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 8b5f3bd..19abed3 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -286,9 +286,7 @@ const {
 	query: { courseId, projectId },
 } = useRoute();
 const router = useRouter();
-const returnclick = () => {
-	router.back();
-};
+
 const { data } = useRequest(PROJECT_PROCESS, {
 	projectId: projectId || courseId,
 });
@@ -387,7 +385,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
-			// ElMessage.error("当前作业已结束")
+		
 			return
 		}
 	}
@@ -490,6 +488,9 @@ function whiteTypes(type) {
 </script>
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss">
+.example-showcase .el-loading-mask {
+  z-index: 9;
+}
 .pathdetails {
 	.el-dialog__header {
 		display: none;
diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue
index 822c249..1497412 100644
--- a/src/views/project/ProjectManage.vue
+++ b/src/views/project/ProjectManage.vue
@@ -31,8 +31,8 @@
 					<el-input v-model="projectname" placeholder="请输入项目名称" />
 				</div>
 				<div style="width: 420px">
-					<el-date-picker v-model="searchTime" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间"
-						@change="selectTime" />
+					<el-date-picker v-model="searchTime" type="daterange" range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间" :size="size" @change="selectTime"/>
+					
 				</div>
 
 				<button class="searchBtn" @click="searchClick" style="margin-left: 20px">
@@ -41,7 +41,7 @@
 				<button class="searchBtn" @click="resetClick">重置</button>
 			</div>
 			<div class="projectList" v-if="!projectList.length" style="display:flex;color:#909399;">
-				<img class="img2" style="margin-left: 675px;margin-top: 165px;width:148px;height:220px;"
+				<img class="img2" style="margin-left:359px;margin-top:100px;width:148px;height:220px;"
 					src="../../assets/image/notask.png" />
 			</div>
 			<div v-else class="projectList" v-for="(i, k) in projectList" :key="k">
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 9bbe42a..839e4a8 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -393,6 +393,72 @@ function toFinish(d) {
 		ElMessage.error("暂时未开放");
 		return;
 	}
+	if (d.type == 4) {
+		let date1 = new Date(d.endTime).getTime();
+		let date2 = new Date().getTime();
+		if (date1 < date2) {
+			dialogVisibleTip.value = '当前作业已结束';
+			dialogVisible.value = true;
+		
+			return
+		}
+	}
+	// 直播结束时间
+	if (d.type == 6) {
+		let date1 = new Date(d.endTime).getTime();
+		let date2 = new Date().getTime();
+		if (date1 < date2) {
+			dialogVisibleTip.value = '当前直播已结束';
+			dialogVisible.value = true;
+			return
+		}
+	}
+	// 考试 停用
+	if (d.type == 5) {
+		if (d.taskStatus == 1 || d.taskStatus == 2) {
+			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
+			dialogVisible.value = true;
+			return
+		}
+	}
+	// 评估 停用
+	if (d.type == 11) {
+		if (d.taskStatus == 1 || d.taskStatus == 2) {
+			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
+			dialogVisible.value = true;
+			return
+		}
+	}
+	// 其他活动 结束时间
+	if (d.type == 9) {
+		let date1 = new Date(d.endTime).getTime();
+		let date2 = new Date().getTime();
+		if (date1 < date2) {
+			dialogVisibleTip.value = '当前活动已结束';
+			dialogVisible.value = true;
+			return
+		}
+	}
+	// 在线课 停用 -- 暂时没有在线课停用标记
+	if (d.type == 1) {
+		if (d.taskStatus == 1 || d.taskStatus == 2) {
+			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
+			dialogVisible.value = true;
+			return
+		}
+	}
+	// 面授课 停用
+	if (d.type == 2) {
+		if (d.taskStatus == 1 || d.taskStatus == 2) {
+			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
+			dialogVisible.value = true;
+			return
+		}
+	}
 	if (d.type === 3 || d.type === 7) {
 		request(STUDY_RECORD, {
 			studentId: userInfo.value.id,