From eb42c94ce61dccbc115f2345654218a080fd4e47 Mon Sep 17 00:00:00 2001 From: lixg Date: Sun, 18 Dec 2022 21:07:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 7 +- src/main.js | 10 +- src/views/project/ProjectDetails.vue | 22 +- src/views/project/ProjectManage.vue | 298 +++++++++++++++++++++++++++ src/views/roadmap/PathDetails.vue | 21 +- 5 files changed, 345 insertions(+), 13 deletions(-) create mode 100644 src/views/project/ProjectManage.vue diff --git a/src/api/api.js b/src/api/api.js index 1efbb2f..f1ded4e 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-12-11 16:57:58 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-17 19:19:17 + * @LastEditTime: 2022-12-18 18:37:26 * @FilePath: /fe-stu/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -53,4 +53,7 @@ export const ASSESSMENT_SUBMIT_QUERY = assessmentId => `/assessmentSubmit/queryA 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 +export const ACTIVITY = '/activity' + +export const STUDY_RECORD = '/stu/task/thirdTask/submit post' +export const PROJECT_LIST = '/stu/project/list post' \ No newline at end of file diff --git a/src/main.js b/src/main.js index 10d05f3..dbfa833 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,12 @@ -import {createApp} from 'vue' +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-12-11 16:57:58 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-12-18 16:31:00 + * @FilePath: /fe-stu/src/main.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +import { createApp } from 'vue' import App from './App.vue' import router from './router' import store from './store' diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index b52bf1e..3c38217 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -100,7 +100,7 @@ -
+
{{ value.status === 1 ? "已完成" @@ -313,7 +313,12 @@ 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, LINK_DETAILS } from "@/api/api"; +import { + PROJECT_PROCESS, + ROUTER_PROCESS, + LINK_DETAILS, + STUDY_RECORD, +} from "@/api/api"; import { useRoute, useRouter } from "vue-router"; import store from "@/store"; import { ElMessage } from "element-plus"; @@ -393,12 +398,21 @@ const types = ref({ }, }); -function toFinish(d, sName) { +function toFinish(d, sName, chapterId) { + console.log("dddddd", d); if (!types.value.path[d.type]) { ElMessage.error("暂时未开放"); return; } - + if (d.type == 3 || d.type == 7) { + request(STUDY_RECORD, { + studentId: data.value.userInfoBo.userId, + targetId: data.value.routerId, + logo: 2, + stageOrChapterId: chapterId, + taskId: d.projectTaskId, + }); + } if (typeof types.value.path[d.type] === "string") { types.value.path[d.type] && types.value.path[d.type].startsWith("http") && diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue new file mode 100644 index 0000000..d6da945 --- /dev/null +++ b/src/views/project/ProjectManage.vue @@ -0,0 +1,298 @@ + + + + diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 7fb08dc..4197b29 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -116,7 +116,7 @@ :style="{ background: `${types.path[value.type] ? '#2478ff' : '#999'}`, }" - @click="toFinish(value, i.chapterName)" + @click="toFinish(value, i.chapterName, i.chapterId)" > {{ value.status === 1 @@ -329,7 +329,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 { boeRequest, useRequest, request } from "@/api/request"; -import { ROUTER_PROCESS, LINK_DETAILS } from "@/api/api"; +import { ROUTER_PROCESS, LINK_DETAILS, STUDY_RECORD } from "@/api/api"; import { useRoute, useRouter } from "vue-router"; import { ElMessage } from "element-plus"; import { useUserInfo } from "@/api/utils"; @@ -345,7 +345,7 @@ const returnclick = () => { const { data } = useRequest(ROUTER_PROCESS, { routerId }); console.log("data", data); const userInfo = computed(() => store.state.userInfo); - +console.log("userInfo", userInfo); const activeName = ref("first"); const handleClick = (tab, event) => { @@ -409,14 +409,23 @@ const types = ref({ }, }); -function toFinish(d, sName) { +function toFinish(d, sName, chapterId) { if (!types.value.path[d.type]) { ElMessage.error("暂时未开放"); return; } - + if (d.type == 3 || d.type == 7) { + request(STUDY_RECORD, { + studentId: data.value.userInfoBo.userId, + targetId: data.value.routerId, + logo: 1, + stageOrChapterId: chapterId, + taskId: d.routerTaskId, + }); + } if (typeof types.value.path[d.type] === "string") { - // console.log("dddddd", d); + console.log("dddddd", d); + types.value.path[d.type] && types.value.path[d.type].startsWith("http") && window.open(types.value.path[d.type] + d.targetId);