From c2e44dc0adeda302976ce7588005553d663aa46c Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 25 Dec 2022 09:16:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=80=83=E8=AF=95=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E7=BB=93=E6=9D=9F=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 173 +++++++++++----------- src/views/homework/HomeworkPage.vue | 48 ++---- src/views/liveBroadcast/LiveBroadcast.vue | 81 +++++++--- src/views/moreActive/MoreActive.vue | 2 +- src/views/project/ProjectDetails.vue | 9 +- src/views/roadmap/PathDetails.vue | 12 +- 6 files changed, 183 insertions(+), 142 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index a6895f3..c413b19 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -23,10 +23,10 @@
- {{ data.planDto?.beginTime + "至" + data.planDto?.endTime }} + {{ dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " + dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM') }}
-
+
{{ data.planDto?.address }}
@@ -38,14 +38,12 @@ background: data.signFlag ? '#999' : 'rgb(57, 146, 249)', }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }} - + 评估 {{ - data.isSurvery ? "已评估" : "评估" -}} + }" class="btn" @click="toSurvery" v-else>{{data.isSurvery ? "已评估" : "评估"}}
@@ -66,17 +64,11 @@ +
- + -
+
此课程无附件
@@ -106,16 +98,7 @@
-
- 此课程无作业 -
+
{{ data.workDto?.workName }}
@@ -125,27 +108,19 @@
-
- 已结束 -
+
已结束
+
未开始
+ :style="{ background: new Date(data.planDto.beginTime).getTime() > new Date().getTime() ? '#999' : '' }" class="submit" @click="toWork" v-else> 交作业
- - -
- 此课程无考试 +
+ 此课程无作业
+ + +
@@ -158,12 +133,17 @@
考试
-
已结束
+
未开始
+
去考试
+
+ 此课程无考试 +
@@ -177,7 +157,7 @@
-
+
{{ data.planDto?.teacher }}
@@ -204,6 +184,7 @@ import { import { useRoute, useRouter } from "vue-router"; import { useUserInfo } from "@/api/utils"; import { ElMessage, messageConfig } from "element-plus"; +import dayjs from "dayjs"; const router = useRouter(); const returnclick = () => { router.back(); @@ -225,13 +206,13 @@ const state = reactive({ }); const { activeName, enclosure, isAllowSign } = toRefs(state); const handleClick = (tab, event) => { - console.log(tab, event); + console.log("附件",tab, event); }; const download = (url) => { window.open(url); }; const downloads = (url) => { - ElMessage.info("未到开始时间，请耐心等待！"); + ElMessage.warning("未到开始时间，请耐心等待！"); }; let timer = null; //判断能否签到 @@ -291,22 +272,22 @@ const signClick = () => { // state.isAllowSign, // !state.isAllowSign // ); - if (data.value.planDto.beginTime) { - let date1 = new Date(data.value.planDto.beginTime).getTime() - let date2 = new Date().getTime() - if (date1 > date2) { - ElMessage.info("未到开始时间，请耐心等待！"); - return; - } - } + //if (data.value.planDto.beginTime) { + // let date1 = new Date(data.value.planDto.beginTime).getTime() + // let date2 = new Date().getTime() + // if (date1 > date2) { + // ElMessage.info("未到开始时间，请耐心等待！"); + // return; + // } + //} if (!state.isAllowSign) { // console.log("data.signFlag", data.value.signFlag, isAllowSign); - ElMessage.info("未在签到范围内"); + ElMessage.warning("未在允许签到时间范围内"); return; } - 2; + data.value.signFlag = 1; - ElMessage.info("签到成功"); + ElMessage.warning("签到成功"); if (taskId) { request(TASK_OFFCOURSE_SIGN, { courseId: courseId, taskId, type }); @@ -319,16 +300,12 @@ function toSurvery() { if (data.value.isSurvery) { // return; } - if (data.value.planDto.beginTime) { - let date1 = new Date(data.value.planDto.beginTime).getTime() - let date2 = new Date().getTime() - if (date1 > date2) { - ElMessage.info("未到开始时间，请耐心等待！"); - return; - } + if (data.value.planDto.beginTime && dayjs().isBefore(data.value.planDto.beginTime)) { + ElMessage.warning("课程未开始，请耐心等待！"); + return; } if (data.value.planDto.evalFlag == 0) { - ElMessage.info("此课程无评估"); + ElMessage.warning("此课程无评估"); return; } router.push({ @@ -345,25 +322,14 @@ function toSurvery() { }); } -function isEndSubMitWork() { - if (data.value.workDto.submitEndTime) { - let date1 = new Date(data.value.workDto.submitEndTime).getTime(); - let date2 = new Date().getTime(); - console.log(date1, date2, date1 > date2, data.value.workDto.submitEndTime) - if (date1 < date2) { - return true; - } - } else { - return false; - } -} + function toWork() { if (data.value.planDto.beginTime) { let date1 = new Date(data.value.planDto.beginTime).getTime() let date2 = new Date().getTime() if (date1 > date2) { - ElMessage.info("未到开始时间，请耐心等待！"); + ElMessage.warning("未到开始时间，请耐心等待！"); return; } } @@ -387,7 +353,7 @@ function toExamItem(obj) { let date1 = new Date(data.value.planDto.beginTime).getTime() let date2 = new Date().getTime() if (date1 > date2) { - ElMessage.info("未到开始时间，请耐心等待！"); + ElMessage.warning("未到开始时间，请耐心等待！"); return; } } @@ -524,7 +490,11 @@ onUnmounted(() => { background: #ffffff; border-radius: 8px; margin-top: 20px; - + .wenxintishi{ + display: flex; + justify-content: stretch; + padding: 72px; + } .el-tabs__item { height: 69px; padding: 25px 7px 0px 52px; @@ -634,9 +604,11 @@ onUnmounted(() => { margin-left: 48px; margin-right: 48px; // min-height: 115px; + margin-top: 20px; padding: 25px 0px; display: flex; position: relative; + // align-items: center; } @@ -646,12 +618,41 @@ onUnmounted(() => { border-radius: 30px; } - .teacheritem .teacherName { - font-size: 14px; - font-weight: bold; - color: #394145; - display: flex; - align-items: center; + .teacheritem { + .nameSpan{ + width: 190px; + display: flex; + align-items: center; + justify-content: center; + + .teacherName { + font-size: 14px; + font-weight: bold; + color: #394145; + display: flex; + align-items: center; + } + } + + + } + + .teacheritem { + .nameSpan{ + width: 190px; + display: flex; + align-items: center; + justify-content: center; + + .teacherName { + font-size: 14px; + font-weight: bold; + color: #394145; + display: flex; + align-items: center; + } + } + } .teacheritem .introduce { @@ -679,6 +680,8 @@ onUnmounted(() => { cursor: pointer; } } + + } } diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 4a15e8e..6e3dd89 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -46,7 +46,7 @@
-
+
- -
- +
-
+
+ +
+ + +
@@ -149,9 +154,7 @@
-
- - +
{{ value.workUploadAddress?.split(',')[0].split('/').at(-1) || '' @@ -172,33 +175,12 @@
- {{ - data?.submitStartTime - }}    至    {{ - data?.submitEndTime -}} + {{data?.submitStartTime}}    至    {{data?.submitEndTime}}
- - - -
- 改任务已结束 -
- - -
- 距离结束还有   - {{ - parseInt( - dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60 - ) - }}   小时  {{ - dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60 - }}  分钟 -
- - +
改任务已结束
+
距离结束还有  {{parseInt(dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60)}}   小时   + {{dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60}}  分钟
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index ac573b3..fa8dc81 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -31,7 +31,7 @@
- {{ data?.liveStartTime + "至" + data?.liveEndTime }} + {{ data?.liveStartTime + " 至 " + data?.liveEndTime }}
@@ -53,15 +53,13 @@ background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }} - + 评估 {{ data.isSurvery ? "已评估" - : "评估" -}} + }" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{ data.isSurvery ? "已评估": "评估"}}
@@ -138,7 +136,7 @@ diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index 69c1dd0..2989f4f 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -160,7 +160,7 @@ const signClick = (tab, event) => { return; } data.value.signFlag = true; - ElMessage.info("签到成功"); + ElMessage.warning("签到成功"); request(TASK_ACTIVITY_SIGN, { courseId: activityId, taskId, diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 88ca330..6b5ed46 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -17,7 +17,7 @@
{{ userInfo.bandDesc }} - +
@@ -45,10 +45,13 @@ (e) => !whiteTypes(e.type) )" :key="index">
- +
- + +
+ +
必修 diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 346df7d..aa51447 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -19,7 +19,7 @@
{{ userInfo.bandDesc }} - +
@@ -46,9 +46,15 @@ :key="index" >
+
- - + + +
+ +
+ {{ value.name }} +