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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop

Browse Source
This commit is contained in:
wyx
2022-12-21 17:45:06 +08:00
parent eefaca7be3 710740e4c3
commit 7508082c27
3 changed files with 8 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 25 KiB

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

@@ -12,7 +12,7 @@
<div class="detailinfo">
<div class="detailL">
<div v-for="(i, k) in data.stageProcessList" :key="k">
<div v-if="i.stageId=='0'&&i.taskProcessList.length==0"></div>
<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
<div v-else class="title">
<div class="titleL">{{ i.stageName }}</div>
<div class="titleR" :style="{ display: 'flex' }">
@@ -29,7 +29,7 @@
</div>
</div>
</div>
<div v-if="i.stageId=='0'&&i.taskProcessList.length==0"></div>
<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
<div
v-else
class="course"
@@ -47,7 +47,6 @@
<div class="tag3" style="margin-right: 11px; margin-top: 16px">
{{ types.typeName[value.type] || "" }}
</div>
<!-- <div-->
<!-- v-for="(item, key) in value.flag"-->
<!-- :key="key"-->
@@ -195,7 +194,6 @@
<div class="ratetext">上次学到：启航班-领导寄语</div>
<div class="ratebtn">继续学习</div>
</div>-->
<div style="margin-top: 16px">
<div class="progressBox">
<div>总进度</div>
@@ -264,7 +262,6 @@
<!-- 详细信息 -->
</div>
</template>
<script setup>
import { computed, reactive, ref } from "vue";
import word from "@/assets/image/file/word.png";
@@ -286,7 +283,6 @@ import {
import { useRoute, useRouter } from "vue-router";
import store from "@/store";
import { ElMessage } from "element-plus";
const {
query: { courseId, projectId },
} = useRoute();
@@ -298,16 +294,12 @@ const { data } = useRequest(PROJECT_PROCESS, {
projectId: projectId || courseId,
});
console.log("datadata", data);
const userInfo = computed(() => store.state.userInfo);
const activeName = ref("first");
const handleClick = (tab, event) => {
console.log(tab, event);
};
const path = { 1: "path" };
const types = ref({
typeName: {
1: "在线",
@@ -363,7 +355,6 @@ const types = ref({
13: "/projectdetails",
},
});
function toFinish(d, sName, chapterId) {
console.log("dddddd", d);
if (!types.value.path[d.type]) {
@@ -403,7 +394,6 @@ function whiteTypes(type) {
return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-");
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss">
.pathdetails {
@@ -413,19 +403,16 @@ function whiteTypes(type) {
font-size: 14px;
line-height: 24px;
}
.pdname {
font-size: 20px;
font-weight: 800;
color: #ffffff;
margin-top: 17px;
}
.detailinfo {
width: 100%;
margin-top: 24px;
display: flex;
.detailL {
flex: 1;
margin-right: 20px;
@@ -434,7 +421,6 @@ function whiteTypes(type) {
padding-left: 45px;
padding-right: 45px;
padding-top: 23px;
.title {
height: 50px;
display: flex;
@@ -443,19 +429,16 @@ function whiteTypes(type) {
background-color: rgba(249, 249, 249, 1);
margin-top: 27px;
margin-bottom: 19px;
.titleL {
font-size: 16px;
font-weight: 800;
color: #333333;
margin-left: 27px;
}
.titleR {
display: flex;
align-items: center;
}
.titleR .titleRT {
font-size: 16px;
font-weight: 800;
@@ -464,7 +447,6 @@ function whiteTypes(type) {
margin-left: 2px;
}
}
.course {
display: flex;
align-items: center;
@@ -472,7 +454,6 @@ function whiteTypes(type) {
flex-wrap: wrap;
margin-bottom: 32px;
margin-left: 26px;
.coursename {
font-size: 14px;
font-weight: 500;
@@ -482,28 +463,23 @@ function whiteTypes(type) {
text-overflow: ellipsis;
white-space: nowrap;
}
.coursetag {
display: flex;
flex-wrap: wrap;
}
.progressBox {
font-size: 14px;
font-weight: 500;
color: #677d86;
margin-top: 24px;
.progress {
display: flex;
align-items: center;
}
.progress .el-progress-bar__outer {
background-color: rgba(232, 241, 254, 1);
}
}
.goclass {
width: 126px;
height: 46px;
@@ -521,26 +497,21 @@ function whiteTypes(type) {
}
}
}
.detailR {
width: 434px;
.detailRT {
min-height: 298px;
background: #ffffff;
border-radius: 8px;
.el-tabs__item {
height: 56px;
padding: 10px 33px 0px 27px;
font-size: 14px;
font-weight: 500;
}
.el-tabs__nav-wrap::after {
background-color: rgba(56, 125, 247, 0.2);
}
.notice {
padding: 15px 43px 30px 47px;
font-size: 14px;
@@ -548,7 +519,6 @@ function whiteTypes(type) {
color: #333330;
line-height: 24px;
}
.sharedocname {
width: 259px;
font-size: 14px;
@@ -557,7 +527,6 @@ function whiteTypes(type) {
margin-left: 20px;
line-height: 24px;
}
.download {
display: flex;
align-items: center;
@@ -568,13 +537,11 @@ function whiteTypes(type) {
color: #2478ff;
}
}
.detailRB {
min-height: 459px;
background: #ffffff;
border-radius: 8px;
margin-top: 17px;
.info .title {
display: flex;
align-items: center;
@@ -582,14 +549,12 @@ function whiteTypes(type) {
position: relative;
margin-left: 48px;
}
.info .title .text {
margin-left: 8px;
font-size: 16px;
color: rgba(51, 51, 51, 1);
font-weight: 800;
}
.info .title .box {
width: 75px;
height: 10px;
@@ -598,7 +563,6 @@ function whiteTypes(type) {
left: 23px;
top: 53px;
}
.info .teacheritem {
margin-left: 48px;
margin-right: 48px;
@@ -606,13 +570,11 @@ function whiteTypes(type) {
display: flex;
// align-items: center;
}
.info .teacheritem .peopleimg {
width: 60px;
height: 60px;
border-radius: 30px;
}
.info .teacheritem .teacherName {
font-size: 14px;
font-weight: bold;
@@ -621,7 +583,6 @@ function whiteTypes(type) {
align-items: center;
width: 260px;
}
.info .teacheritem .teacherName .teacherMedal {
width: 17px;
height: 19px;
@@ -629,7 +590,6 @@ function whiteTypes(type) {
display: flex;
align-items: center;
}
.info .teacheritem .introduce {
width: 260px;
font-size: 14px;
@@ -638,7 +598,6 @@ function whiteTypes(type) {
margin-top: 14px;
line-height: 24px;
}
.info .rate {
display: flex;
align-items: center;
@@ -647,7 +606,6 @@ function whiteTypes(type) {
margin-left: 48px;
margin-right: 26px;
}
.info .rate .ratetext {
width: 259px;
font-size: 14px;
@@ -655,7 +613,6 @@ function whiteTypes(type) {
color: #677d86;
line-height: 24px;
}
.info .rate .ratebtn {
width: 86px;
height: 36px;
@@ -670,19 +627,16 @@ function whiteTypes(type) {
align-items: center;
justify-content: center;
}
.info .progressBox {
font-size: 14px;
font-weight: 500;
color: #677d86;
margin-top: 16px;
margin-left: 44px;
.progress {
display: flex;
align-items: center;
}
.progress .el-progress-bar__outer {
background-color: rgba(232, 241, 254, 1);
}

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

@@ -64,7 +64,7 @@
</el-table-column>
<el-table-column align="center" prop="name" label="路径名称" />
<el-table-column align="center" prop="introduce" label="路径介绍" #default="scope">
<el-popover placement="top-start" title="路径介绍" trigger="hover" :content="scope.row.remark">
<el-popover placement="bottom-start" :width="400" title="路径介绍" trigger="hover" :content="scope.row.remark">
<template #reference>
<div>{{ scope.row.remark }}</div>
</template>
@@ -315,5 +315,9 @@ function toUnTask() { }
margin-left: 28px;
cursor: pointer;
}
.box-item {
width: 200px;
margin-top: 10px;
}
}
</style>