From 129f35936287d6d5f478e2c2ec2174afd2d5bef2 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 16 Dec 2022 11:55:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/roadmap/PathDetails.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 4ae928f..1192545 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -30,11 +30,11 @@
-
{{ value.name }}
+
{{index}}{{ value.name }}
Date: Fri, 16 Dec 2022 15:17:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/image/return.png | Bin 0 -> 1409 bytes src/views/ballot/BallotPage.vue | 23 ++++++++++++++++-- src/views/debate/DebatePage.vue | 23 ++++++++++++++++-- src/views/discuss/DiscussPage.vue | 23 ++++++++++++++++-- src/views/discussdetail/DiscussDetail.vue | 26 +++++++++++++++++--- src/views/examination/ExamPage.vue | 23 ++++++++++++++++-- src/views/homework/HomeworkPage.vue | 25 ++++++++++++++++--- src/views/liveBroadcast/LiveBroadcast.vue | 28 ++++++++++++++++++---- src/views/moreActive/MoreActive.vue | 24 ++++++++++++++++--- src/views/project/ProjectDetails.vue | 2 +- src/views/roadmap/LearnPath.vue | 2 +- src/views/roadmap/PathDetails.vue | 17 +++++++------ src/views/survey/SurveyDetail.vue | 20 +++++++++++++++- 13 files changed, 204 insertions(+), 32 deletions(-) create mode 100644 src/assets/image/return.png diff --git a/src/assets/image/return.png b/src/assets/image/return.png new file mode 100644 index 0000000000000000000000000000000000000000..4e9e5f8b91e0a70c9b252973fa55ebff7e04763c GIT binary patch literal 1409 zcmV-{1%CR8P)Px)J4r-AR9HvVnOkg>RS?I2XFp0y+3vQ*7IrJ;B80|rQBWX2kf=cLg8HC|mtZgw zFZcjTFk*rU0Tg2*4~WqOC72lTLBRwsK@yCjSe1*2K&uuEZf~?*c1xwD+c9Uq7M6Cu zTepbL(`L_q=KRl`IdkUBr^rA=#20C0lImc*g0V_bjKVKM8;WxXrv)mr3@VBSt4Ib@ zp}Z=KNLF2(`64`mVjfW7(#COMr@+>5K+E70X z^TX%@C=Ecd9}HJVmjsI2LV4<|R05Z&*2Lw0gby7V0>3uE-ji^+&J7wS4TU));rb$1 z_{jML<)aEzv>SbqXk()U+Os$Ygq=+7I1Zov=7dT=zF-X8TjoMn*c=L~rM-yOo|Uzt zc+ttkTR*{p8Yh(f_~Z~gF~!kFq7%wX0_ucDCOxWC(IA6rfqXmlcMih$e>qOT;DIpE zfabrgvC~T6u^Sz2Z4Cv~;)_IU;<6NBlbzbGD)=P1HfI?!$c)E5)et>zjbAtp?zF$_ z+B<~M@Sti+dbB1c`+;dzCXb(ijr&2IIbKApoC(>6sTXfguc#+qHXX{Yu`%40u2fB2 ziV*bKO`AMAI$`q~A>`-403UP;__~&^cjVne)?u(_j+u8YBt9&ULKTV0 zdIc|7p?02tPpi_8Y9e=xg}I|4XMp`;PDbJVBcK=FQy!fJGlpC1cS4z}jmbv>_gTSS z`xdI2(vRwVsPm#5xzGt)55bRV>U@3h9vp9NMZw*wCMJ4gXIa5k@4a*_regF~t)6Xe zvy+@{gDnT(L}PlSK1|D}+Y()(iT(^su!61F4e_?#qcclk(Zoyt$J*f78Th>k8d}Ye z7+Yw@rS_yAvyy@wc;$BMaa{uTnP}=&Sbq+-90VPQ-Lhf^jLL^i74{@G-YwBSZN2u` zJ>x*9uUGe7en8Ugbt7buU6gKR0L&qB9Dn0cz;VT7CPJxm6y*=ucwyT6+8<%1cbR>DcLiH8- z%v9KR7>?9?rDx(@U!fYDNl~I}%Ueg8WcBIyBA$wpB+(4ZJe@Cf4SFhSU3{clfafx= zKMLn8!;GEwggc-1sc_b&BQaU0V3pG}|K?LfV0?E&t>@!TciBQtWUuPut}9mm`_JWW zFM4f2oQ|1q{G;`t3zOChrls60&{t`BvH6z2Hqeg^h-9orBv<*_1K1Q^PQj7ExZ9SF zp5lMeBeQXe6T{xf|9^#i6xbkQ!;jX^^0udfkiuq3csubNy;A0f; zh4R!{{ 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..5ccbcc0 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..348f48b 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -11,6 +11,7 @@
/
讨论详情
+ +
+
+ +
返回
+
+
@@ -159,7 +169,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..76b0e38 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..19ed6e1 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/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 9243d07..01a483c 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -7,13 +7,23 @@
{{ sName }}
/
作业详情
- + + +
+
+ +
返回
+
+
@@ -309,7 +319,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..96040ae 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -7,14 +7,23 @@
{{ sName }}
/
直播详情
- + + 2022-12-15注释 李晓鸽 后面打开 --> -
+ + --> +
+
+ +
返回
+
+
@@ -218,7 +227,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/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index fe0ac90..44a26cb 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..f171351 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -392,7 +392,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 acf6501..cf21dcf 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -179,7 +179,7 @@ async function gofun({routerId, name: routerName}) { import.meta.env.MODE === 'development' ? router.push({ path: "/pathdetails", query: {routerId, routerName} - }) : window.open(`http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails¶ms=${encodeURIComponent(`routerId=${routerId}&routerName=${routerName}`)}`) + }) : window.open(`http://localhost:5173/fe-student/pathdetails¶ms=${encodeURIComponent(`routerId=${routerId}&routerName=${routerName}`)}`) } function toUnTask() { diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 4ae928f..d501694 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -65,7 +65,7 @@
当前进度
@@ -152,7 +152,8 @@ {{ data.remark || '暂无公告' }}
- + @@ -174,7 +175,8 @@ - + +
@@ -383,11 +385,11 @@ const types = ref({ toName: { 1: "去上课", 2: "去上课", - 3: "案例", + 3: "去阅读", 4: "去完成", 5: "去完成", - 6: "去签到", - 7: "查看", + 6: "去观看", + 7: "去查看", 8: "去讨论", 9: "去签到", 10: "去完成", @@ -433,7 +435,8 @@ function toFinish(d, sName) { } function whiteTypes(type) { - return import.meta.env.VITE_TASK_WHITE_TYPE.includes(type + '') + console.log('-'+ type + '-',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..22272b9 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; From 9e65bde6cd8abc7dbbb57fdf1d9235b985008316 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 16 Dec 2022 15:40:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E6=8A=95=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index b2048b0..b6e53e3 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 From 47af6bd4c8d2d400264a4edd840be8129bc13b1f Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 16 Dec 2022 18:02:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E6=8C=89=E9=92=AE=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ballot/BallotPage.vue | 2 +- src/views/debate/DebatePage.vue | 2 +- src/views/discuss/DiscussPage.vue | 5 ++++- src/views/discussdetail/DiscussDetail.vue | 2 +- src/views/examination/ExamPage.vue | 2 +- src/views/faceteach/FaceTeach.vue | 3 +++ src/views/homework/HomeworkPage.vue | 7 +++++-- src/views/liveBroadcast/LiveBroadcast.vue | 5 ++++- src/views/login/login.vue | 3 +++ src/views/moreActive/MoreActive.vue | 2 +- src/views/project/ProjectDetails.vue | 11 +++++++---- src/views/roadmap/LearnPath.vue | 3 +++ src/views/roadmap/PathDetails.vue | 3 +++ src/views/survey/SurveyDetail.vue | 2 +- 14 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue index f545439..188d545 100644 --- a/src/views/ballot/BallotPage.vue +++ b/src/views/ballot/BallotPage.vue @@ -16,7 +16,7 @@ -->
-
+
-->
-
+
-->
-
+
{ + router.back(); +}; const { query: { id, type, pName, sName }, } = useRoute(); diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index 76b0e38..02825f9 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -30,7 +30,7 @@
-->
-
+
-->
-
+
{ + router.back(); +}; const { query: {courseId, type}, } = useRoute(); diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 01a483c..70349cc 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -16,14 +16,14 @@
-->
-
+
返回
-
+
@@ -276,6 +276,9 @@ const sbValue = ref({ attach: '' }) const router = useRouter(); +const returnclick = () => { + router.back(); +}; const { query: {courseId: workId, type, id: taskId, pName, sName}, diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 96040ae..f620bd8 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -16,7 +16,7 @@
-->
-
+
{ + router.back(); +}; const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId}); 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 44a26cb..1defbdc 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -15,7 +15,7 @@
-->
-
+
{ + 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: "去投票", diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue index cf21dcf..702646b 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -158,6 +158,9 @@ const userInfo = computed(() => store.state.userInfo); const {data} = usePage(ROUTER_LIST, {}); const router = useRouter(); +const returnclick = () => { + router.back(); +}; // const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {}); diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 7235035..5d6d7a2 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -355,6 +355,9 @@ const { query: {routerId, routerName}, } = useRoute(); const router = useRouter(); +const returnclick = () => { + router.back(); +}; const {data} = useRequest(ROUTER_PROCESS, {routerId}); const userInfo = computed(() => store.state.userInfo); diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 22272b9..770f6c4 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -28,7 +28,7 @@ />
-->
-
+
Date: Fri, 16 Dec 2022 18:17:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- src/views/roadmap/PathDetails.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index b6e53e3..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/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 5d6d7a2..0a5b1fb 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -30,11 +30,11 @@
-
{{index}}{{ value.name }}
+
{{ value.name }}