Skip to content

C
confucius
Commit 9e2c5c3c authored by 罗超's avatar 罗超
Browse files
Options

1

parent 2747b1b3
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 22 deletions
src/components/school/classroom/classroom-form.vue
View file @ 9e2c5c3c
......@@ -22,7 +22,7 @@
<div class="row wrap">
<el-time-select
class="q-mr-lg"
:editable="false"
v-model="objOption.StartTime"
:picker-options="{
start: '00:00',
......@@ -30,19 +30,19 @@
end: '23:55',
maxTime:objOption.EndTime
}"
placeholder="排班开始时间">
placeholder="排班开始时间(格式00:00)">
</el-time-select>
<el-time-select
v-model="objOption.EndTime"
:editable="false"
:picker-options="{
start: '06:00',
step: '00:15',
end: '23:55',
minTime:objOption.StartTime
}"
placeholder="排班结束时间">
placeholder="排班结束时间(格式00:00)">
</el-time-select>
</div>
<div class="row wrap" style="padding-top:20px">
......@@ -100,9 +100,10 @@
}
},
created() {
this.getSchool();
},
mounted() {
this.getSchool();
this.initObj();
},
methods: {
......@@ -121,7 +122,6 @@
this.objOption.SeatNum=res.Data.SeatNum;//座位数
this.objOption.RoomPicList=res.Data.RoomPic;//教室图片
}
console.log(this.objOption)
});
} else {
this.optionTitle = "新增教室";
......@@ -132,7 +132,6 @@
this.objOption.EndTime="";//排班结束时间
this.objOption.SeatNum=0;//座位数
this.objOption.RoomPicList=[];//教室图片
console.log(2,this.objOption)
}
},
//获取校区列表
......
src/index.template.html
View file @ 9e2c5c3c
......@@ -14,6 +14,8 @@
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png">
<link rel="icon" type="image/ico" href="favicon.ico">
<link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.8.2/skins/default/aliplayer-min.css"/>
<script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.9.3/aliplayer-min.js"></script>
</head>
<body>
<!-- DO NOT touch the following DIV -->
......
src/pages/classroom/Scheduling.vue
View file @ 9e2c5c3c
......@@ -84,7 +84,7 @@ import {
classroom:'樱花教室',
user:80,
warn:0,
course:[{time:'09:30',info:"打开门面，把电视打开，打扫前台和每处卫生。"},{time:'09:30',info:"打开门面，把电视打开，打扫前台和每处卫生。"},{time:'12:30',info:"打开门面，把电视打开，打扫前台和每处卫生。"}]
course:[]
},
]
}
......
src/pages/classroom/components/scenicSummary.vue
View file @ 9e2c5c3c
......@@ -118,7 +118,7 @@ export default {
props:{
tbodayData:{
type:Array,
default:null
},
startT:{
type:String,
......
src/pages/classroom/components/schedul-visit.vue
View file @ 9e2c5c3c
......@@ -124,7 +124,7 @@
props: {
tabledata: {
type: Array,
default: []
},
},
......
src/pages/classroom/components/userHistory.vue
View file @ 9e2c5c3c
......@@ -3,8 +3,8 @@
<div class="con">
<div class="header">
<img class="img-head" src="../../../assets/images/classroom/admin.png" mode="" />
<div>
<img class="img-head" src="../../../assets/images/logo.png" mode="" />
<div class="head-title">
{{details.ErrorTitle}}
</div>
......@@ -20,7 +20,7 @@
</div>
</div>
<div class="use">
<div class="use-title">用途</div>
<!-- <div class="use-title">用途</div> -->
<div class="use-con">{{details.ErrorContent}}</div>
</div>
<div class="use">
......@@ -139,6 +139,7 @@
color: #2961FE;
}
.con{
box-sizing: border-box;
width: 500px;
height: 1080px;
background: #FFFFFF;
......@@ -154,9 +155,15 @@
.img-head{
width: 35px;
height: 35px;
border-radius: 50%;
// border-radius: 50%;
background-color: #B0C9FC;
margin-right: 10px;
object-fit: fill;
}
.head-title{
white-space: nowrap;
overflow: hidden;
text-overflow:ellipsis;
}
.img-head-close{
width: 15px;
......@@ -179,7 +186,6 @@
font-family: Microsoft YaHei;
font-weight: 400;
.user-item{
width: 500px;
display: flex;
margin-top: 20px;
.user-label{
......
src/pages/classroom/courseInfo.vue
View file @ 9e2c5c3c
<style>
<style scoped>
#player-con{
width: 100%;
height: 500px;
background-color: #eee;
}
.no-video{
width: 800px;
height: 450px;
margin: 0 auto;
background-color: #000;
display: flex;
align-items: center;
justify-content:center;
color: #fff;
font-size: 30px;
}
.title{
color: #000000;
font-size: 18px;
font-weight: bold;
margin-bottom: 20px;
}
.scheduInfo {
height: 100%;
width: 100%;
......@@ -249,9 +271,9 @@
<div class="col scroll schScroll">
<schedulHead :dataList="dataList"></schedulHead>
<div class="Sche_Bottom">
<div>
</div>
<div class="title">课程录像</div>
<div class="no-video" v-if="!dataList.VideoUrl">暂无视频</div>
<div id="player-con" v-if="dataList.VideoUrl"></div>
<schedulVisit :tabledata="dataList.GuestList"></schedulVisit>
</div>
</div>
......@@ -260,6 +282,7 @@
</template>
<script>
import {getTimeDetail} from '../../api/classroom/index'
import {getVideoPlayAuth,getVideoPlayUrl} from '../../api/classroom/video'
import schedulVisit from './components/schedul-visit'
import schedulHead from './components/schedul-head'
......@@ -272,24 +295,68 @@
data() {
return {
dataList: {},
player:null,
}
},
created() {
if (this.$route.query.id) {
this.id = this.$route.query.id;
this.getdata();
}
},
mounted(){
this.getdata();
},
methods: {
getdata(){
getTimeDetail({ID:this.id}).then(res=>{
if(res.Code===1){
this.dataList=res.Data
if(res.Data.VideoUrl){
this.getAuth(res.Data.VideoUrl)
}
}
})
},
//初始化视频播放器
initPlayer(url,cover,auth){
this.player = new Aliplayer({
"id": "player-con",
"source": url,
"width": "100%",
"height": "500px",
"autoplay": true,
"isLive": false,
"rePlay": false,
"playsinline": true,
"preload": true,
"controlBarVisibility": "hover",
"useH5Prism": true,
"cover":cover,
"playauth":auth,
}, function (player) {
console.log(321,player)
console.log("The player is created");
}
);
},
getAuth(url){
getVideoPlayAuth({strVid:url}).then(res=>{
if(res.Code===1&&res.Data.PlayAuth){
this.getUrl(url,res.Data.PlayAuth)
}
})
},
getUrl(url,auth){
getVideoPlayUrl({strVid:url}).then(res=>{
if(res.Code===1){
this.initPlayer(res.Data.URL,res.Data.VideoImg,auth)
}
})
}
},
}
......
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