Skip to content

S
SuperMan
Commit 64017227 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 8e4a59c5
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 17 deletions
src/components/Educationvideo.vue
View file @ 64017227
......@@ -23,8 +23,8 @@
<ul class="videoUl">
<li v-for="(item,index) in dataList" :key="index">
<div @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
<img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="height:195px;width:100%" :src="item.Cover" alt="">
<img v-else style="height:195px;width:100%" src="../assets/img/hotel/biefu.png" alt="">
<img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="min-height:199px;width:100%" :src="item.Cover" alt="">
<img v-else style="height:199px;width:100%" src="../assets/img/hotel/biefu.png" alt="">
<div class="backDiv">
<span class="iconfont icon-ico_bofang"></span>
<!-- <div @click.prevent="goUrl1('EducationvideoList',$event)" class="icon">
......@@ -37,10 +37,13 @@
<img v-if="item.EmPhoto && item.EmPhoto!=''" :src="item.EmPhoto" alt="">
<img v-else src="../assets/img/default.png" alt="">
<div class="DesDiv">
<p style="font-size:14px" class="bold">{{item.Name}}</p>
<el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start">
<p style="font-size:14px" class="bold text1">{{item.Name}}</p>
</el-tooltip>
<p class="wryh" style="color:#aaaaaa">{{item.EmName}}</p>
<p class="wryh" style="color:#aaaaaa">{{item.WatchNum}}次观看
<span class="circle"></span>
<span style="margin-left:5pxy"></span>
<span>{{item.UpdateDate}}</span>
</p>
</div>
......@@ -60,7 +63,10 @@
</div>
<div class="videoDiv" v-show="videoDivState">
<div style="text-align:right;padding-right:15px;cursor:pointer"><span @click="Setvideo" style="font-size:30px;color:#fff" class="iconfont icon-bumenguanli-shanchu"></span></div>
<video ref="myVideo" autoplay="autoplay" width="100%" height="90%" :src="thisVideoAddress" controls="controls"></video>
<video ref="myVideo" autoplay="autoplay" width="100%" height="90%" :src="thisVideoAddress" controls="controls">
<source :src="thisVideoAddress" type="video/mp4">
<source :src="thisVideoAddress" type="video/ogg">
</video>
</div>
......@@ -212,12 +218,11 @@ export default {
//获取线路列表
getLineList() {
this.apipost(
"line_post_GetList", {
LineDirection: 2
},
"Video_get_GetPCVideoLineList", {},
res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
}
);
......@@ -227,6 +232,14 @@ export default {
}
</script>
<style>
.text1{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
height:20px;
}
.wryh{
font-family: '微软雅黑'
}
......@@ -300,6 +313,8 @@ export default {
.Educationvideo .right .Content .videoUl li .imgDiv{
position: relative;
cursor: pointer;
height:199px;
overflow:hidden;
}
.Educationvideo .right .Content .videoUl li p{
font-size: 12px;
......
src/components/EducationvideoList.vue
View file @ 64017227
......@@ -20,8 +20,8 @@
<ul class="videoUl">
<li v-for="(item,index) in dataList" :key="index">
<div @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
<img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="height:195px;width:100%" :src="item.Cover" alt="">
<img v-else style="height:195px;width:100%" src="../assets/img/hotel/biefu.png" alt="">
<img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="min-height: 199px;width:100%" :src="item.Cover" alt="">
<img v-else style="height:199px;width:100%" src="../assets/img/hotel/biefu.png" alt="">
<div class="backDiv">
<span class="iconfont icon-ico_bofang"></span>
<div class="icon">
......@@ -50,7 +50,9 @@
<img v-if="item.EmPhoto && item.EmPhoto!=''" :src="item.EmPhoto" alt="">
<img v-else src="../assets/img/default.png" alt="">
<div class="DesDiv">
<p style="font-size:14px" class="bold">{{item.Name}}</p>
<el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start">
<p style="font-size:14px" class="bold text1">{{item.Name}}</p>
</el-tooltip>
<p class="wryh" style="color:#aaaaaa">{{item.EmName}}
<span class="bold" style="color:#f56c6c">(
<span v-if="item.VideoStatus==1">发布</span>
......@@ -60,7 +62,7 @@
</span>
</p>
<p class="wryh" style="color:#aaaaaa">{{item.WatchNum}}次观看
<span class="circle"></span>
<span stryle="margin-left:5px"> </span>
<span>{{item.UpdateDate}}</span>
</p>
</div>
......@@ -279,7 +281,7 @@ export default {
// });
// },
uploadFileBtn(file) {
if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'video/mov'].indexOf(file.file.type) == -1) {
if (['video/mp4', 'video/ogg','video/avi', 'video/wmv', 'video/rmvb', 'video/mov'].indexOf(file.file.type) == -1) {
this.Error("请上传正确的视频格式");
return;
}
......@@ -288,7 +290,7 @@ export default {
let path = "/Sale/Uploadvideo/";
this.uploadFile(path, newArr, x => {
this.addMsg.VideoAddress=this.baseurl+x.name;
let lastUrl="?x-oss-process=video/snapshot,t_9,f_jpg,w_290,h_195,m_fast";
let lastUrl="?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
this.addMsg.Cover=this.addMsg.VideoAddress+lastUrl;
});
},
......@@ -438,9 +440,7 @@ export default {
//获取线路列表
getLineList() {
this.apipost(
"line_post_GetList", {
LineDirection: 2
},
"Video_get_GetPCVideoLineList", {},
res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
......@@ -453,6 +453,14 @@ export default {
}
</script>
<style>
.text1{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
height:20px;
}
.EducationvideoList .el-upload-dragger .el-upload__text{
font-family: '微软雅黑';
font-size: 12px;
......@@ -571,6 +579,8 @@ export default {
.EducationvideoList .right .Content .videoUl li .imgDiv{
position: relative;
cursor: pointer;
height:199px;
overflow:hidden;
}
.EducationvideoList .right .Content .videoUl li p{
font-size: 12px;
......
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