From 3ec0f20fac2e72a61dfbd9421e1b058fc8f49582 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 4 Mar 2023 00:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index d18679d..2a947ea 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -37,17 +37,17 @@
 			<div >
 				<div style="display: flex">
 
-					<botton class="btn" style="margin-right: 20px" :style="{
+					<el-button class="btn" style="margin-right: 20px" :style="{
 		background: isAllowSign? data.signFlag ? '#999' : 'rgb(57, 146, 249)':'#999',
 	}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
-					</botton>
+					</el-button>
 					<!-- <botton style="background: #999" class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag == 0">
 						评估
 					</botton> -->
-					<botton  v-if="data.planDto?.evalFlag !== 0"  :style="{
+					<el-button  v-if="data.planDto?.evalFlag !== 0"  :style="{
 		background: `${new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
 	}" class="btn" @click="toSurvery">{{ data.isSurvery ? "已评估" : "评估" }}
-					</botton>
+					</el-button>
 				</div>
 			</div>
 		</div>
@@ -109,11 +109,12 @@
                       <div class="tag3" style="margin-left: 11px">作业</div>
                     </div>
                   </div>
-                  <div
-                    :style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
+                  <el-button
+                    :style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() || new Date().getTime() >  new Date(data.planDto?.endTime).getTime()? '#999' : '' }"
+					:disabled=" new Date(data.planDto?.beginTime).getTime() > new Date().getTime() || new Date().getTime() > new Date(data.planDto?.endTime).getTime() "
                     class="submit" @click="toWork">
                     交作业
-                  </div>
+                  </el-button>
 							</div>
 							<div v-else style=" font-size: 14px; font-weight: 400; line-height: 24px; cursor: pointer;margin-left: 40px;margin-top: 20px; ">
 								此课程无作业
@@ -229,9 +230,10 @@ let timer = null;
 function isSignClick() {
 	timer = setInterval(() => {
 		let beginTime = new Date(data.value.planDto?.beginTime).getTime();
-		let endTime = !data.value.planDto?.afterStart || data.value.afterStart == '0'
-			? new Date(data.value.planDto?.endTime).getTime()
-			: new Date(data.value.planDto?.beginTime).getTime();
+		let endTime = new Date(data.value.planDto?.endTime).getTime();
+		// let endTime = !data.value.planDto?.afterStart || data.value.afterStart == '0'
+		// 	? new Date(data.value.planDto?.endTime).getTime()
+		// 	: new Date(data.value.planDto?.beginTime).getTime();
 		let nowTime = new Date().getTime();
 		if (data.value.planDto?.beforeStart && data.value.planDto?.afterStart  && data.value.beforeStart !=='0' && data.value.afterStart!=='0') {
 			//有开始前有开始后
@@ -273,6 +275,7 @@ isSignClick();
 
 //签到
 const signClick = () => {
+	debugger
 	if (data.value.signFlag) {
 		return;
 	}
@@ -331,12 +334,16 @@ function toSurvery() {
 
 
 function toWork() {
+	debugger
 	if (data.value.planDto.beginTime) {
 		let date1 = new Date(data.value.planDto.beginTime).getTime()
+		let end = new Date(data.value.planDto.endTime).getTime()
 		let date2 = new Date().getTime()
 		if (date1 > date2) {
 			ElMessage.warning("未到开始时间，请耐心等待！");
-
+		}
+		if (date2 > end) {
+			ElMessage.warning("已过结束时间！");
 		}
 	}
 	router.push({