diff --git a/.env b/.env index 902ffb7..9815dca 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ VITE_BASE=/fe-student VITE_BASE_API=/ VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ +VITE_PROXY_URL=http://111.231.196.214:30001 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= diff --git a/src/App.vue b/src/App.vue index c696429..59ca68c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 17:28:10 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-14 22:48:46 + * @LastEditTime: 2022-12-15 11:54:03 * @FilePath: /fe-stu/src/App.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -59,8 +59,8 @@ function getUserInfo() { display: flex; width: 100%; min-height: 100%; - // background-color: rgba(242, 245, 247, 1); - background-color: #ccc; + background-color: rgba(242, 245, 247, 1); + // background-color: #ccc; #nav { width: 220px; height: 100%; diff --git a/src/api/api.js b/src/api/api.js index 32974fa..97205fc 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -17,10 +17,10 @@ export const LINK_DETAILS = linkId => `/link/getOne?linkId=${linkId} post` export const PROJECT_PROCESS = '/stu/project/process' export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList post' export const TAS_ACTIVITY_DETAIL = '/activity' -export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post' +export const TASK_ACTIVITY_SIGN = '/stu/task/activity/sign post' export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit' export const TASK_BROADCAST_DETAIL = '/liveBroadcast' -export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign' +export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign post' export const TASK_VOTE_COMMIT = '/stu/task/vote/commit' export const TASK_VOTE_DETAIL = '/stu/task/vote/detail' export const TASK_WORK_COMMIT = '/workSubmit/submitStudentWorkDetail post' @@ -48,7 +48,7 @@ export const COMMENT_PRAISE = '/comment/praise post' export const COMMENT_COLLECTION = '/comment/collection post' export const ASSESSMENT_SUBMIT_QUERY = assessmentId => `/assessmentSubmit/queryAssessmentSubmitDetailById?assessmentSubmitId=${assessmentId} post` -export const ASSESSMENT_QUERY = assessmentId => `/assessment/queryAssessmentDetailById?assessmentId=${assessmentId} post` -export const ASSESSMENT_SUBMIT = '/assessmentSubmit/submitAssessmentDetail' +export const ASSESSMENT_QUERY = assessmentId => `/stu/task/evaluate/get` +export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post' export const ACTIVITY = '/activity' \ No newline at end of file diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 9c0b622..bda05e2 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -14,8 +14,8 @@
【面授课】{{ data.planDto?.name }}
{{ data.offcourseDto?.publishTime }} @@ -23,15 +23,15 @@
{{ data.planDto?.address }}
-
- 评估 -
+ {{ data.isSurvery ? '已评估' : '评估' }} + @@ -42,8 +42,8 @@
课程详情
@@ -57,16 +57,16 @@
下载
-
+
{{ data.workDto?.workName }}
@@ -98,15 +98,15 @@
-
+
{{ data.examinationDto?.examinationTestName }}
必修
@@ -124,15 +124,15 @@
直播讲师
- +
{{ data.planDto?.teacher }} @@ -148,29 +148,29 @@ diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index ceb99ae..ab683d0 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -24,7 +24,7 @@
作业名称
@@ -48,52 +48,52 @@
{{ file.name }} {{ file.percentage }}%{{ file.percentage }}% {{ - { - ready: "正在上传", - abort: "暂停", - uploading: "正在上传", - fail: "上传失败", - success: "上传成功", - }[file.status] - }} + { + ready: "正在上传", + abort: "暂停", + uploading: "正在上传", + fail: "上传失败", + success: "上传成功", + }[file.status] + }}
@@ -124,8 +124,8 @@
作业内容
@@ -133,11 +133,10 @@
@@ -148,8 +147,8 @@
历史纪录
@@ -161,10 +160,10 @@
作业内容
{{ value.createTime }}
截止时间
@@ -210,21 +209,21 @@
距离结束还有   {{ - parseInt( - dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60 - ) - }}   小时  {{ dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60 }}  分钟 + >  分钟
作业说明
@@ -233,9 +232,9 @@
@@ -245,8 +244,8 @@ @@ -269,12 +278,14 @@ const signClick = (tab, event) => { left: 23px; top: 53px; } + .activedetail { margin-top: 30px; font-size: 14px; font-weight: 500; color: #333330; line-height: 36px; + .content { color: #677d86; } @@ -412,9 +423,9 @@ const signClick = (tab, event) => { background-color: rgba(255, 255, 255, 1); border-radius: 8px; background: linear-gradient( - 180deg, - rgba(36, 120, 255, 0.15) 0%, - rgba(255, 255, 255) 50% + 180deg, + rgba(36, 120, 255, 0.15) 0%, + rgba(255, 255, 255) 50% ); .title { diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 011ca18..c7ca160 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -307,7 +307,7 @@ import medal2 from "@/assets/image/medal/medal2.png"; import medal3 from "@/assets/image/medal/medal3.png"; import img from "@/assets/image/uploadimg.png"; import { useRequest, request } from "@/api/request"; -import { PROJECT_PROCESS, ROUTER_PROCESS } from "@/api/api"; +import { PROJECT_PROCESS, ROUTER_PROCESS, LINK_DETAILS } from "@/api/api"; import { useRoute, useRouter } from "vue-router"; const { diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 9789ca3..8de04c9 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -116,7 +116,13 @@ }" @click="toFinish(value)" > - {{ types.path[value.type] ? types.toName[value.type] : "未开放" }} + {{ + value.status === 1 + ? "已完成" + : types.path[value.type] + ? types.toName[value.type] + : "未开放" + }}
@@ -352,8 +358,6 @@ const { } = useRoute(); const router = useRouter(); const { data } = useRequest(ROUTER_PROCESS, { routerId }); -console.log("datadata", data); - const { avatar: userAvatar } = useUserInfo( computed(() => data.value?.userInfoBo?.userId) ); @@ -603,7 +607,6 @@ function toFinish(d) { if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) { //配置文件 const url = types.value.path[d.type] + d.targetId; - console.log("url", d, url); import.meta.env.DEV ? (window.location.href = url) : (window.parent.location.href = url); diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index e118833..221c83d 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -2,7 +2,7 @@
混合制项目
@@ -14,16 +14,16 @@
@@ -36,23 +36,23 @@
{{ value.assessmentScTitle }}
完全没用
{ value.selectAnswer = item; } @@ -76,23 +76,20 @@
{{ item.singleStemName }}
{{ value.singleOptionName }}
{{ item.multipleStemName }}
{{ value.multipleOptionName }}
{{ item.assessmentQaTitle }}
{{ item.content?.length || 0 }}/200
-
+
提交
@@ -161,25 +159,24 @@