m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'dev_aliyun' and 'newopenshixun0316' of https://bdgit.educoder.net/Hjqreturn/educoder into newopenshixun0316

Browse Source
courseware
杨树明 5 years ago
parent 0dfb20c5bf 661daf612d
commit 309b9f2a4b
4 changed files with 313 additions and 193 deletions
Show Stats Download Patch File Download Diff File

5
app/controllers/courses_controller.rb
Unescape View File

@ -1514,7 +1514,7 @@ class CoursesController < ApplicationController
# 学生角度观看课堂视频的记录 # 学生角度观看课堂视频的记录
def own_watch_histories def own_watch_histories
@current_user = current_user @current_user = current_user
@videos = CourseVideo.joins(" @videos = CourseVideo.joins("
JOIN videos ON course_videos.course_id = #{@course.id} AND videos.id = course_videos.video_id JOIN videos ON course_videos.course_id = #{@course.id} AND videos.id = course_videos.video_id
JOIN watch_course_videos ON course_videos.id = watch_course_videos.course_video_id AND watch_course_videos.user_id = #{current_user.id} JOIN watch_course_videos ON course_videos.id = watch_course_videos.course_video_id AND watch_course_videos.user_id = #{current_user.id}
@ -1548,7 +1548,8 @@ class CoursesController < ApplicationController
render json: { render json: {
total_duration: @total_duration, total_duration: @total_duration,
freq: @frequencies, freq: @frequencies,
people_num: @people_num people_num: @people_num,
begin_at: '2020-03-13 24:00'
} }
end end

2
public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js
Unescape View File

@ -36,7 +36,7 @@ class Videostatisticscom extends Component {
<div className="ws100s teacherentrydivs "> <div className="ws100s teacherentrydivs ">
<div className="ws100s sortinxdirection"> <div className="ws100s sortinxdirection">
<div className="ws50s sptits">视频统计总览</div> <div className="ws50s sptits">视频统计总览</div>
<div className="ws50s sptitss xaxisreverseorder">播放数据从2020-03-13 24:00开始统计</div> <div className="ws50s sptitss xaxisreverseorder">播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计</div>
</div> </div>
<style> <style>
{ {

375
public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
Unescape View File

@ -1,24 +1,23 @@
import React, {Component} from "react"; import React, {Component} from "react";
import '../../signin/css/signincdi.css'; import '../../signin/css/signincdi.css';
import {Pagination,Table, Menu, Dropdown} from 'antd'; import {Pagination, Table, Menu, Dropdown} from 'antd';
import {getImageUrl,sortDirections} from 'educoder'; import {getImageUrl, sortDirections} from 'educoder';
import axios from 'axios'; import axios from 'axios';
import LoadingSpin from "../../../../common/LoadingSpin"; import LoadingSpin from "../../../../common/LoadingSpin";
import NoneDatas from "../../signin/component/NoneDatas"; import NoneDatas from "../../signin/component/NoneDatas";
//条目 //条目
class Videostatisticscom extends Component { class Videostatisticscomtwo extends Component {
//条目组件 //条目组件
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
data:[], data: [],
page:1, page: 1,
limit:10, limit: 10,
members_count:0, members_count: 0,
columnsstu: [ columnsstu: [
{ {
title: '序号', title: '序号',
@ -50,8 +49,8 @@ class Videostatisticscom extends Component {
className: 'font-14', className: 'font-14',
width: '98px', width: '98px',
render: (text, record) => ( render: (text, record) => (
<span style={{width: '98px'}}>{record.is_finished===true? <span style={{width: '98px'}}>{record.is_finished === true ?
<span style={{color:"#5091FF"}}>是</span>:<span style={{color:"#E02020"}}>否</span>}</span> <span style={{color: "#5091FF"}}>是</span> : <span style={{color: "#E02020"}}>否</span>}</span>
), ),
}, },
{ {
@ -88,7 +87,7 @@ class Videostatisticscom extends Component {
className: 'font-14 maxnamewidth100s', className: 'font-14 maxnamewidth100s',
width: '100px', width: '100px',
render: (text, record) => ( render: (text, record) => (
<span style={{width: '100px',color:'#5091FF'}} className="xiaoshou" >{record.start_at}</span> <span style={{width: '100px', color: '#5091FF'}} className="xiaoshou">{record.start_at}</span>
), ),
}, },
{ {
@ -99,40 +98,40 @@ class Videostatisticscom extends Component {
className: 'font-14 maxnamewidth100s', className: 'font-14 maxnamewidth100s',
width: '100px', width: '100px',
render: (text, record) => ( render: (text, record) => (
<span style={{width: '100px',color:'#5091FF'}} className="xiaoshou" >{record.end_at}</span> <span style={{width: '100px', color: '#5091FF'}} className="xiaoshou">{record.end_at}</span>
), ),
} }
], ],
loading:false, loading: false,
order:undefined, order: undefined,
course_groups:[], course_groups: [],
fbbool:false, fbbool: false,
groupsid:null, groupsid: null,
} }
} }
componentDidMount() { componentDidMount() {
this.setState({ this.setState({
order:undefined order: undefined
}) })
if(this.props.isAdmin()){ if (this.props.isAdmin()) {
//老师 //老师
const CourseId=this.props.match.params.coursesId; const CourseId = this.props.match.params.coursesId;
var data={ var data = {
id:CourseId, id: CourseId,
page:this.state.page, page: this.state.page,
} }
this.getdatas(data); this.getdatas(data);
}else{ } else {
//学生 //学生
var data={ var data = {
page:this.state.page, page: this.state.page,
} }
this.getdatas(data); this.getdatas(data);
} }
this.fenbans(); this.fenbans();
} }
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
@ -141,21 +140,21 @@ class Videostatisticscom extends Component {
} }
//分班 //分班
fenbans=()=>{ fenbans = () => {
const CourseId=this.props.match.params.coursesId; const CourseId = this.props.match.params.coursesId;
let url=`/courses/${CourseId}/course_groups.json`; let url = `/courses/${CourseId}/course_groups.json`;
axios.get(url).then((response) => { axios.get(url).then((response) => {
if(response){ if (response) {
console.log("分班"); console.log("分班");
console.log("response"); console.log("response");
console.log(response); console.log(response);
this.setState({ this.setState({
course_groups:response.data.course_groups, course_groups: response.data.course_groups,
current_group_id:response.data.current_group_id, current_group_id: response.data.current_group_id,
none_group_member_count:response.data.none_group_member_count, none_group_member_count: response.data.none_group_member_count,
group_count:response.data.group_count, group_count: response.data.group_count,
}) })
} }
}).catch((error) => { }).catch((error) => {
@ -163,101 +162,117 @@ class Videostatisticscom extends Component {
} }
//学生 //学生
getdatas=(data)=>{ getdatas = (data) => {
this.setState({ this.setState({
loading:true loading: true
}) })
const CourseId=this.props.match.params.coursesId; const CourseId = this.props.match.params.coursesId;
let url=""; let url = "";
if(this.props.isAdmin()){ if (this.props.isAdmin()) {
url=`/course_videos/${this.props.tisid}/watch_histories.json`; url = `/course_videos/${this.props.tisid}/watch_histories.json`;
}else { } else {
url=`/courses/${CourseId}/own_watch_histories.json`; url = `/courses/${CourseId}/own_watch_histories.json`;
} }
axios.get(url,{params:data}).then((response) => { axios.get(url, {params: data}).then((response) => {
if(response){ if (response) {
if(response.data){ if (response.data) {
if(response.data.data.length>0){ if (response.data.data.length > 0) {
let datalists=[]; let datalists = [];
for (var i = 0; i < response.data.data.length; i++) { for (var i = 0; i < response.data.data.length; i++) {
datalists.push({ datalists.push({
number: (parseInt(page) - 1) * parseInt(limit) + (i + 1), number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
user_name:response.data.data[i].user_name, user_name: response.data.data[i].user_name,
is_finished:response.data.data[i].is_finished, is_finished: response.data.data[i].is_finished,
total_duration:response.data.data[i].total_duration, total_duration: response.data.data[i].total_duration,
feq:response.data.data[i].feq, feq: response.data.data[i].feq,
start_at:response.data.data[i].start_at, start_at: response.data.data[i].start_at,
end_at:response.data.data[i].end_at, end_at: response.data.data[i].end_at,
}) })
} }
this.setState({ this.setState({
data:datalists, data: datalists,
members_count:response.data.count, members_count: response.data.count,
}) })
}else{ } else {
this.setState({ this.setState({
data:[], data: [],
members_count:response.data.count, members_count: response.data.count,
}) })
} }
}else{ } else {
this.setState({ this.setState({
data:[], data: [],
members_count:response.data.count, members_count: response.data.count,
}) })
} }
}
}
this.setState({ this.setState({
loading:false loading: false
}) })
}).catch((error) => { }).catch((error) => {
this.setState({ this.setState({
loading:false loading: false
}) })
}); });
} }
paginationonChange = (pageNumber) => { paginationonChange = (pageNumber) => {
this.setState({ this.setState({
page: pageNumber, page: pageNumber,
}) })
} let data = {}
fenbanone=()=>{ if (this.props.isAdmin()) {
if(this.state.fbbool===false){ //老师
this.setState({ const CourseId = this.props.match.params.coursesId;
fbbool:true data = {
}) id: CourseId,
}else{ page: pageNumber,
this.setState({ group_id: this.state.groupsid,
fbbool:false order: this.state.order,
}) }
} else {
//学生
data = {
page: pageNumber,
order: this.state.order,
} }
}
this.getdatas(data);
}
fenbanone = () => {
if (this.state.fbbool === false) {
this.setState({
fbbool: true
})
} else {
this.setState({
fbbool: false
})
}
} }
setcourse_groups=(id)=>{ setcourse_groups = (id) => {
this.setState({ this.setState({
groupsid:id groupsid: id
}) })
//老师 //老师
const CourseId=this.props.match.params.coursesId; const CourseId = this.props.match.params.coursesId;
var data={}; var data = {};
if(id){ if (id) {
data={ data = {
id:CourseId, id: CourseId,
page:this.state.page, page: this.state.page,
group_id:id group_id: id
} }
}else { } else {
data={ data = {
id:CourseId, id: CourseId,
page:this.state.page page: this.state.page
} }
} }
this.getdatas(data); this.getdatas(data);
@ -270,39 +285,39 @@ class Videostatisticscom extends Component {
} else { } else {
try { try {
//学生学号排序 //学生学号排序
if (sorter.columnKey === "total_duration"||sorter.columnKey === "feq") { if (sorter.columnKey === "total_duration" || sorter.columnKey === "feq") {
let mysorder=""; let mysorder = "";
if (sorter.order === "ascend") { if (sorter.order === "ascend") {
if(sorter.columnKey === "total_duration"){ if (sorter.columnKey === "total_duration") {
mysorder="total_duration-asc"; mysorder = "total_duration-asc";
}else{ } else {
mysorder="freq-asc"; mysorder = "freq-asc";
} }
//升序 //升序
let data={} let data = {}
if(this.props.isAdmin()){ if (this.props.isAdmin()) {
//老师 //老师
const CourseId=this.props.match.params.coursesId; const CourseId = this.props.match.params.coursesId;
if(groupsid){ if (groupsid) {
data={ data = {
id:CourseId, id: CourseId,
page:this.state.page, page: this.state.page,
order:mysorder, order: mysorder,
} }
}else{ } else {
data={ data = {
id:CourseId, id: CourseId,
page:this.state.page, page: this.state.page,
group_id:this.state.groupsid, group_id: this.state.groupsid,
order:mysorder, order: mysorder,
} }
} }
}else{ } else {
//学生 //学生
data={ data = {
page:this.state.page, page: this.state.page,
order:mysorder, order: mysorder,
} }
} }
@ -311,43 +326,43 @@ class Videostatisticscom extends Component {
order: mysorder, order: mysorder,
}) })
} else if (sorter.order === "descend") { } else if (sorter.order === "descend") {
if(sorter.columnKey === "total_duration"){ if (sorter.columnKey === "total_duration") {
mysorder="total_duration-desc"; mysorder = "total_duration-desc";
}else{ } else {
mysorder="freq-desc"; mysorder = "freq-desc";
} }
//降序 //降序
let data={} let data = {}
if(this.props.isAdmin()){ if (this.props.isAdmin()) {
//老师 //老师
const CourseId=this.props.match.params.coursesId; const CourseId = this.props.match.params.coursesId;
if(groupsid){ if (groupsid) {
data={ data = {
id:CourseId, id: CourseId,
page:this.state.page, page: this.state.page,
order:mysorder, order: mysorder,
} }
}else{ } else {
data={ data = {
id:CourseId, id: CourseId,
page:this.state.page, page: this.state.page,
group_id:this.state.groupsid, group_id: this.state.groupsid,
order:mysorder, order: mysorder,
} }
} }
}else{ } else {
//学生 //学生
data={ data = {
page:this.state.page, page: this.state.page,
order:mysorder, order: mysorder,
} }
} }
this.getdatas(data); this.getdatas(data);
this.setState({ this.setState({
order:mysorder, order: mysorder,
}) })
@ -362,30 +377,29 @@ class Videostatisticscom extends Component {
} }
render() { render() {
let {loading,data,page,limit,members_count,columnsstu,fbbool,course_groups}=this.state; let {loading, data, page, limit, members_count, columnsstu, fbbool, course_groups} = this.state;
const isAdmin =this.props.isAdmin(); const isAdmin = this.props.isAdmin();
const menu = ( const menu = (
<Menu> <Menu>
<Menu.Item> <Menu.Item>
<a onClick={()=>this.setcourse_groups(null)}> <a onClick={() => this.setcourse_groups(null)}>
<p className="maxnamewidth200s">全部</p> <p className="maxnamewidth200s">全部</p>
</a> </a>
</Menu.Item> </Menu.Item>
{ {
course_groups&&course_groups.length>0? course_groups && course_groups.length > 0 ?
( (
course_groups.map((item,key) => { course_groups.map((item, key) => {
return ( return (
<Menu.Item> <Menu.Item>
<a onClick={()=>this.setcourse_groups(item.id)} key={key}> <a onClick={() => this.setcourse_groups(item.id)} key={key}>
<p className="maxnamewidth200s">{item.name}</p> <p className="maxnamewidth200s">{item.name}</p>
</a> </a>
</Menu.Item> </Menu.Item>
) )
}) })
) )
: :
"" ""
@ -394,30 +408,37 @@ class Videostatisticscom extends Component {
); );
return ( return (
<React.Fragment> <React.Fragment>
<div className="ws100s" > <div className="ws100s">
<div className="ws100s teacherentrydivs edu-back-white "> <div className="ws100s teacherentrydivs edu-back-white ">
<div className="ws100s sortinxdirection"> <div className="ws100s sortinxdirection">
<div className="ws50s sptits">视频名称视频名称…</div> <div className="ws50s sptits">视频名称视频名称…</div>
<div className="ws50s sptitss xaxisreverseorder font-14" style={{ <div className="ws50s sptitss xaxisreverseorder font-14" style={{
color:"#5091FF", color: "#5091FF",
lineHeight: "42px", lineHeight: "42px",
}}> }}>
<div className="xiaoshou" onClick={()=>this.props.tisticsbools(false,null)}> <div className="xiaoshou" onClick={() => this.props.tisticsbools(false, null)}>
<span className="mr5 xiaoshou">视频统计总览</span><i className="iconfont icon-fanhui font-13 xiaoshou"></i> <span className="mr5 xiaoshou">视频统计总览</span><i className="iconfont icon-fanhui font-13 xiaoshou"></i>
</div> </div>
<div className="xiaoshou" onClick={()=>this.fenbanone()}> {
<Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={menu} placement="bottomCenter" > isAdmin === true ?
<div className="xiaoshou" onClick={() => this.fenbanone()}>
<Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={menu}
placement="bottomCenter">
<span> <span>
<span className="mr5 xiaoshou">分班</span> <span className="mr5 xiaoshou">分班</span>
{ {
fbbool===true? fbbool === true ?
<i className="iconfont icon-sanjiaoxing-down font-13 mr32 xiaoshou"></i> <i className="iconfont icon-sanjiaoxing-down font-13 mr32 xiaoshou"></i>
: :
<i className="iconfont icon-sanjiaoxing-up font-13 mr32 xiaoshou"></i> <i className="iconfont icon-sanjiaoxing-up font-13 mr32 xiaoshou"></i>
} }
</span> </span>
</Dropdown> </Dropdown>
</div> </div>
:
""
}
</div> </div>
</div> </div>
@ -432,7 +453,7 @@ class Videostatisticscom extends Component {
} }
</style> </style>
{ {
loading===true? loading === true ?
<div style={{ <div style={{
minHeight: "400px", minHeight: "400px",
}} className="ws100s"> }} className="ws100s">
@ -441,7 +462,7 @@ class Videostatisticscom extends Component {
: :
<div className="ws100s ysltableo teacherentrydivs"> <div className="ws100s ysltableo teacherentrydivs">
{ {
data.length===0? data.length === 0 ?
<div style={{ <div style={{
minHeight: "400px", minHeight: "400px",
}} className="ws100s"> }} className="ws100s">
@ -465,11 +486,11 @@ class Videostatisticscom extends Component {
<div className="mb30 clearfix educontent mt40 intermediatecenter"> <div className="mb30 clearfix educontent mt40 intermediatecenter">
{ {
data&&data.length>0? data && data.length > 0 ?
<Pagination showQuickJumper current={this.state.page} onChange={this.paginationonChange} <Pagination showQuickJumper current={this.state.page} onChange={this.paginationonChange}
pageSize={this.state.limit} pageSize={this.state.limit}
total={this.state.members_count}></Pagination> total={this.state.members_count}></Pagination>
:"" : ""
} }
</div> </div>
@ -480,4 +501,4 @@ class Videostatisticscom extends Component {
} }
} }
export default Videostatisticscom; export default Videostatisticscomtwo;

124
public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
Unescape View File

@ -1,7 +1,7 @@
import React, {Component} from "react"; import React, {Component} from "react";
import '../../signin/css/signincdi.css'; import '../../signin/css/signincdi.css';
import {Pagination,Table} from 'antd'; import {Pagination,Table} from 'antd';
import {getImageUrl} from 'educoder'; import {getImageUrl,sortDirections} from 'educoder';
import axios from 'axios'; import axios from 'axios';
import LoadingSpin from "../../../../common/LoadingSpin"; import LoadingSpin from "../../../../common/LoadingSpin";
import NoneDatas from "../../signin/component/NoneDatas"; import NoneDatas from "../../signin/component/NoneDatas";
@ -44,6 +44,8 @@ class Videostatisticslist extends Component {
align: "center", align: "center",
className: 'font-14', className: 'font-14',
width: '98px', width: '98px',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => ( render: (text, record) => (
<span style={{width: '98px'}}>{record.people_num}</span> <span style={{width: '98px'}}>{record.people_num}</span>
), ),
@ -55,6 +57,8 @@ class Videostatisticslist extends Component {
align: "center", align: "center",
className: 'font-14 maxnamewidth150s', className: 'font-14 maxnamewidth150s',
width: '150px', width: '150px',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => ( render: (text, record) => (
<span style={{width: '150px'}} className="maxnamewidth150s">{record.total_time}</span> <span style={{width: '150px'}} className="maxnamewidth150s">{record.total_time}</span>
), ),
@ -87,11 +91,16 @@ class Videostatisticslist extends Component {
page:1, page:1,
limit:10, limit:10,
members_count:0, members_count:0,
order:undefined,
} }
} }
componentDidMount() { componentDidMount() {
this.togetdatas(1); let data={
page:1,
order:this.state.order
}
this.togetdatas(data);
} }
@ -103,27 +112,59 @@ class Videostatisticslist extends Component {
this.setState({ this.setState({
page: pageNumber, page: pageNumber,
}) })
this.togetdatas(pageNumber); let data={
page:pageNumber,
order:this.state.order
}
this.togetdatas(data);
} }
togetdatas(page){ togetdatas(data){
this.setState({ this.setState({
loading:true loading:true
}) })
const CourseId=this.props.match.params.coursesId; const CourseId=this.props.match.params.coursesId;
let url=`/courses/${CourseId}/watch_video_histories.json`; let url=`/courses/${CourseId}/watch_video_histories.json`;
axios.get(url,{params:{ axios.get(url,{params:data
page:page
}
}).then((response) => { }).then((response) => {
if(response){ if (response) {
this.setState({ if (response.data) {
data:response.data&&response.data.videos?response.data.videos:[], if (response.data.videos.length > 0) {
members_count:response.data.count, let datalists = [];
}) for (var i = 0; i < response.data.videos.length; i++) {
datalists.push({
number: (parseInt(this.state.spage) - 1) * parseInt(this.state.limit) + (i + 1),
title: response.data.videos[i].title,
people_num: response.data.videos[i].people_num,
total_time: response.data.videos[i].total_time,
user_name: response.data.videos[i].user_name,
id: response.data.videos[i].id,
})
}
this.setState({
data: datalists,
members_count: response.data.count,
})
} else {
this.setState({
data: [],
members_count: response.data.count,
})
}
} else {
this.setState({
data: [],
members_count: response.data.count,
})
}
} }
this.setState({ this.setState({
loading:false loading:false
}) })
@ -135,6 +176,57 @@ class Videostatisticslist extends Component {
} }
//实训作业tbale 列表塞选数据
table1handleChange = (pagination, filters, sorter) => {
if (JSON.stringify(sorter) === "{}") {
//没有选择
} else {
try {
//学生学号排序
if (sorter.columnKey === "people_num"||sorter.columnKey === "total_time") {
let mysorder="";
if (sorter.order === "ascend") {
if(sorter.columnKey === "people_num"){
mysorder="people_num-asc";
}else{
mysorder="total_time-asc";
}
//升序
let data={
page:this.state.page,
order:mysorder
}
this.togetdatas(data);
this.setState({
order: mysorder,
})
} else if (sorter.order === "descend") {
if(sorter.columnKey === "people_num"){
mysorder="people_num-desc";
}else{
mysorder="total_time-desc";
}
//降序
let data={
page:this.state.page,
order:mysorder
}
this.togetdatas(data);
this.setState({
order: mysorder,
})
}
}
} catch (e) {
}
}
}
render() { render() {
@ -175,7 +267,13 @@ class Videostatisticslist extends Component {
<NoneDatas></NoneDatas> <NoneDatas></NoneDatas>
</div> </div>
: :
<Table columns={columnsstu} dataSource={data} pagination={false}/> <Table
columns={columnsstu}
dataSource={data}
pagination={false}
onChange={this.table1handleChange}
/>
} }

Write Preview
Loading…
Cancel
Save