@@ -205,7 +214,7 @@ import { useRouter } from "vue-router";
import { useUserInfo } from "@/api/utils";
import { ElMessage } from "element-plus";
import dayjs from "dayjs";
-
+import { changeTime } from "@/api/method";
const {
query: {
courseId: liveId,
@@ -215,6 +224,7 @@ const {
sName,
projectStatus,
projectEndTime,
+ targetId,
},
} = useRoute();
const router = useRouter();
@@ -261,30 +271,41 @@ 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;
+ if (
+ data &&
+ data.value &&
+ data.value.liveStartTime &&
+ data.value.liveEndTime
+ ) {
+ let newStartTime = data.value.liveStartTime.replaceAll("-", "/");
+ let newEndTime = data.value.liveEndTime.replaceAll("-", "/");
+ let beginTime = new Date(newStartTime).getTime();
+ let endTime = !data.value.afterSignIn
+ ? new Date(newEndTime).getTime()
+ : new Date(newStartTime).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");
+ }
+ console.log("nowTime", nowTime, endTime);
+ if (nowTime < endTime && nowTime > beginTime) {
+ state.isAllowSign = true;
+ } else {
+ state.isAllowSign = false;
+ }
}
+
// console.log(
// "isAllowSign",
// state.isAllowSign,
@@ -301,7 +322,8 @@ watch(data, () => {
});
const commitClick = () => {
if (data.value.liveStartTime) {
- let date1 = new Date(data.value.liveStartTime).getTime();
+ let newStartTime = data.value.liveStartTime.replaceAll("-", "/");
+ let date1 = new Date(newStartTime).getTime();
let date2 = new Date().getTime();
if (date1 > date2) {
ElMessage.warning("未到时间，请耐心等待！");
@@ -323,13 +345,14 @@ const commitClick = () => {
pName: "直播",
sName: data.value.liveName,
type: 4,
+ targetId: targetId,
});
router.push({
path: "/investigatpage",
query: {
courseId: data.value.assessmentId,
- infoId: data.value.liveId,
+ infoId: liveId,
chapterOrStageId: 0,
pName: "直播",
sName: data.value.liveName,
@@ -340,7 +363,8 @@ const commitClick = () => {
function showClick() {
if (data.value.liveStartTime) {
- let date1 = new Date(data.value.liveStartTime).getTime();
+ let newStartTime = data.value.liveStartTime.replaceAll("-", "/");
+ let date1 = new Date(newStartTime).getTime();
let date2 = new Date().getTime();
if (date1 > date2) {
ElMessage.warning("未到开始时间，请耐心等待！");
diff --git a/src/views/pathmap/PathmapPage.vue b/src/views/pathmap/PathmapPage.vue
index ab31787..ab7bf0f 100644
--- a/src/views/pathmap/PathmapPage.vue
+++ b/src/views/pathmap/PathmapPage.vue
@@ -182,6 +182,7 @@ import store from "@/store";
import { ROUTER, TASK_TYPES } from "@/api/CONST";
import ReturnHead from "@/components/ReturnHead.vue";
import { useStore } from "vuex";
+import { changeTime } from "@/api/method";
const {
query: { routerId, routerName, chapterId, isStudy },
} = useRoute();
@@ -275,10 +276,10 @@ const types = ref({
// 判断当前任务已结束及时间意义上的结束 提示用户
function judgeTaskIsEnd(type, endTimes, status) {
// type 任务类型 endTime 结束时间 status 任务状态 (状态 0 未完成 1 已完成 2 未开始 -1 已结束)
- console.log(type, endTimes, status);
+ console.log("judgeTaskIsEnd", type, endTimes, status);
let isEnd = false;
let nowTime = new Date().getTime();
- let endTime = new Date().getTime(endTimes);
+ let endTime = new Date().getTime(changeTime(endTimes));
switch (type) {
case 1:
status == -1
@@ -344,7 +345,7 @@ function toFinish(d) {
ElMessage.warning("该任务无法学习，请联系管理员进行替换！");
return;
}
- let date1 = new Date(d.endTime).getTime();
+ let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前面授课已结束");
@@ -357,7 +358,7 @@ function toFinish(d) {
}
if (d.type == 4) {
- let date1 = new Date(d.endTime).getTime();
+ let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前作业已结束");
@@ -398,7 +399,7 @@ function toFinish(d) {
}
// 直播结束时间
if (d.type == 6) {
- let date1 = new Date(d.endTime).getTime();
+ let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前直播已结束");
@@ -407,7 +408,7 @@ function toFinish(d) {
}
// 其他活动 结束时间
if (d.type == 9) {
- let date1 = new Date(d.endTime).getTime();
+ let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前活动已结束");
diff --git a/src/views/projectdetails/projectDetails.vue b/src/views/projectdetails/projectDetails.vue
index 1b4ca3e..be1c598 100644
--- a/src/views/projectdetails/projectDetails.vue
+++ b/src/views/projectdetails/projectDetails.vue
@@ -221,6 +221,7 @@ import ReturnHead from "@/components/ReturnHead.vue";
import { PROJECT, TASK_TYPES } from "@/api/CONST";
import dayjs from "dayjs";
import { useStore } from "vuex";
+import { changeTime } from "@/api/method";
const {
query: { courseId, projectId, type },
} = useRoute();
@@ -368,10 +369,11 @@ const dialogVisibleTip = ref("该任务无法学习，请联系管理员进行
// 判断当前任务已结束及时间意义上的结束 提示用户
function judgeTaskIsEnd(type, endTimes, status) {
// type 任务类型 endTime 结束时间 status 任务状态 (状态 0 未完成 1 已完成 2 未开始 3 已结束)
- console.log(type, endTimes, status);
+ console.log("judgeTaskIsEnd", type, endTimes, status);
let isEnd = false;
let nowTime = new Date().getTime();
- let endTime = new Date().getTime(endTimes);
+ let endTime = new Date().getTime(changeTime(endTimes));
+ console.log("endTime---------", endTime);
switch (type) {
case 1:
status == -1
@@ -424,7 +426,7 @@ function toFinish(d, sName, chapterOrStageId) {
return;
}
if (d.type == 2) {
- let date1 = new Date(d.endTime).getTime();
+ let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前面授课已结束");
@@ -434,7 +436,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 作业过期判断
if (d.type == 4) {
- let date1 = new Date(d.endTime).getTime();
+ let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前作业已结束");
@@ -443,7 +445,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 直播结束时间
if (d.type == 6) {
- let date1 = new Date(d.endTime).getTime();
+ let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前直播已结束");
@@ -492,7 +494,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 其他活动 结束时间
if (d.type == 9) {
- let date1 = new Date(d.endTime).getTime();
+ let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前活动已结束");
diff --git a/vite.config.js b/vite.config.js
index 7e315c8..377b14d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-13 11:42:48
* @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-03-09 22:52:56
+ * @LastEditTime: 2023-03-10 11:42:51
* @FilePath: /stu_h5/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -164,6 +164,10 @@ export default defineConfig(({ command, mode }) =>
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
+ '/voteSubmit': {
+ target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+ changeOrigin: true,
+ },
}