Commit f3388698 authored by zhangjianqian's avatar zhangjianqian

我的课程,展示区分培训和考试

parent af805e00
......@@ -31,4 +31,6 @@ public class UserCourseVo {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String dataKind;
}
......@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="userCourseList" resultType="com.zehong.system.domain.vo.UserCourseVo">
SELECT uc.user_course_id AS userCourseId,uc.state ,uc.examination_time AS examinationTime,
uc.`examination_result` AS examinationResult,uc.`create_time` AS createTime,
c.`course_name` AS courseName, c.`topic_num` AS topicNum,c.`release_time` AS releaseTime,
c.`course_name` AS courseName, c.`topic_num` AS topicNum,c.`release_time` AS releaseTime,c.data_kind as dataKind,
p.`plan_name` AS courseType,c.course_id as courseId,c.qualified_num as qualifiedNum
FROM t_train_user_course uc
LEFT JOIN t_train_course c ON c.`course_id` = uc.`course_id`
......
......@@ -8,8 +8,12 @@
-->
<template>
<div class="item flex">
<div class="title">{{ itemData.courseType||'-' }}</div>
<div class="lesson">{{ itemData.courseName }}</div>
<div class="title" style="text-align: center">{{ itemData.courseType||'-' }}</div>
<div class="allone">
<img v-if="itemData.dataKind==0" style="height: 18px" src="@/assets/img/ykao.png"/>
<img v-if="itemData.dataKind==1" style="height: 18px" src="@/assets/img/skao.png"/>
<div class="lesson" style="width: 75%"> {{ itemData.courseName }}</div>
</div>
<div class="time">发布时间:{{ itemData.createTime }}</div>
<div class="bottom flex">
<div @click="click" class="btn" :class="{ again: yesOrNo }">
......@@ -133,6 +137,11 @@ export default {
}
}
}
.allone{
display:flex;
flex-direction:row;
justify-content:flex-start;
}
.img {
position: absolute;
width: 100px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment