huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

课程资讯等修复

Browse Source
alioss
yujialong 3 years ago
parent 3a533fd2c1
commit 183453fc00
9 changed files with 220 additions and 201 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/api/index.js
  2. 8
      src/pages/course/details/index.vue
  3. 4
      src/pages/course/list/index.vue
  4. 2
      src/pages/info/details/index.vue
  5. 14
      src/pages/info/list/index.vue
  6. 361
      src/pages/match/list/index.vue
  7. 7
      src/pages/screen/index.vue
  8. 7
      src/pages/station/preview/index.vue
  9. 4
      src/styles/page/screen.scss

14
src/api/index.js
Unescape View File

@ -78,16 +78,16 @@ export default {
// 线上赛事 // 线上赛事
notLoggedInBeforeStudentEvents: `occupationlab/occupationlab/enterprise/match/contest/notLoggedInBeforeStudentEvents`, notLoggedInBeforeStudentEvents: `occupationlab/occupationlab/enterprise/match/contest/notLoggedInBeforeStudentEvents`,
contestPageConditionQueryByOccupationlabStu: `occupationlab/occupationlab/match/contest/contestPageConditionQueryByOccupationlabStu`, contestPageConditionQueryByOccupationlabStu: `occupationlab/occupationlab/enterprise/match/contest/contestPageConditionQueryByOccupationlabStu`,
contestPageConditionQueryByOccupationlab: `occupationlab/occupationlab/match/contest/onlineCompetitionByStudent`, contestPageConditionQueryByOccupationlab: `occupationlab/occupationlab/enterprise/match/contest/onlineCompetitionByStudent`,
listOfRegisteredEvents: `occupationlab/occupationlab/match/contest/listOfRegisteredEvents`, listOfRegisteredEvents: `occupationlab/occupationlab/enterprise/match/contest/listOfRegisteredEvents`,
addApplicant: `occupationlab/occupationlab/match/applicant/addApplicant`, // 添加报名人员 addApplicant: `occupationlab/occupationlab/enterprise/match/applicant/addApplicant`, // 添加报名人员
getContestProgress: `occupationlab/occupationlab/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展 getContestProgress: `occupationlab/occupationlab/enterprise/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展
getContest: `occupationlab/occupationlab/match/contest/getContest`, // 根据id查询赛事 getContest: `occupationlab/occupationlab/enterprise/match/contest/getContest`, // 根据id查询赛事
queryAnnouncementByContestId: `occupationlab/occupationlab/contest/announcement/queryAnnouncementByContestId`, queryAnnouncementByContestId: `occupationlab/occupationlab/contest/announcement/queryAnnouncementByContestId`,
queryAnnouncementDetails: `occupationlab/occupationlab/contest/announcement/queryAnnouncementDetails`, queryAnnouncementDetails: `occupationlab/occupationlab/contest/announcement/queryAnnouncementDetails`,
contestAfterLogin: `occupationlab/occupationlab/enterprise/match/contest/contestAfterLogin`, contestAfterLogin: `occupationlab/occupationlab/enterprise/match/contest/contestAfterLogin`,
cancelRegistration: `occupationlab/occupationlab/match/applicant/cancelRegistration`, cancelRegistration: `occupationlab/occupationlab/enterprise/match/applicant/cancelRegistration`,
// 阿里云文件/视频管理 // 阿里云文件/视频管理
fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件 fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件

8
src/pages/course/details/index.vue
Unescape View File

@ -166,9 +166,10 @@ export default {
document.body.appendChild(scriptTag); document.body.appendChild(scriptTag);
}, },
transferType(ext){ transferType(ext){
if('jpg,jpeg,png,gif,svg,psd'.includes(ext)) return '图片' const suf = ext.toLowerCase()
if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(ext)) return '视频' if('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片'
return ext if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(suf)) return '视频'
return suf
}, },
preview(row, chapterName, showConfirm = 1){ preview(row, chapterName, showConfirm = 1){
// 如果没登录，直接去登录 // 如果没登录，直接去登录
@ -248,7 +249,6 @@ export default {
}else{ }else{
this.showMask2 = false this.showMask2 = false
} }
console.log(33, res)
this.iframeSrc = res.previewUrl this.iframeSrc = res.previewUrl
}) })
.catch(err => { .catch(err => {

4
src/pages/course/list/index.vue
Unescape View File

@ -38,6 +38,10 @@
<i class="el-icon-view"></i> <i class="el-icon-view"></i>
{{ item.pageviews }} {{ item.pageviews }}
</div> </div>
<div class="meta">
<i class="el-icon-user"></i>
{{ item.schoolName }}
</div>
<span v-if="item.courseType == 0" class="type">{{ item.courseType == 1 ? '付费' : '免费'}}</span> <span v-if="item.courseType == 0" class="type">{{ item.courseType == 1 ? '付费' : '免费'}}</span>
</div> </div>
</li> </li>

2
src/pages/info/details/index.vue
Unescape View File

@ -51,7 +51,7 @@ export default {
methods: { methods: {
getData() { getData() {
this.loadIns = Loading.service() this.loadIns = Loading.service()
this.$get(`${this.api.getArticle}/${this.id}`) this.$get(`${this.api.getArticle}?articleId=${this.id}`)
.then(res => { .then(res => {
let data = res.article let data = res.article
this.coverUrl = data.coverUrl this.coverUrl = data.coverUrl

14
src/pages/info/list/index.vue
Unescape View File

@ -4,6 +4,7 @@
<div class="main"> <div class="main">
<div class="center-wrap"> <div class="center-wrap">
<div class="nav"> <div class="nav">
<p class="column-name">{{ $route.query.name }}</p>
<el-menu <el-menu
v-if="menuList.length" v-if="menuList.length"
unique-opened unique-opened
@ -97,6 +98,7 @@ export default {
"setColumnId" "setColumnId"
]), ]),
async getData() { async getData() {
this.deepId = ''
const { parentId } = this.$route.query const { parentId } = this.$route.query
this.setColumnId('') this.setColumnId('')
this.loadIns = Loading.service() this.loadIns = Loading.service()
@ -128,8 +130,9 @@ export default {
this.getContent(historyId) this.getContent(historyId)
} else { } else {
// 正常情况默认展示第一个分类下的文章列表 // 正常情况默认展示第一个分类下的文章列表
data.length && this.getDeepId(data[0].children) data.length && this.getDeepId(data)
const id = this.deepId const id = this.deepId
console.log("🚀 ~ file: index.vue ~ line 133 ~ getData ~ id", id, data)
if (id) { if (id) {
this.getContent(id) this.getContent(id)
this.defaultIndex = id + '' this.defaultIndex = id + ''
@ -144,11 +147,13 @@ export default {
}, },
// 获取最深的层级的id // 获取最深的层级的id
getDeepId(data) { getDeepId(data) {
console.log("🚀 ~ file: index.vue ~ line 148 ~ getDeepId ~ data", data)
data.map(e => { data.map(e => {
if (e.children.length) { if (e.children.length) {
this.getDeepId(e.children) this.getDeepId(e.children)
} else { } else if (!this.deepId) {
this.deepId = e.id this.deepId = e.id
return false
} }
}) })
}, },
@ -226,6 +231,11 @@ export default {
justify-content: center; justify-content: center;
align-items:flex-start; align-items:flex-start;
} }
.column-name {
padding-left: 10px;
margin-bottom: 10px;
font-size: 16px;
}
.nav{ .nav{
width: 156px; width: 156px;
overflow: hidden; overflow: hidden;

361
src/pages/match/list/index.vue
Unescape View File

@ -444,224 +444,225 @@ export default {
.main{ .main{
background: url(../../../assets/img/match-bg1.png) (0px 95px)/auto auto no-repeat, background: url(../../../assets/img/match-bg1.png) (0px 95px)/auto auto no-repeat,
url(../../../assets/img/match-bg2.png) (98% bottom)/auto auto no-repeat; url(../../../assets/img/match-bg2.png) (98% bottom)/auto auto no-repeat;
.filter { }
width: 100%; .filter {
padding: 0 20px; width: 100%;
margin-bottom: 20px; padding: 0 20px;
background-color: #fff; margin-bottom: 20px;
dl { background-color: #fff;
display: flex; dl {
align-items: center;
margin: 20px 0;
dt {
color: #333;
font-size: 16px;
font-weight: 600;
white-space: nowrap;
}
dd {
padding: 5px 15px;
color: #6a6a6a;
font-size: 16px;
white-space: nowrap;
cursor: pointer;
border-radius: 4px;
&.active {
color: $main-color;
background-color: #e6f0ff;
}
}
}
}
.select-wrap {
display: inline-flex;
align-items: center;
margin: 0 10px;
.label {
margin-right: 10px;
white-space: nowrap;
}
.el-select {
width: 130px;
}
}
.list-inner {
display: flex; display: flex;
justify-content: center; align-items: center;
align-items:flex-start; margin: 20px 0;
} dt {
.nav{ color: #333;
width: 156px; font-size: 16px;
text-align: right; font-weight: 600;
overflow: hidden; white-space: nowrap;
background-color: #fff; }
li { dd {
padding: 0 24px; padding: 5px 15px;
color: #6a6a6a;
font-size: 16px; font-size: 16px;
color: #666; white-space: nowrap;
line-height: 48px;
border-bottom: 2px solid #f3f6fa;
border-right: 2px solid transparent;
cursor: pointer; cursor: pointer;
&:before { border-radius: 4px;
content: '';
display: inline-block;
width: 3px;
height: 3px;
margin-right: 10px;
vertical-align: middle;
border-radius: 50%;
background-color: #666;
}
&.active { &.active {
color: $main-color; color: $main-color;
border-right-color: $main-color; background-color: #e6f0ff;
&:before { }
background-color: $main-color; }
} }
}
.select-wrap {
display: inline-flex;
align-items: center;
margin: 0 10px;
.label {
margin-right: 10px;
white-space: nowrap;
}
.el-select {
width: 130px;
}
}
.list-inner {
display: flex;
justify-content: center;
align-items:flex-start;
}
.nav{
width: 156px;
text-align: right;
overflow: hidden;
background-color: #fff;
li {
padding: 0 24px;
font-size: 16px;
color: #666;
line-height: 48px;
border-bottom: 2px solid #f3f6fa;
border-right: 2px solid transparent;
cursor: pointer;
&:before {
content: '';
display: inline-block;
width: 3px;
height: 3px;
margin-right: 10px;
vertical-align: middle;
border-radius: 50%;
background-color: #666;
}
&.active {
color: $main-color;
border-right-color: $main-color;
&:before {
background-color: $main-color;
} }
} }
} }
.list-wrap { }
width: calc(100% - 180px); .list-wrap {
margin-left: 24px; width: calc(100% - 180px);
.list { margin-left: 24px;
li { .list {
li {
display: flex;
justify-content: space-between;
padding: 16px;
margin-bottom: 12px;
transition: all 0.3s;
cursor: pointer;
border-radius: 6px;
background-color: #fff;
.right {
display: flex; display: flex;
justify-content: space-between; flex-direction: column;
padding: 16px; justify-content: center;
margin-bottom: 12px; align-items: flex-end;
transition: all 0.3s; flex: 1;
cursor: pointer;
border-radius: 6px;
background-color: #fff;
.right {
display: flex;
flex-direction: column;
justify-content: center;
align-items: flex-end;
flex: 1;
.status { .status {
padding: 0 23px; padding: 0 23px;
line-height: 34px; line-height: 34px;
font-size: 14px; font-size: 14px;
color: #fff; color: #fff;
background-color: #52C41A; white-space: nowrap;
border-radius: 4px; background-color: #52C41A;
&.wait { border-radius: 4px;
background-color: #FAAD14; &.wait {
} background-color: #FAAD14;
}
&.signing { &.signing {
background-color: $main-color; background-color: $main-color;
} }
&.signed { &.signed {
background-color: #52C41A; background-color: #52C41A;
} }
&.playing { &.playing {
background-color: #f96d6d; background-color: #f96d6d;
} }
&.finish { &.finish {
background-color: #ccc; background-color: #ccc;
}
} }
}
.btn { .btn {
padding: 12px 20px; padding: 12px 20px;
color: #fff; color: #fff;
background-color: #cb221c; background-color: #cb221c;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
opacity: .9; opacity: .9;
} }
&.disabled { &.disabled {
cursor: not-allowed; cursor: not-allowed;
background-color: #969696; background-color: #969696;
}
} }
}
.end-text { .end-text {
margin-top: 10px; margin-top: 10px;
color: rgba(0, 0, 0, .65); color: rgba(0, 0, 0, .65);
font-size: 12px; font-size: 12px;
white-space: nowrap; white-space: nowrap;
em { em {
font-style: normal; font-style: normal;
color: #f00; color: #f00;
}
} }
} }
}
&:hover { &:hover {
.left { .left {
.info { .info {
.title { .title {
color: $main-color; color: $main-color;
}
} }
} }
} }
} }
.left { }
display: inline-flex; .left {
.cover { display: inline-flex;
img { .cover {
width: 220px; img {
height: 140px; width: 220px;
border-radius: 6px; height: 140px;
} border-radius: 6px;
} }
}
.info { .info {
margin-left: 16px; margin-left: 16px;
.title { .title {
margin-bottom: 5px;
font-size: 20px;
font-weight: 500;
color: #0B1D30;
line-height: 1;
}
.metas {
font-size: 14px;
color: #666;
div {
display: flex;
align-items: center;
margin-bottom: 5px; margin-bottom: 5px;
font-size: 20px;
font-weight: 500;
color: #0B1D30;
line-height: 1;
}
.metas {
font-size: 14px;
color: #666;
div {
display: flex;
align-items: center;
margin-bottom: 5px;
&.flex-top { &.flex-top {
align-items: flex-start; align-items: flex-start;
}
}
.label, .val {
font-size: 14px;
color: #666;
white-space: nowrap;
} }
}
.val { .label, .val {
max-width: 350px; font-size: 14px;
text-overflow: ellipsis; color: #666;
overflow: hidden; white-space: nowrap;
} }
.a-line { .val {
display: block; max-width: 350px;
} text-overflow: ellipsis;
overflow: hidden;
} }
.desc { .a-line {
font-size: 14px; display: block;
} }
} }
.desc {
font-size: 14px;
}
} }
} }
} }

7
src/pages/screen/index.vue
Unescape View File

@ -435,12 +435,14 @@ export default {
label: { label: {
normal: { normal: {
show: true, show: true,
alignTo: 'none',
lineHeight: 18,
formatter: '{b} {c}' formatter: '{b} {c}'
} }
}, },
data:[ data:[
{value: data.totalNumberOfExams, name:'参考总场次'}, {value: data.totalNumberOfExams, name:'考试\n总场次'},
{value: data.referenceNumber, name:'参考人数'}, {value: data.referenceNumber, name:'考试\n人数'},
] ]
} }
] ]
@ -508,6 +510,7 @@ export default {
grid: { grid: {
left: '3%', left: '3%',
right: '4%', right: '4%',
top: '30%',
bottom: '3%', bottom: '3%',
containLabel: true containLabel: true
}, },

7
src/pages/station/preview/index.vue
Unescape View File

@ -208,9 +208,10 @@ export default {
}); });
}, },
transferType(ext) { transferType(ext) {
if ("jpg,jpeg,png,gif,svg,psd".includes(ext)) return "图片"; const suf = ext.toLowerCase()
if ("mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv".includes(ext)) return "视频"; if('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片'
return ext; if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(suf)) return '视频'
return suf
}, },
preview(row, chapterName) { preview(row, chapterName) {
this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况 this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况

4
src/styles/page/screen.scss
Unescape View File

@ -17,8 +17,8 @@ body {
.video { .video {
position: absolute; position: absolute;
top: 0; top: 0;
left: -500px; left: -20%;
width: 100vw; width: 150%;
// height: 720px; // height: 720px;
} }
.wrap { .wrap {

Write Preview
Loading…
Cancel
Save