20200529-zlp-2

1新增视频学习列表页(标题兼容性)
2删除讲师为软删除

ruoyi-ui/src/views/benyi_train/video/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="视频标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
+      <el-form-item label="所属类别" prop="type">
+        <el-cascader
+          placeholder="请选择所属类别"
+          v-model="queryParams.type"
+          :options="optionTypes"
+          :props="{ checkStrictly: true, value: 'id', label: 'name' }"
           clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-          placeholder="请输入培训视频标题"
-        />
+        ></el-cascader>
       </el-form-item>
       <el-form-item label="讲师姓名" prop="lecturer">
         <el-select v-model="queryParams.lecturer" filterable placeholder="请选择讲师">
@@ -20,14 +20,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="所属类别" prop="type">
-        <el-cascader
-          placeholder="请选择所属类别"
-          v-model="queryParams.type"
-          :options="optionTypes"
-          :props="{ checkStrictly: true, value: 'id', label: 'name' }"
+      <el-form-item label="视频标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
           clearable
-        ></el-cascader>
+          size="small"
+          @keyup.enter.native="handleQuery"
+          placeholder="请输入培训视频标题"
+        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

ruoyi-ui/src/views/benyi_train/video_study/index.vue

@@ -42,12 +42,15 @@
             controlslist="nodownload"
             oncontextmenu="return false"
             :src="[qiniuUrl + '/' + o.videourl]"
-            class="avatar"
+            class="videoavatar"
           ></video>
           <div style="padding: 14px;">
-            <span class="word-space-ellipsis" :title="o.title">{{o.title+" (讲师:"+o.lecturer+")"}}</span>
+            <el-tooltip effect="dark" :content="o.title" placement="bottom">
+              <el-button class="info-title">{{o.title+" (讲师:"+o.lecturername+")"}}</el-button>
+            </el-tooltip>
             <div class="bottom clearfix">
               <time class="time">{{ parseTime(o.createtime) }}</time>
+              <el-button type="text" class="button">进入详情页</el-button>
             </div>
           </div>
         </el-card>
@@ -159,7 +162,24 @@ export default {
   color: #999;
 }
 
-.avatar {
+.bottom {
+  margin-top: 13px;
+  line-height: 12px;
+}
+
+.button {
+  padding: 0;
+  float: right;
+}
+
+.info-title{
+	width: 100%;    /*根据自己项目进行定义宽度*/
+	overflow: hidden;     /*设置超出的部分进行影藏*/
+	text-overflow: ellipsis;     /*设置超出部分使用省略号*/
+	white-space:nowrap ;    /*设置为单行*/
+}
+
+.videoavatar {
   width: 100%;
   display: block;
 }