Skip to content

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

update

parent 1aef593d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 443 additions and 196 deletions
src/App.vue
View file @ 8ee419aa
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
} }
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_635492_b5w8t86krqv.css"; @import "//at.alicdn.com/t/font_635492_pnkqfvbvc4.css";
@import "./assets/css/Semibold.css"; @import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css"; @import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css"; @import "./assets/css/fileIcon.css";
......
src/components/Educationvideo.vue
View file @ 8ee419aa
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<template> <template>
<div class="Educationvideo"> <div class="Educationvideo">
<div class="left"> <div class="left">
<ul class="lineUl" style="margin-top:30px"> <ul class="lineUl" style="margin-top:62px">
<li @click="SelectLineId(-1)" :class="msg.LineId ==-1 ? 'Active' : ''"> <li @click="SelectLineId(-1)" :class="msg.LineId ==-1 ? 'Active' : ''">
不限 不限
</li> </li>
...@@ -13,11 +13,13 @@ ...@@ -13,11 +13,13 @@
</div> </div>
<div class="right"> <div class="right">
<div class="search"> <div class="search">
<el-input style="width:600px" placeholder="请输入内容" v-model="msg.Name" class="input-with-select"> <el-input size="small" style="width:600px" placeholder="请输入内容" v-model="msg.Name" class="input-with-select">
<el-button @click="getList" slot="append" icon="el-icon-search"></el-button> <el-button @click="getList" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
<el-button style="margin-left:20px" size="small" type="danger" @click.prevent="goUrl1('EducationvideoList',$event)" round>发布视频</el-button>
</div> </div>
<div class="Content"> <div v-loading="loading" class="Content">
<ul class="videoUl"> <ul class="videoUl">
<li v-for="(item,index) in dataList" :key="index"> <li v-for="(item,index) in dataList" :key="index">
<div @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv"> <div @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
...@@ -35,7 +37,9 @@ ...@@ -35,7 +37,9 @@
</p> </p>
</li> </li>
</ul> </ul>
<div v-if="dataList.length==0" style="text-align:center">暂无数据</div> <div v-if="dataList.length==0" style="text-align:center;padding-top:40px">
<span style="font-size:60px;color:#ccc" class="iconfont icon-wushuju"></span>
</div>
<el-pagination background @current-change="handleCurrentChange" <el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination> </el-pagination>
...@@ -53,7 +57,7 @@ export default { ...@@ -53,7 +57,7 @@ export default {
}, },
data () { data () {
return { return {
defaultImg: 'this.src="' + require("../assets/img/bg_z1@2x.png") + '"', defaultImg: 'this.src="' + require("../assets/img/bg_z1@2x.png") + '"',
val:'', val:'',
LineList:[], LineList:[],
msg:{ msg:{
...@@ -67,6 +71,7 @@ export default { ...@@ -67,6 +71,7 @@ export default {
}, },
dataList:[], dataList:[],
total:0, total:0,
loading:false,
} }
}, },
mounted() { mounted() {
...@@ -84,9 +89,12 @@ export default { ...@@ -84,9 +89,12 @@ export default {
}, },
//获取列表 //获取列表
getList() { getList() {
this.loading=true;
this.apipost( this.apipost(
"Video_get_GetPCVideoPageList",this.msg, "Video_get_GetPCVideoPageList",this.msg,
res => { res => {
this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -133,6 +141,9 @@ export default { ...@@ -133,6 +141,9 @@ export default {
} }
</script> </script>
<style> <style>
.Educationvideo .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #f56c6c!important;
}
.Educationvideo .right .Content .circle{ .Educationvideo .right .Content .circle{
display: inline-block; display: inline-block;
width: 3px; width: 3px;
...@@ -159,14 +170,17 @@ export default { ...@@ -159,14 +170,17 @@ export default {
cursor: pointer; cursor: pointer;
} }
.Educationvideo .right .Content .videoUl li p{ .Educationvideo .right .Content .videoUl li p{
font-size: 14px; font-size: 12px;
color:#666666; color:#666666;
padding-left:6px;
box-sizing: border-box;
} }
.Educationvideo .right .Content .videoUl li{ .Educationvideo .right .Content .videoUl li{
display: inline-block; display: inline-block;
width: 300px; width: 300px;
padding: 5px; padding: 5px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 10px;
} }
.Educationvideo .right .Content{ .Educationvideo .right .Content{
padding:90px 15px 10px 15px; padding:90px 15px 10px 15px;
...@@ -177,15 +191,18 @@ export default { ...@@ -177,15 +191,18 @@ export default {
padding: 0; padding: 0;
} }
.Educationvideo .left .lineUl .Active{ .Educationvideo .left .lineUl .Active{
background: #f5f5f5; color:#fff;
background: #f56c6c;
} }
.Educationvideo .left .lineUl li:hover{ .Educationvideo .left .lineUl li:hover{
background: #f5f5f5; background: #f56c6c;
color:#fff;
} }
.Educationvideo .left .lineUl li{ .Educationvideo .left .lineUl li{
padding:10px 35px; padding:10px 35px;
box-sizing: border-box; box-sizing: border-box;
font-size: 14px; font-size: 12px;
cursor: pointer;
} }
li{ li{
list-style: none; list-style: none;
...@@ -197,9 +214,9 @@ li{ ...@@ -197,9 +214,9 @@ li{
box-sizing: border-box; box-sizing: border-box;
position: fixed; position: fixed;
top: 0; top: 0;
width: calc(100% - 240px); width: calc(100% - 200px);
background: #fff; background: #fff;
left: 240px; left: 200px;
} }
.Educationvideo{ .Educationvideo{
...@@ -210,13 +227,13 @@ li{ ...@@ -210,13 +227,13 @@ li{
.Educationvideo .left{ .Educationvideo .left{
position: fixed; position: fixed;
min-height: 100%; min-height: 100%;
width: 240px; width: 200px;
z-index: 100; z-index: 100;
background: #fff; background: #fff;
} }
.Educationvideo .right{ .Educationvideo .right{
background: #f5f5f5; background: #f5f5f5;
padding-left: 250px; padding-left: 210px;
box-sizing: border-box; box-sizing: border-box;
min-height: 100%; min-height: 100%;
} }
......
src/components/EducationvideoList.vue
View file @ 8ee419aa
This diff is collapsed.
src/components/EducationvideoSee.vue
View file @ 8ee419aa
<template> <template>
<div class="EducationvideoSee"> <div class="EducationvideoSee">
<div class="imgDiv"> <!-- <div class="container"> -->
<video height="500" :src="datainfo.VideoAddress" controls="controls"> <div class="left">
您的浏览器不支持 video 标签。 <div class="imgDiv">
</video> <video style="border: 1px solid #f5f5f5;" width="100%" :height="videoHeight" :src="datainfo.VideoAddress" controls="controls">
<!-- <img style="height:100%;width:100%" src="../assets/img/hotel/biefu.png" alt=""> --> </video>
<!-- <div class="icon"> <p style="font-size:18px;font-family:'PingFangR';margin-top:15px">{{datainfo.Name}}</p>
<span class="iconfont icon-weihu"></span> <p>{{datainfo.EmName}}</p>
</div> --> <p>{{datainfo.WatchNum}}次观看
<p>{{datainfo.Name}}</p> <span class="circle"></span>
<p>{{datainfo.EmName}}</p> <span>{{datainfo.UpdateDate}}</span>
<p>{{datainfo.WatchNum}}次观看 </p>
<span class="circle"></span> </div>
<span>{{datainfo.UpdateDate}}</span>
</p>
</div> </div>
<div class="right">
<ul>
<li @click.prevent="goUrl('EducationvideoSee',item)" v-for="(item,index) in dataList" :key="index">
<img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="height:56px;width:100px" :src="item.Cover" alt="">
<img v-else style="height:56px;width:100px" src="../assets/img/hotel/biefu.png" alt="">
<div class="content">
<p style="font-size:14px">{{item.Name}}</p>
<p style="padding:6px 0">{{item.EmName}}</p>
<p>{{item.WatchNum}}次观看
<span class="circle"></span>
<span>{{item.UpdateDate}}</span>
</p>
</div>
</li>
</ul>
</div>
<!-- </div> -->
</div> </div>
</template> </template>
...@@ -32,21 +49,125 @@ export default { ...@@ -32,21 +49,125 @@ export default {
return { return {
val:'', val:'',
datainfo:{}, datainfo:{},
defaultImg: 'this.src="' + require("../assets/img/bg_z1@2x.png") + '"',
msg:{
pageIndex:1,
pageSize:5,
Name:'',
UserType:1,
VideoStatus:1,
CreateBy:'',
LineId:-1,
},
dataList:[],
videoHeight:0,
} }
}, },
mounted() { mounted() {
if(this.$route.query.msg){ if(this.$route.query.msg){
this.datainfo=JSON.parse(this.$route.query.msg) this.datainfo=JSON.parse(this.$route.query.msg)
console.log("this.datainfo",this.datainfo)
} }
this.getList();
this.AddList(this.datainfo.Id)
let h = document.documentElement.clientHeight || document.body.clientHeight;
this.videoHeight=h-110;
}, },
methods: { methods: {
goUrl(path,item){
let msg=JSON.stringify(item)
let routeData = this.$router.resolve({
name: path,
query: {
msg:msg,
blank: "y"
}
});
window.open(routeData.href, "_blank");
},
AddList(id) {
this.apipost(
"Video_post_SetVideoWatch",{VideoId:id},
res => {
if (res.data.resultCode == 1) {
}
}
);
},
//获取列表
getList() {
this.loading=true;
this.apipost(
"Video_get_GetPCVideoPageList",this.msg,
res => {
this.loading=false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
}
}
);
},
}, },
} }
</script> </script>
<style> <style>
.EducationvideoSee .container{
width: 1200px;
margin: 0 auto;
padding-top:20px;
}
.EducationvideoSee p{
margin: 0;
padding: 0;
}
li{
list-style: none;
}
.EducationvideoSee .right ul li img{
position: absolute;
width: 100px;
height: 60px;
}
.EducationvideoSee .right ul li .content{
padding-left: 115px;
box-sizing: border-box;
font-size: 12px;
}
.EducationvideoSee .right ul li{
position: relative;
/* min-height:64px; */
cursor: pointer;
background: #f5f5f5;
margin-bottom: 15px;
padding:15px;
box-sizing: border-box;
}
.EducationvideoSee .right ul{
width: 100%;
padding:0 10px 10px 10px;
}
.EducationvideoSee .right{
display: inline-block;
padding: 0 10px;
box-sizing: border-box;
width: 400px;
position: absolute;
right:15px;
}
.EducationvideoSee .left{
display: inline-block;
width: calc(100% - 400px);
}
.EducationvideoSee .imgDiv p{
font-size: 12px;
}
.EducationvideoSee .circle{ .EducationvideoSee .circle{
display: inline-block; display: inline-block;
width: 3px; width: 3px;
...@@ -55,8 +176,7 @@ export default { ...@@ -55,8 +176,7 @@ export default {
border-radius: 50%; border-radius: 50%;
} }
.EducationvideoSee .imgDiv{ .EducationvideoSee .imgDiv{
width: 850px; width: 100%;
height: 453px;
position: relative; position: relative;
} }
.EducationvideoSee{ .EducationvideoSee{
...@@ -64,5 +184,6 @@ export default { ...@@ -64,5 +184,6 @@ export default {
background: #fff; background: #fff;
padding: 15px 50px; padding: 15px 50px;
box-sizing: border-box; box-sizing: border-box;
position: relative;
} }
</style> </style>
src/plug/index.js
View file @ 8ee419aa
...@@ -732,16 +732,7 @@ export default { ...@@ -732,16 +732,7 @@ export default {
progress: function* (p) {}, progress: function* (p) {},
mime: 'application/octet-stream' mime: 'application/octet-stream'
}) })
successCall(result);
// var result = oss.multipartUpload(filename, files[index], {
// progress: async function (p, checkpoint) {
// checkpoint = checkpoint
// percentage = p * 100
// },
// checkpoint: that.checkpoint
// })
console.log("result",result)
// successCall(result);
} }
}).catch(function (err) { }).catch(function (err) {
......
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