diff --git a/.env b/.env index b2048b0..3c0bd95 100644 --- a/.env +++ b/.env @@ -12,4 +12,4 @@ VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id= VITE_BOE_API_URL=https://u-pre.boe.com -VITE_TASK_WHITE_TYPE=8,12 \ No newline at end of file +VITE_TASK_WHITE_TYPE=-8-,-12- \ No newline at end of file diff --git a/src/assets/image/return.png b/src/assets/image/return.png new file mode 100644 index 0000000..4e9e5f8 Binary files /dev/null and b/src/assets/image/return.png differ diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue index 1cd6a0e..188d545 100644 --- a/src/views/ballot/BallotPage.vue +++ b/src/views/ballot/BallotPage.vue @@ -7,13 +7,23 @@
{{ sName }}
/
投票详情
- + +
+
+ +
返回
+
+
【投票】{{ dataInfo?.voteName }}
@@ -217,7 +227,16 @@ const submitVote = () => { line-height: 24px; position: relative; } - + .return{ + position: absolute; + right: 10%; + .text{ + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .preNext { position: absolute; right: 0px; diff --git a/src/views/debate/DebatePage.vue b/src/views/debate/DebatePage.vue index 4c04cc0..fa19237 100644 --- a/src/views/debate/DebatePage.vue +++ b/src/views/debate/DebatePage.vue @@ -7,12 +7,22 @@
{{ sName }}
/
辩论详情
+ +
+
+ +
返回
+
+
@@ -107,7 +117,16 @@ const handleClick = (id) => {}; line-height: 24px; position: relative; } - + .return{ + position: absolute; + right: 10%; + .text{ + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .preNext { position: absolute; right: 0px; diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 15874fc..544f9d9 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -11,6 +11,7 @@
/
讨论详情
+ +
+
+ +
返回
+
+
@@ -109,6 +119,9 @@ import { reactive, ref, toRefs } from "vue"; import { useRoute, useRouter } from "vue-router"; const router = useRouter(); +const returnclick = () => { + router.back(); +}; const { query: { id, type, pName, sName }, } = useRoute(); @@ -159,7 +172,16 @@ function collection(d) { font-size: 14px; line-height: 24px; } - + .return{ + position: absolute; + right: 10%; + .text{ + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .prevnext { display: flex; align-items: center; diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index 78530f3..02825f9 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -10,7 +10,8 @@
{{ sName }}
/
讨论详情
- + + + +
+
+ +
返回
+
+
【调研】管理者进阶腾飞班 - 班内成员讨论
@@ -389,7 +400,16 @@ function submitReplayComment() { font-size: 14px; line-height: 24px; } - + .return{ + position: absolute; + right: 10%; + .text{ + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .prevnext { display: flex; align-items: center; diff --git a/src/views/examination/ExamPage.vue b/src/views/examination/ExamPage.vue index 9e3dc3b..9cda6d2 100644 --- a/src/views/examination/ExamPage.vue +++ b/src/views/examination/ExamPage.vue @@ -11,6 +11,7 @@
/
考试详情
+ +
+
+ +
返回
+
+
@@ -133,7 +143,16 @@ const { data } = useRequest(EXAMINATION_QUERY(159), {}); font-size: 14px; line-height: 24px; } - + .return{ + position: absolute; + right: 10%; + .text{ + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .prevnext { display: flex; align-items: center; diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index af30dcb..cc88043 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -157,6 +157,9 @@ import {useRoute, useRouter} from "vue-router"; import {useUserInfo} from "@/api/utils"; const router = useRouter(); +const returnclick = () => { + router.back(); +}; const { query: {courseId, type}, } = useRoute(); diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index a1a90c3..8f279b7 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -7,12 +7,23 @@
{{ sName }}
/
作业详情
- + + +
+
+ +
返回
+
返回
@@ -314,7 +325,16 @@ function reUpload(i) { line-height: 24px; position: relative; } - + .return { + position: absolute; + right: 10%; + .text { + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .preNext { position: absolute; right: 0px; diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 5220402..f620bd8 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -7,14 +7,23 @@
{{ sName }}
/
直播详情
- + + 2022-12-15注释 李晓鸽 后面打开 --> - + + --> +
+
+ +
返回
+
+
@@ -165,6 +174,9 @@ const { query: {courseId: liveId, id: taskId, type, pName, sName}, } = useRoute(); const router = useRouter(); +const returnclick = () => { + router.back(); +}; const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId}); @@ -218,7 +230,16 @@ function showClick() { line-height: 24px; position: relative; } - + .return{ + position: absolute; + right: 10%; + .text{ + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .preNext { position: absolute; right: 0px; diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 804192e..c231af4 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -46,6 +46,9 @@ import {setCookie} from "@/api/utils"; import {request} from "@/api/request"; const router = useRouter(); +const returnclick = () => { + router.back(); +}; const form = ref({ account: "10181457", diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index fe0ac90..1defbdc 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -7,13 +7,22 @@
{{ sName }}
/
活动详情
- + +
+
+ +
返回
+
+
@@ -165,7 +174,16 @@ const signClick = (tab, event) => { line-height: 24px; position: relative; } - + .return{ + position: absolute; + right: 10%; + .text{ + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .preNext { position: absolute; right: 0px; diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 73f80ed..c014b66 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -317,6 +317,9 @@ const { query: {courseId, projectId}, } = useRoute(); const router = useRouter(); +const returnclick = () => { + router.back(); +}; const {data} = useRequest(PROJECT_PROCESS, {projectId: projectId || courseId}); const userInfo = computed(() => store.state.userInfo); @@ -346,13 +349,13 @@ const types = ref({ toName: { 1: "去上课", 2: "去上课", - 3: "案例", + 3: "去阅读", 4: "去完成", 5: "去完成", - 6: "去签到", - 7: "外链", + 6: "去观看", + 7: "去查看", 8: "去讨论", - 9: "去完成", + 9: "去签到", 10: "去完成", 11: "去完成", 12: "去投票", @@ -392,7 +395,7 @@ function toFinish(d) { } } function whiteTypes(type){ - return import.meta.env.VITE_TASK_WHITE_TYPE.includes(type+'') + return import.meta.env.VITE_TASK_WHITE_TYPE.includes('-' + type +'-') } diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue index 3109812..26fb41f 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -167,6 +167,9 @@ const userInfo = computed(() => store.state.userInfo); const { data } = usePage(ROUTER_LIST, {}); console.log("datadata", data); const router = useRouter(); +const returnclick = () => { + router.back(); +}; // const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {}); @@ -191,7 +194,7 @@ async function gofun({ routerId, name: routerName }) { query: { routerId, routerName }, }) : window.open( - `http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails¶ms=${encodeURIComponent( + `http://localhost:5173/fe-student/pathdetails¶ms=${encodeURIComponent( `routerId=${routerId}&routerName=${routerName}` )}` ); diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index b72bb6e..e30d1ae 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -67,7 +67,7 @@
当前进度
@@ -154,29 +154,30 @@ {{ data.remark || "暂无公告" }}
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
@@ -337,8 +338,9 @@ const { query: { routerId, routerName }, } = useRoute(); const router = useRouter(); + const { data } = useRequest(ROUTER_PROCESS, { routerId }); -console.log("ROUTER_PROCESS", data); + const userInfo = computed(() => store.state.userInfo); console.log("userInfo", userInfo); const activeName = ref("first"); @@ -367,11 +369,11 @@ const types = ref({ toName: { 1: "去上课", 2: "去上课", - 3: "案例", + 3: "去阅读", 4: "去完成", 5: "去完成", - 6: "去签到", - 7: "查看", + 6: "去观看", + 7: "去查看", 8: "去讨论", 9: "去签到", 10: "去完成", @@ -432,7 +434,7 @@ function toFinish(d, sName) { } function whiteTypes(type) { - return import.meta.env.VITE_TASK_WHITE_TYPE.includes(type + ""); + return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-"); } diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 561a9ad..770f6c4 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -11,6 +11,7 @@
/
调研详情
+ +
+
+ +
返回
@@ -201,7 +210,16 @@ function submit() { font-size: 14px; line-height: 24px; } - + .return{ + position: absolute; + right: 10%; + .text{ + text-align: center; + display: flex; + flex-direction: row; + align-items: center; + } + } .prevnext { display: flex; align-items: center;