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:
zhangyc
2022-12-23 19:59:07 +08:00
parent 3b8300c92f b1b4e5aad5
commit 5dfee07863
15 changed files with 2325 additions and 2387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
<div class="pathdetails" style="padding: 30px">
<!-- 面包屑导航 -->
<div class="crumb">
<div>{{data.name}}</div>
<div>{{ data.name }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700">项目详情</div>
@@ -14,12 +14,12 @@
</div>
<!-- 面包屑导航 -->
<div class="pdname">
{{ userInfo.bandDesc }}
<span @click="introductionPro" style="font-size:14px;color:#fff;margin-left: 33px;cursor: pointer;">简介
{{ userInfo.bandDesc }}
<span @click="introductionPro" style="font-size:14px;color:#fff;margin-left: 33px;cursor: pointer;">简介
<span style="position: relative;top:1px;left:-3px;cursor: pointer;">></span>
</span>
</div>
<!-- 详细信息 -->
<div class="detailinfo">
<div class="detailL">
@@ -115,7 +115,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="课程公告" name="first">
<div class="notice">
{{ data.remark || "暂无公告" }}
{{ data.notice || "暂无公告" }}
</div>
</el-tab-pane>
<!--
@@ -237,17 +237,13 @@
</div>
<!-- 详细信息 -->
<!-- 弹框提示信息 -->
<el-dialog
title=""
top="347px"
v-model="dialogVisible"
:show-close="false"
<el-dialog title="" top="347px" v-model="dialogVisible" :show-close="false"
style="display:flex;justify-content:center;align-items:center;height: 283px;padding:0;border-radius: 4px;"
width="502px">
<div style="width:288px;color:#333333;font-size: 22px;font-weight: 600;">{{ dialogVisibleTip }}</div>
<span slot="footer" style="display:inline-block;margin-top:60px;">
<el-button @click="dialogVisible = false" style="width:140px;height:40px;margin-right: 22px;">取消</el-button>
<el-button type="primary" @click="dialogVisible = false" style="width:140px;height:40px;">确定</el-button>
<el-button type="primary" @click="dialogVisible = false" style="width:140px;height:40px;">确定</el-button>
</span>
</el-dialog>
</div>
@@ -374,18 +370,18 @@ const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行
// }
function introductionPro() {
dialogVisibleTip.value =data.value.remark;
dialogVisibleTip.value = data.value.remark;
dialogVisible.value = true;
}
function toFinish(d, sName, chapterId) {
console.log("dddddd", d, sName);
function toFinish(d, sName, chapterOrStageId) {
console.log("dddddd", d, sName, chapterOrStageId);
// 作业过期判断
if (d.type == 4) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
dialogVisibleTip.value ='当前作业已结束';
dialogVisibleTip.value = '当前作业已结束';
dialogVisible.value = true;
// ElMessage.error("当前作业已结束")
return
@@ -396,7 +392,7 @@ function toFinish(d, sName, chapterId) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
dialogVisibleTip.value ='当前直播已结束';
dialogVisibleTip.value = '当前直播已结束';
dialogVisible.value = true;
return
}
@@ -405,7 +401,7 @@ function toFinish(d, sName, chapterId) {
if (d.type == 5) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisible.value = true;
return
}
@@ -414,7 +410,7 @@ function toFinish(d, sName, chapterId) {
if (d.type == 11) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisible.value = true;
return
}
@@ -424,7 +420,7 @@ function toFinish(d, sName, chapterId) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
dialogVisibleTip.value ='当前活动已结束';
dialogVisibleTip.value = '当前活动已结束';
dialogVisible.value = true;
return
}
@@ -433,7 +429,7 @@ function toFinish(d, sName, chapterId) {
if (d.type == 1) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisible.value = true;
return
}
@@ -442,7 +438,7 @@ function toFinish(d, sName, chapterId) {
if (d.type == 2) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisible.value = true;
return
}
@@ -475,6 +471,7 @@ function toFinish(d, sName, chapterId) {
courseId: d.courseId,
pName: data.value.name,
sName,
chapterOrStageId
},
});
} else if (typeof types.value.path[d.type] === "function") {
@@ -491,21 +488,23 @@ function whiteTypes(type) {
.el-dialog__header {
display: none;
}
.crumb {
color: #fff;
display: flex;
font-size: 14px;
line-height: 24px;
.return {
position: absolute;
right: 10%;
.text {
text-align: center;
display: flex;
flex-direction: row;
align-items: center;
}
text-align: center;
display: flex;
flex-direction: row;
align-items: center;
}
}
}