From f8068bb7127c551a9123f7daf1ae36bcf5b0b9cf Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 11 Jan 2023 20:33:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectFaceStu.vue |  2 +-
 src/components/drawers/router/RouterFaceStu.vue   | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index b0237b49..59b3d38b 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -904,7 +904,7 @@ export default {
       let beginTime = new Date(props.datasource.startTime).getTime();
       let endTime = !props.datasource.afterStart
         ? new Date(props.datasource.endTime).getTime()
-        : new Date(props.datasource.beginTime).getTime();
+        : new Date(props.datasource.startTime).getTime();
       if (props.datasource.beforeStart && props.datasource.afterStart) {
         //有开始前有开始后
         beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index bbed809e..3f5e7efd 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -870,24 +870,25 @@ export default {
 
     // 计算签到时间
     const isSignClick = () => {
-      console.log("计算签到时间");
+      console.log("计算签到时间", props.datasource);
       let beginTime = new Date(props.datasource.startTime).getTime();
       let endTime = !props.datasource.afterStart
         ? new Date(props.datasource.endTime).getTime()
-        : new Date(props.datasource.beginTime).getTime();
+        : new Date(props.datasource.startTime).getTime();
+
       if (props.datasource.beforeStart && props.datasource.afterStart) {
         //有开始前有开始后
         beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
         endTime = endTime + props.datasource.afterStart * 60 * 1000;
-        console.log("1111");
+        console.log("1111", beginTime, endTime);
       } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
         //只有开始前无开始后
         beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
-        console.log("11112222");
+        console.log("11112222", beginTime);
       } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
         //无开始前有开始后
         endTime = endTime + props.datasource.afterStart * 60 * 1000;
-        console.log("1111333");
+        console.log("1111333", endTime);
       }
 
       state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");