hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-09 10:56:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-16 18:22:34 +08:00
parent bc6eac5caf 7d968690d9
commit 5b9a8faa02
16 changed files with 248 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -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
VITE_TASK_WHITE_TYPE=-8-,-12-

BIN
src/assets/image/return.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

23
src/views/ballot/BallotPage.vue
View File

@@ -7,13 +7,23 @@
<div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">投票详情</div>
<!--
<div class="preNext">
<button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span>
<span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button>
</div>
-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2" style="margin-right:22px;"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
<!-- 面包屑导航 -->
<div class="debateTitle">【投票】{{ dataInfo?.voteName }}</div>
@@ -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;

23
src/views/debate/DebatePage.vue
View File

@@ -7,12 +7,22 @@
<div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">辩论详情</div>
<!--
<div class="preNext">
<button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span>
<span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button>
</div>
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2" style="margin-right:22px;"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
<!-- 面包屑导航 -->
<div class="debateTitle">
@@ -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;

26
src/views/discuss/DiscussPage.vue
View File

@@ -11,6 +11,7 @@
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">讨论详情</div>
</div>
<!--
<div class="prevnext">
<div class="prev">
<img
@@ -26,7 +27,16 @@
src="../../assets/image/next.png"
/>
</div>
</div>
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2" style="margin-right:22px;"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
<!-- 面包屑导航 -->
<!-- 标题 -->
@@ -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;

26
src/views/discussdetail/DiscussDetail.vue
View File

@@ -10,7 +10,8 @@
<div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">讨论详情</div>
</div>
</div>
<!--
<div class="prevnext">
<div class="prev">
<img
@@ -26,8 +27,18 @@
src="../../assets/image/next.png"
/>
</div>
</div>
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2" style="margin-right:22px;"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
<!-- 面包屑导航 -->
<!-- 标题 -->
<div class="title">【调研】管理者进阶腾飞班 - 班内成员讨论</div>
@@ -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;

23
src/views/examination/ExamPage.vue
View File

@@ -11,6 +11,7 @@
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">考试详情</div>
</div>
<!--
<div class="prevnext">
<div class="prev">
<img
@@ -26,7 +27,16 @@
src="../../assets/image/next.png"
/>
</div>
</div>
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2" style="margin-right:22px;"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
<!-- 面包屑导航 -->
<!-- 标题 -->
@@ -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;

3
src/views/faceteach/FaceTeach.vue
View File

@@ -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();

24
src/views/homework/HomeworkPage.vue
View File

@@ -7,12 +7,23 @@
<div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">作业详情</div>
<!--
<div class="preNext">
<button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span>
<span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button>
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2"
style="margin-right: 22px"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
<div @click="returnclick">返回</div>
@@ -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;

31
src/views/liveBroadcast/LiveBroadcast.vue
View File

@@ -7,14 +7,23 @@
<div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">直播详情</div>
<!--
<div class="preNext">
<!-- 2022-12-15注释 李晓鸽 后面打开 -->
2022-12-15注释 李晓鸽 后面打开 -->
<!-- <button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span>
<span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button> -->
</div>
<button class="btn btn02" style="margin-left: 6px"></button>
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2" style="margin-right:22px;"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
<!-- 面包屑导航 -->
@@ -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;

3
src/views/login/login.vue
View File

@@ -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",

24
src/views/moreActive/MoreActive.vue
View File

@@ -7,13 +7,22 @@
<div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">活动详情</div>
<!--
<div class="preNext">
<button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span>
<span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button>
</div>
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2" style="margin-right:22px;"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
<!-- 面包屑导航 -->
@@ -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;

13
src/views/project/ProjectDetails.vue
View File

@@ -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 +'-')
}
</script>

5
src/views/roadmap/LearnPath.vue
View File

@@ -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&params=${encodeURIComponent(
`http://localhost:5173/fe-student/pathdetails&params=${encodeURIComponent(
`routerId=${routerId}&routerName=${routerName}`
)}`
);

60
src/views/roadmap/PathDetails.vue
View File

@@ -67,7 +67,7 @@
</div>
<div
class="progressBox"
:style="{ display: value.status === 1 ? 'block' : 'none' }"
:style="{ display: value.type === 1 ? 'block' : 'none' }"
>
<div>当前进度</div>
<div class="progress">
@@ -154,29 +154,30 @@
{{ data.remark || "暂无公告" }}
</div>
</el-tab-pane>
<el-tab-pane label="共享文档" name="second">
<!-- <div style="padding: 19px 30px 17px 28px">-->
<!-- <div-->
<!-- v-for="(value, index) in sharedoc"-->
<!-- :key="index"-->
<!-- style="-->
<!-- display: flex;-->
<!-- align-items: center;-->
<!-- margin-bottom: 15px;-->
<!-- "-->
<!-- >-->
<!-- <img :src="value.img" style="width: 22px; height: 26px"/>-->
<!-- <div class="sharedocname">{{ value.name }}</div>-->
<!-- <div class="download">-->
<!-- <img-->
<!-- src="../../assets/image/download.png"-->
<!-- style="width: 16px; height: 15px"-->
<!-- />-->
<!-- <div style="margin-left: 7px">下载</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</el-tab-pane>
<!--
<el-tab-pane label="共享文档" name="second"> -->
<!-- <div style="padding: 19px 30px 17px 28px">-->
<!-- <div-->
<!-- v-for="(value, index) in sharedoc"-->
<!-- :key="index"-->
<!-- style="-->
<!-- display: flex;-->
<!-- align-items: center;-->
<!-- margin-bottom: 15px;-->
<!-- "-->
<!-- >-->
<!-- <img :src="value.img" style="width: 22px; height: 26px"/>-->
<!-- <div class="sharedocname">{{ value.name }}</div>-->
<!-- <div class="download">-->
<!-- <img-->
<!-- src="../../assets/image/download.png"-->
<!-- style="width: 16px; height: 15px"-->
<!-- />-->
<!-- <div style="margin-left: 7px">下载</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-tab-pane>-->
</el-tabs>
</div>
<!-- 课程公告及共享文档 -->
@@ -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 + "-");
}
</script>

20
src/views/survey/SurveyDetail.vue
View File

@@ -11,6 +11,7 @@
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">调研详情</div>
</div>
<!--
<div class="prevnext">
<div class="prev">
<img
@@ -25,6 +26,14 @@
style="width: 23px; height: 23px"
src="../../assets/image/next.png"
/>
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2" style="margin-right:22px;"
src="../../assets/image/return.png"
/>
<div class="text">返回</div>
</div>
</div>
</div>
@@ -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;