From db1123779d776af8ddd26e03f6cdabfd504f8c6f Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 22 Dec 2022 17:39:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=82=AC=E5=81=9C=E6=98=BE=E7=A4=BA=E5=85=A8?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 1 + src/views/project/ProjectDetails.vue | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/api/api.js b/src/api/api.js index 2b4be3a..0188503 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -15,6 +15,7 @@ export const ROUTER_LIST = '/stu/router/list post' export const ROUTER_PROCESS = '/stu/router/process' export const LINK_DETAILS = linkId => `/link/getOne?linkId=${linkId} post` export const PROJECT_PROCESS = '/stu/project/process' +export const ONLINE_PROCESS = '/onlineClasses/queryOnlineClassesStudyDetail post' export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList post' export const TAS_ACTIVITY_DETAIL = '/activity' export const TASK_ACTIVITY_SIGN = '/stu/task/activity/sign post' diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 2806a8a..b51b257 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -31,7 +31,7 @@ (e) => !whiteTypes(e.type) )" :key="index">
-
{{ value.name }}
+
{{ value.name }}
必修 @@ -254,6 +254,7 @@ import img from "@/assets/image/uploadimg.png"; import { useRequest, request } from "@/api/request"; import { PROJECT_PROCESS, + ONLINE_PROCESS, ROUTER_PROCESS, LINK_DETAILS, STUDY_RECORD, @@ -271,7 +272,26 @@ const returnclick = () => { const { data } = useRequest(PROJECT_PROCESS, { projectId: projectId || courseId, }); + console.log("datadata", data); + +// const { onlinedata } = useRequest(ONLINE_PROCESS, { +// addView: false, +// cid:"1042123882713739264" +// }); +// console.log("onlinedata", onlinedata); + +// request(ONLINE_PROCESS, { +// addView: false, +// cid:"1042123882713739264" +// }) +// .then((res) => { +// console.log(res) +// }).catch(err=>{ +// console.log(err) +// }) + + const userInfo = computed(() => store.state.userInfo); const activeName = ref("first"); const handleClick = (tab, event) => { From ebc4b38668210c7066d94be839804792cac40cb5 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 22 Dec 2022 18:23:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E3=80=81=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E7=AE=80?= =?UTF-8?q?=E4=BB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 17 +++++++++++++--- src/views/roadmap/PathDetails.vue | 29 +++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index b51b257..75c84af 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -2,12 +2,18 @@
- - +
{{data.name}}
+
/
项目详情
-
{{ userInfo.bandDesc }}
+
+ {{ userInfo.bandDesc }} + 简介 + > + +
+
@@ -361,6 +367,11 @@ const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行 // return true; // } +function introductionPro() { + dialogVisibleTip.value =data.value.remark; + dialogVisible.value = true; +} + function toFinish(d, sName, chapterId) { console.log("dddddd", d); // 作业过期判断 diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 1770d77..0116756 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -7,7 +7,12 @@
路径图详情
-
{{ userInfo.bandDesc }}
+
+ {{ userInfo.bandDesc }} + 简介 + > + +
@@ -308,6 +313,20 @@
+ + +
{{ dialogVisibleTip }}
+ + 取消 + 确定 + +
@@ -338,6 +357,14 @@ const handleClick = (tab, event) => { }; const path = {1: "path"}; +const dialogVisible = ref(false); +const dialogVisibleTip = ref(''); + +function introductionPro() { + dialogVisibleTip.value =data.value.remark; + dialogVisible.value = true; +} + const types = ref({ typeName: { 1: "在线",