feat:修改bug

2025-12-20 16:26:47 +08:00 · 2023-03-10 01:37:45 +08:00
parent e03440d12e
commit c43b4fd723
13 changed files with 232 additions and 204 deletions
--- a/src/views/activities/ActivitiesPage.vue
+++ b/src/views/activities/ActivitiesPage.vue
@@ -203,47 +203,65 @@ const signClick = (tab, event) => {
 let timer = null;
 //判断能否签到
 function isSignClick() {
-  timer = setInterval(() => {
-    let beginTime = new Date(data.value.activityStartTime).getTime();
-    let endTime = !data.value.afterSignIn
-      ? new Date(data.value.activityEndTime).getTime()
-      : new Date(data.value.activityStartTime).getTime();
-    let nowTime = new Date().getTime();
-    if (data.value.beforeSignIn && data.value.afterSignIn) {
-      //有开始前有开始后
-      beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
-      endTime = endTime + data.value.afterSignIn * 60 * 1000;
-      console.log("1111");
-    } else if (data.value.beforeSignIn && !data.value.afterSignIn) {
-      //只有开始前无开始后
-      beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
-      console.log("11112222");
-    } else if (!data.value.beforeSignIn && data.value.afterSignIn) {
-      //无开始前有开始后
-      endTime = endTime + data.value.afterSignIn * 60 * 1000;
-      console.log("1111333");
-    }
+  // timer = setInterval(() => {
+  let beginTime = new Date(data.value.activityStartTime).getTime();
+  let endTime = !data.value.afterSignIn
+    ? new Date(data.value.activityEndTime).getTime()
+    : new Date(data.value.activityStartTime).getTime();
+  let nowTime = new Date().getTime();
+  if (
+    data.value.beforeSignIn &&
+    data.value.afterSignIn &&
+    data.value.beforeSignIn !== "0" &&
+    data.value.afterSignIn !== "0"
+  ) {
+    //有开始前有开始后
+    beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
+    endTime = endTime + data.value.afterSignIn * 60 * 1000;
+    console.log("1111");
+  } else if (
+    data.value.beforeSignIn &&
+    !data.value.afterSignIn &&
+    data.value.beforeSignIn !== "0" &&
+    data.value.afterSignIn !== "0"
+  ) {
+    //只有开始前无开始后
+    beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
+    console.log("11112222");
+  } else if (
+    !data.value.beforeSignIn &&
+    data.value.afterSignIn &&
+    data.value.beforeSignIn !== "0" &&
+    data.value.afterSignIn !== "0"
+  ) {
+    //无开始前有开始后
+    endTime = endTime + data.value.afterSignIn * 60 * 1000;
+    console.log("1111333");
+  }

-    // console.log(nowTime, beginTime, endTime, data.value);
-    // console.log(nowTime < endTime, nowTime > beginTime);
-    // console.log(state.isAllowSign);
-    if (nowTime < endTime && nowTime > beginTime) {
-      state.isAllowSign = true;
-    } else {
-      state.isAllowSign = false;
-    }
-    // console.log(
-    //   "isAllowSign",
-    //   state.isAllowSign,
-    //   nowTime,
-    //   endTime,
-    //   beginTime,
-    //   nowTime < endTime,
-    //   nowTime > beginTime
-    // );
-  }, 1000);
+  // console.log(nowTime, beginTime, endTime, data.value);
+  // console.log(nowTime < endTime, nowTime > beginTime);
+  // console.log(state.isAllowSign);
+  if (nowTime < endTime && nowTime > beginTime) {
+    state.isAllowSign = true;
+  } else {
+    state.isAllowSign = false;
+  }
+  // console.log(
+  //   "isAllowSign",
+  //   state.isAllowSign,
+  //   nowTime,
+  //   endTime,
+  //   beginTime,
+  //   nowTime < endTime,
+  //   nowTime > beginTime
+  // );
+  // }, 1000);
 }
-isSignClick();
+watch(data, () => {
+  isSignClick();
+});
+// isSignClick();

 //是否显示头部公告
 const isShowClose = () => {
--- a/src/views/evaluation/Evaluation.vue
+++ b/src/views/evaluation/Evaluation.vue
@@ -116,28 +116,30 @@ let hour = ref(0);
 let minute = ref(0);
 let seconds = ref(0);
 let timer = setInterval(() => {
-  let endTime = parseInt(
-    new Date(data.value.evaluationEndTime).getTime() / 1000
-  );
-  let nowTime = parseInt(new Date().getTime() / 1000);
-  if (endTime > nowTime) {
-    hour.value = parseInt(
-      dayjs(data.value.evaluationEndTime).diff(dayjs(), "minute") / 60
+  if (data && data.value && data.value.evaluationEndTime) {
+    let endTime = parseInt(
+      new Date(data.value.evaluationEndTime).getTime() / 1000
    );
-    minute.value = parseInt(
-      dayjs(data.value.evaluationEndTime).diff(dayjs(), "minute") % 60
-    );
-    seconds.value = parseInt(
-      dayjs(data.value.evaluationEndTime).diff(dayjs(), "seconds") -
-        (hour.value * 60 + minute.value) * 60
-    );
-  } else {
-    clearInterval(timer);
+    let nowTime = parseInt(new Date().getTime() / 1000);
+    if (endTime > nowTime) {
+      hour.value = parseInt(
+        dayjs(data.value.evaluationEndTime).diff(dayjs(), "minute") / 60
+      );
+      minute.value = parseInt(
+        dayjs(data.value.evaluationEndTime).diff(dayjs(), "minute") % 60
+      );
+      seconds.value = parseInt(
+        dayjs(data.value.evaluationEndTime).diff(dayjs(), "seconds") -
+          (hour.value * 60 + minute.value) * 60
+      );
+    } else {
+      clearInterval(timer);
+    }
  }
 }, 1000);

 const goOuterChain = () => {
-  console.log("点击去查看");
+  console.log("点击去查看", quizTaskId);
  if (quizTaskId == null) {
    request(EvaluationToLearn, {
      businessType: btype == 1 ? "project" : "learningpath",
@@ -153,7 +155,7 @@ const goOuterChain = () => {
        if (res.code == 200) {
          let jumpUrl = res.data.quizUrl;
          // 此处写跳转url
-          window.open(jumpUrl, "_top");
+          // window.open(jumpUrl, "_top");
        }
      })
      .catch((err) => {
@@ -182,7 +184,7 @@ const goOuterChain = () => {
              studentName: userInfo.value.realName,
            });
            request(EvaluationToLearn, {
-              businessType: "learningpath",
+              businessType: btype == 1 ? "project" : "learningpath",
              chapterId: chapterOrStageId,
              courseId: evaluationId,
              quizKid: data.value.evaluationTypeId,
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -450,49 +450,51 @@ function formateArr(strs) {
 let timer = null;
 //判断能否签到
 function isSignClick() {
-  timer = setInterval(() => {
-    let beginTime = new Date(data.value.planDto?.beginTime).getTime();
-    let endTime = !data.value.planDto?.afterStart
-      ? 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) {
-      //有开始前有开始后
-      beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
-      endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
-      console.log("1111");
-    } else if (
-      data.value.planDto?.beforeStart &&
-      !data.value.planDto?.afterStart
-    ) {
-      //只有开始前无开始后
-      beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
-      console.log("11112222");
-    } else if (
-      !data.value.planDto?.beforeStart &&
-      data.value.planDto?.afterStart
-    ) {
-      //无开始前有开始后
-      endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
-      console.log("1111333");
-    }
-    if (nowTime < endTime && nowTime > beginTime) {
-      state.isAllowSign = true;
-    } else {
-      state.isAllowSign = false;
-    }
-    // console.log(
-    //   "isAllowSign",
-    //   state.isAllowSign,
-    //   nowTime,
-    //   endTime,
-    //   beginTime,
-    //   nowTime < endTime,
-    //   nowTime > beginTime
-    // );
-  }, 1000);
+  // timer = setInterval(() => {
+  let beginTime = new Date(data.value.planDto?.beginTime).getTime();
+  let endTime = !data.value.planDto?.afterStart
+    ? 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) {
+    //有开始前有开始后
+    beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
+    endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
+    console.log("1111");
+  } else if (
+    data.value.planDto?.beforeStart &&
+    !data.value.planDto?.afterStart
+  ) {
+    //只有开始前无开始后
+    beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
+    console.log("11112222");
+  } else if (
+    !data.value.planDto?.beforeStart &&
+    data.value.planDto?.afterStart
+  ) {
+    //无开始前有开始后
+    endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
+    console.log("1111333");
+  }
+  if (nowTime < endTime && nowTime > beginTime) {
+    state.isAllowSign = true;
+  } else {
+    state.isAllowSign = false;
+  }
+  // console.log(
+  //   "isAllowSign",
+  //   state.isAllowSign,
+  //   nowTime,
+  //   endTime,
+  //   beginTime,
+  //   nowTime < endTime,
+  //   nowTime > beginTime
+  // );
+  // }, 1000);
 }
-isSignClick();
+watch(data, () => {
+  isSignClick();
+});

 //签到
 const signClick = () => {
--- a/src/views/homeworkpage/HomeworkPage.vue
+++ b/src/views/homeworkpage/HomeworkPage.vue
@@ -61,7 +61,9 @@
                  <div class="itemtitle" :title="item.workUploadContent">
                    {{ item.workUploadContent }}
                    {{
-                      item.workUploadAddress ? "-" + item.workUploadAddress : ""
+                      item.workUploadAddress?.slice(
+                        item.workUploadAddress.lastIndexOf("/") + 1
+                      )
                    }}
                  </div>
                  <img
@@ -106,6 +108,7 @@ import FileTypeImg from "@/components/FileTypeImg.vue";
 import { useRoute } from "vue-router/dist/vue-router";
 import { ElMessage, ElLoading } from "element-plus";
 import ReturnHead from "@/components/ReturnHead.vue";
+import { toDate } from "@/api/method";
 const fileList = ref([]);
 // const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const uploadRef = ref();
@@ -174,21 +177,17 @@ const state = reactive({
 });
 const { hour, minute, seconds } = toRefs(state);

-let timer = setInterval(() => {
-  // console.log("endTime", data.value.submitEndTime);
+var timer = setInterval(function () {
  if (data && data.value && data.value.submitEndTime) {
-    let endTime = parseInt(new Date(data.value.submitEndTime).getTime() / 1000);
+    let newEndTime = data.value.submitEndTime.replaceAll("-", "/");
+    let endTime = parseInt(new Date(newEndTime).getTime() / 1000);
    let nowTime = parseInt(new Date().getTime() / 1000);
-    console.log("endTime222", endTime, nowTime);
+    console.log("endTime222", endTime, nowTime, newEndTime);
    if (endTime > nowTime) {
-      state.hour = parseInt(
-        dayjs(data.value.submitEndTime).diff(dayjs(), "minute") / 60
-      );
-      state.minute = parseInt(
-        dayjs(data.value.submitEndTime).diff(dayjs(), "minute") % 60
-      );
+      state.hour = parseInt(dayjs(newEndTime).diff(dayjs(), "minute") / 60);
+      state.minute = parseInt(dayjs(newEndTime).diff(dayjs(), "minute") % 60);
      state.seconds = parseInt(
-        dayjs(data.value.submitEndTime).diff(dayjs(), "seconds") -
+        dayjs(newEndTime).diff(dayjs(), "seconds") -
          (state.hour * 60 + state.minute) * 60
      );
    } else {
@@ -199,6 +198,7 @@ let timer = setInterval(() => {

 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
  workerId: workId,
+  type,
 });
 console.log("submitList==----->", submitList);
 //交作业
--- a/src/views/homeworkpage/UploadWork.vue
+++ b/src/views/homeworkpage/UploadWork.vue
@@ -158,7 +158,7 @@ export default {
        workUploadContent: textarea.value,
        workUploadAddress:
          fileList.value && fileList.value.length !== 0
-            ? fileList.value[0].name
+            ? fileList.value[0].url
            : "",
        workId,
        type,
--- a/src/views/liveboradcast/LiveBoradcast.vue
+++ b/src/views/liveboradcast/LiveBoradcast.vue
@@ -260,43 +260,45 @@ const signClick = () => {
 let timer = null;
 //判断能否签到
 function isSignClick() {
-  timer = setInterval(() => {
-    let beginTime = new Date(data.value.liveStartTime).getTime();
-    let endTime = !data.value.afterSignIn
-      ? new Date(data.value.liveEndTime).getTime()
-      : new Date(data.value.liveStartTime).getTime();
-    let nowTime = new Date().getTime();
-    if (data.value.beforeSignIn && data.value.afterSignIn) {
-      //有开始前有开始后
-      beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
-      endTime = endTime + data.value.afterSignIn * 60 * 1000;
-      console.log("1111");
-    } else if (data.value.beforeSignIn && !data.value.afterSignIn) {
-      //只有开始前无开始后
-      beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
-      console.log("11112222");
-    } else if (!data.value.beforeSignIn && data.value.afterSignIn) {
-      //无开始前有开始后
-      endTime = endTime + data.value.afterSignIn * 60 * 1000;
-      console.log("1111333");
-    }
-    if (nowTime < endTime && nowTime > beginTime) {
-      state.isAllowSign = true;
-    } else {
-      state.isAllowSign = false;
-    }
-    // console.log(
-    //   "isAllowSign",
-    //   state.isAllowSign,
-    //   nowTime,
-    //   endTime,
-    //   beginTime,
-    //   nowTime < endTime,
-    //   nowTime > beginTime
-    // );
-  }, 1000);
+  // timer = setInterval(() => {
+  let beginTime = new Date(data.value.liveStartTime).getTime();
+  let endTime = !data.value.afterSignIn
+    ? new Date(data.value.liveEndTime).getTime()
+    : new Date(data.value.liveStartTime).getTime();
+  let nowTime = new Date().getTime();
+  if (data.value.beforeSignIn && data.value.afterSignIn) {
+    //有开始前有开始后
+    beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
+    endTime = endTime + data.value.afterSignIn * 60 * 1000;
+    console.log("1111");
+  } else if (data.value.beforeSignIn && !data.value.afterSignIn) {
+    //只有开始前无开始后
+    beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
+    console.log("11112222");
+  } else if (!data.value.beforeSignIn && data.value.afterSignIn) {
+    //无开始前有开始后
+    endTime = endTime + data.value.afterSignIn * 60 * 1000;
+    console.log("1111333");
+  }
+  if (nowTime < endTime && nowTime > beginTime) {
+    state.isAllowSign = true;
+  } else {
+    state.isAllowSign = false;
+  }
+  // console.log(
+  //   "isAllowSign",
+  //   state.isAllowSign,
+  //   nowTime,
+  //   endTime,
+  //   beginTime,
+  //   nowTime < endTime,
+  //   nowTime > beginTime
+  // );
+  // }, 1000);
 }
-isSignClick();
+watch(data, () => {
+  isSignClick();
+});
 const commitClick = () => {
  if (data.value.liveStartTime) {
    let date1 = new Date(data.value.liveStartTime).getTime();
--- a/src/views/outerchain/OuterChain.vue
+++ b/src/views/outerchain/OuterChain.vue
@@ -95,6 +95,8 @@ const goOuterChain = () => {
    logo: type,
    stageOrChapterId: chapterOrStageId,
    taskId: taskId,
+    type: type,
+    taskType: 7,
  });

  window.open(data.value.linkAddress, "_top");
--- a/src/views/projectdetails/projectDetails.vue
+++ b/src/views/projectdetails/projectDetails.vue
@@ -526,7 +526,9 @@ function toFinish(d, sName, chapterOrStageId) {
    pid: projectId,
    name: d.name,
  });
+
  if (typeof TASK_TYPES.path[d.type] === "string") {
+    console.log("TASK_TYPES.path[d.type]", TASK_TYPES.path[d.type]);
    TASK_TYPES.path[d.type] &&
      TASK_TYPES.path[d.type].startsWith("http") &&
      window.open(TASK_TYPES.path[d.type] + d.targetId, "_top");
@@ -547,10 +549,15 @@ function toFinish(d, sName, chapterOrStageId) {
          targetId: d.targetId,
          evaType: d.evaType,
          btype: 1,
+          quizTaskId: d.quizTaskId,
        },
      });
  } else if (typeof TASK_TYPES.path[d.type] === "function") {
-    TASK_TYPES.path[d.type](d);
+    if (d.type == 5) {
+      window.open(TASK_TYPES.path[d.type](d) + d.targetId, "_top");
+    } else {
+      TASK_TYPES.path[d.type](d);
+    }
  }
  // if (typeof types.value.path[d.type] === "string") {
  //   types.value.path[d.type] &&