From 44375c4965a8bd0396ab63d9976e1f540430ac5d Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 13 Dec 2022 12:19:58 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=8A=95=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/roadmap/PathDetails.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 9847fb2..ee2cdff 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -101,9 +101,10 @@ -
+
{{ - types.toName[value.type] || '' + types.path[value.type] ? types.toName[value.type] : '未开放' }}
@@ -317,7 +318,7 @@ import img from '@/assets/image/uploadimg.png' import {useRequest} from "@/api/request"; import {ROUTER_PROCESS} from "@/api/api"; import {useRoute, useRouter} from "vue-router"; - +import { ElMessage } from 'element-plus' const {query: {routerId}} = useRoute() const router = useRouter() @@ -546,13 +547,13 @@ const types = ref({ 13: '去完成', }, path: { - 1: '去上课', + 1: '', 2: '/faceteach', - 3: '案例', + 3: '', 4: '/homeworkpage', - 5: '去完成', + 5: '', 6: '/livebroadcast', - 7: '外链', + 7: '', 8: '/discusspage', 9: '/moreactive', 10: '/starttest', @@ -563,6 +564,10 @@ const types = ref({ }) function toFinish(d) { + if (!types.value.path[d.type]) { + ElMessage.error('暂时未开放') + return + } router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) } From c3c1f484794e07b32eae0961da2a9536124ecfb1 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 13 Dec 2022 13:13:09 +0800 Subject: [PATCH 02/19] init --- src/App.vue | 26 +++++++++++------------ src/views/discussdetail/DiscussDetail.vue | 2 +- src/views/homework/HomeworkPage.vue | 4 ++-- src/views/liveBroadcast/LiveBroadcast.vue | 15 ++++++------- src/views/login/login.vue | 4 +--- src/views/roadmap/PathDetails.vue | 4 ++-- 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/App.vue b/src/App.vue index ac98fc0..548368d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,19 +8,19 @@ --> From c3f96dfa38e1138ed08e20dc2e9113a12c099355 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 13 Dec 2022 17:37:33 +0800 Subject: [PATCH 16/19] init --- src/views/faceteach/FaceTeach.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index d73b55f..6aa7391 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -115,9 +115,9 @@
考试
-
- 去考试 -
+ + + From 8194eedcc097cbae029d1c7f3be2ed9fd51d0680 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 13 Dec 2022 17:48:18 +0800 Subject: [PATCH 17/19] init --- src/views/faceteach/FaceTeach.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 6aa7391..0828d4d 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -92,8 +92,8 @@
提交
@@ -159,7 +159,7 @@ import {useUserInfoAvatar} from "@/api/utils"; const router = useRouter(); const { - query: {courseId}, + query: {courseId,type}, } = useRoute(); const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); @@ -182,8 +182,8 @@ function toSurvery() { router.push({path: "/surveydetail", query: {courseId: data.value.planDto.evaluateId}}) } -function toWork(obj) { - router.push({path: "/homeworkpage", query: {id: obj.workId, taskId: data.value.offcourseDto.categoryId, type}}) +function toWork() { + router.push({path: "/homeworkpage", query: {courseId: data.value.workDto.workId, id: data.value.offcourseDto.categoryId, type}}) } function toExamItem(obj) { From 6573261fd69e06e11714e145d7d4969fcc2bffd5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 13 Dec 2022 17:55:52 +0800 Subject: [PATCH 18/19] init --- src/views/roadmap/PathDetails.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index cef50d8..21dd053 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -39,7 +39,8 @@
{{ value.name }}
-
必修
+
必修
+
选修
{{ types.typeName[value.type] || '' }} From c75d463c401f71da9db53014bf96eb14db8ab0d8 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 13 Dec 2022 18:11:55 +0800 Subject: [PATCH 19/19] init --- src/api/utils.js | 11 ++- src/views/faceteach/FaceTeach.vue | 17 ++-- src/views/liveBroadcast/LiveBroadcast.vue | 105 +++++++++++----------- src/views/roadmap/PathDetails.vue | 6 +- 4 files changed, 73 insertions(+), 66 deletions(-) diff --git a/src/api/utils.js b/src/api/utils.js index 33fd183..8f0be54 100644 --- a/src/api/utils.js +++ b/src/api/utils.js @@ -2,6 +2,8 @@ import {watch, ref} from "vue"; import {boeRequest} from "@/api/request"; import {BASE, GET_USER_LIST} from "@/api/ThirdApi"; +const BASE_AVATAR = import.meta.env.DEV ? `${BASE}/upload` : '' + export function useImage(src) { return new URL(`../assets/image/${src}`, import.meta.url).href } @@ -16,12 +18,13 @@ export function getCookie(name) { return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || '' } -export function useUserInfoAvatar(id) { - const avatar = ref(import.meta.env.DEV ? `${BASE}/upload` : '') +export function useUserInfo(id) { + const userInfo = ref({}) watch(id, () => { id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => { - avatar.value = avatar.value + res.result.userInfoList[0].avatar + userInfo.value = res.result.userInfoList[0] + userInfo.value.avatar = BASE_AVATAR + userInfo.value.avatar }) }) - return avatar + return userInfo } \ No newline at end of file diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 0828d4d..045e63f 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -115,9 +115,9 @@
考试
- - - + + +
@@ -155,16 +155,16 @@ import FileTypeImg from "@/components/FileTypeImg.vue"; import {request, useRequest} from "@/api/request"; import {STU_OFFCOURSE_DETAIL} from "@/api/api"; import {useRoute, useRouter} from "vue-router"; -import {useUserInfoAvatar} from "@/api/utils"; +import {useUserInfo} from "@/api/utils"; const router = useRouter(); const { - query: {courseId,type}, + query: {courseId, type}, } = useRoute(); const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); -const userAvatar = useUserInfoAvatar(computed(() => data.value?.planDto?.teacherId)) +const {avatar: userAvatar} = useUserInfo(computed(() => data.value?.planDto?.teacherId)) const state = reactive({ activeName: "first", @@ -183,7 +183,10 @@ function toSurvery() { } function toWork() { - router.push({path: "/homeworkpage", query: {courseId: data.value.workDto.workId, id: data.value.offcourseDto.categoryId, type}}) + router.push({ + path: "/homeworkpage", + query: {courseId: data.value.workDto.workId, id: data.value.offcourseDto.categoryId, type} + }) } function toExamItem(obj) { diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 433b3b5..be97c53 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -23,15 +23,15 @@
【直播】{{ data?.liveName }}
{{ data?.liveStartTime }}
大族广场
@@ -39,20 +39,23 @@
观看观看 + 签到签到 + 评估评估 +
@@ -65,8 +68,8 @@
课前预习
@@ -74,21 +77,21 @@
- 通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;
+ 通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;
● 培训目标 -
1.使企业不同部门人员掌握便捷、有效的系统平台操作方法;
- 2.通过系统平台的培训提高员工对企业的管理理念认识与提升。
+
1.使企业不同部门人员掌握便捷、有效的系统平台操作方法;
+ 2.通过系统平台的培训提高员工对企业的管理理念认识与提升。
3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。 -
- ●培训对象
- 集团领导、各相关部门领导、总经理、车间主管、车间操作员等;
+
+ ●培训对象
+ 集团领导、各相关部门领导、总经理、车间主管、车间操作员等;
课后作业
@@ -97,9 +100,9 @@
网易有道词典现有功能结构拆解+问题分析
- 查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。
+ >网易有道词典现有功能结构拆解+问题分析
+ 查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。
@@ -109,8 +112,8 @@
直播公告
@@ -120,32 +123,25 @@
直播讲师
- +
{{ data.userInfoBo?.userName }}
{{ data.userInfoBo?.bandDesc }}
- +
@@ -155,22 +151,27 @@