diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 8ce2bb333..bdb5daae1 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1515,7 +1515,7 @@ class CoursesController < ApplicationController
   # 学生角度观看课堂视频的记录
   def own_watch_histories
     @current_user = current_user
-    
+
     @videos = CourseVideo.joins("
       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}
@@ -1549,7 +1549,8 @@ class CoursesController < ApplicationController
     render json: {
       total_duration: @total_duration,
       freq: @frequencies,
-      people_num: @people_num
+      people_num: @people_num,
+      begin_at: '2020-03-13 24:00'
     }
   end
 
diff --git a/app/jobs/student_join_attendance_record_job.rb b/app/jobs/student_join_attendance_record_job.rb
index ecc0b46a9..8840ae142 100644
--- a/app/jobs/student_join_attendance_record_job.rb
+++ b/app/jobs/student_join_attendance_record_job.rb
@@ -4,7 +4,7 @@ class StudentJoinAttendanceRecordJob < ApplicationJob
   def perform(member_id)
     member = CourseMember.find_by(id: member_id)
     course = member&.course
-    return if member.blank? || course.blank?
+    return if member.blank? || member.role != "STUDENT" || course.blank?
 
     current_date = Date.current
     current_end_time = Time.current.strftime("%H:%M:%S")
diff --git a/app/models/course_member.rb b/app/models/course_member.rb
index 21221e7e9..0a0433f6f 100644
--- a/app/models/course_member.rb
+++ b/app/models/course_member.rb
@@ -165,7 +165,9 @@ class CourseMember < ApplicationRecord
   private
 
   def create_attendance_record
-    StudentJoinAttendanceRecordJob.perform_later(id)
+    if role == "STUDENT"
+      StudentJoinAttendanceRecordJob.perform_later(id)
+    end
   end
 
 end
diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 30a3511c8..e55dbafb7 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -970,6 +970,13 @@ class CoursesIndex extends Component{
 											 }
 								></Route>
 
+                {/* 主签到 */}
+                <Route path="/classrooms/:coursesId/attendances"
+                       render={
+                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                       }
+                ></Route>
+
                 {/*/!*实训作业and课堂详情页*!/*/}
                 <Route path="/classrooms/:coursesId"
                         render={
diff --git a/public/react/src/modules/courses/Video/video-play/index.jsx b/public/react/src/modules/courses/Video/video-play/index.jsx
index 8c3a2eb20..e33439dcf 100644
--- a/public/react/src/modules/courses/Video/video-play/index.jsx
+++ b/public/react/src/modules/courses/Video/video-play/index.jsx
@@ -177,6 +177,9 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
       el.current.removeEventListener('seeking', onSeeking)
       el.current.removeEventListener('seeked', onSeeked)
       el.current.removeEventListener('timeupdate', onTimeupdate)
+      if(el.current.playing) {
+        log()
+      }
     }
   }, [el, src])
 
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index f54c99978..7e324fadc 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -89,7 +89,6 @@ class CoursesBanner extends Component {
     }
 
   HideAddcoursestypess=(i)=>{
-    console.log("调用了");
     this.setState({
       Addcoursestypes:false,
       mydisplay:true,
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 27fcb5c1e..12f4341e0 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -933,7 +933,7 @@ class CoursesNew extends Component {
                                     >
                                         {getFieldDecorator("checkboxgroup", {
                                             initialValue: [
-                                                "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group","video"
+                                                "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group","video","attendance"
                                             ],
                                         })(
                                             <Checkbox.Group style={{ marginTop: "10px"}}>
@@ -949,6 +949,7 @@ class CoursesNew extends Component {
                                             <Checkbox value={"board"} className="fl">讨论</Checkbox>
                                             <Checkbox value={"course_group"} className="fl">分班</Checkbox>
 																						<Checkbox value={"statistics"} className="fl">统计</Checkbox>
+                                            <Checkbox value={"attendance"} className="fl">签到</Checkbox>
                                             </Checkbox.Group>
                                         )}
                                     </Form.Item>
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index 6d637552d..3cd707284 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -989,7 +989,7 @@ class Goldsubject extends Component {
 
 										{getFieldDecorator("checkboxgroup", {
 											initialValue: [
-												"announcement","online_learning","shixun_homework","common_homework",
+												"announcement","online_learning","shixun_homework","common_homework","attendance"
 											],
 										})(
 											<Checkbox.Group style={{ marginTop: "10px"}}>
@@ -1003,6 +1003,7 @@ class Goldsubject extends Component {
 												<Checkbox value={"board"} className="fl">讨论</Checkbox>
 												<Checkbox value={"course_group"} className="fl">分班</Checkbox>
 												<Checkbox value={"statistics"} className="fl">统计</Checkbox>
+												<Checkbox value={"attendance"} className="fl">签到</Checkbox>
 											</Checkbox.Group>
 										)}
 									</Form.Item>
diff --git a/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js b/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js
index 0be54a6b7..e5aac4994 100644
--- a/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js
+++ b/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js
@@ -109,11 +109,12 @@ class Signinstatistics extends Component {
 
     const cols = {
       month: {
-        type: 'linear',
-        nice:[1,10],
-        min:1,
-        minLimit:1,
-        minTickInterval:2
+        type: 'pow',
+        // nice: true,
+        exponent:1,
+        // minLimit:1,
+        // tickInterval:1,
+        // minTickInterval:2
       },
       temperature:{
         type: 'linear',
diff --git a/public/react/src/modules/courses/signin/component/Detailss.js b/public/react/src/modules/courses/signin/component/Detailss.js
index d205ffdcb..c1f43e0cf 100644
--- a/public/react/src/modules/courses/signin/component/Detailss.js
+++ b/public/react/src/modules/courses/signin/component/Detailss.js
@@ -77,7 +77,7 @@ class Detailss extends Component {
 								<Progress percent={jdt} showInfo={false} strokeColor="#1890ff"/>
 							</div>
 							<div className="progressivpss h28s">
-								已签到{item && item.normal_count ? item.normal_count : 0} /
+								已签到 {item && item.normal_count ? item.normal_count : 0} /
 								应签到 {item && item.all_count ? item.all_count : 0}
 							</div>
 						</div>
diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js
index f3aa4c297..ff08fe126 100644
--- a/public/react/src/modules/courses/signin/component/Teacherentry.js
+++ b/public/react/src/modules/courses/signin/component/Teacherentry.js
@@ -34,9 +34,9 @@ class Teacherentry extends Component {
 		}
 		return (
 			<React.Fragment>
-				<div className={index===0?"ws100s edu-back-white ": "ws100s edu-back-white mt20"}>
-					<div className="ws100s teacherentrydiv ">
-						<p className={isAdmin?"ws100s teachedivp ymaxnamewidthdivp xiaoshou":"ws100s teachedivp ymaxnamewidthdivp"} onClick={isAdmin?()=>this.props.qiandaoxiangq(true,item.id):""}>
+				<div className={index===0?"ws100s edu-back-white xiaoshou": "ws100s edu-back-white mt20 xiaoshou"}>
+					<div className="ws100s teacherentrydiv" onClick={isAdmin?(e)=>{e.stopPropagation();this.props.qiandaoxiangq(true,item.id)}:""}>
+						<p className={isAdmin?"ws100s teachedivp ymaxnamewidthdivp xiaoshou color-blue":"ws100s teachedivp ymaxnamewidthdivp"} >
 							{
 								item.name
 							}
@@ -51,7 +51,7 @@ class Teacherentry extends Component {
 								<Progress percent={jdt} showInfo={false} strokeColor="#1890ff"/>
 							</div>
 							<div className="progressivpss">
-								已签到{item.normal_count ? item.normal_count : 0} / 应签到 {item.all_count ? item.all_count : 0}
+								已签到 {item.normal_count ? item.normal_count : 0} / 应签到 {item.all_count ? item.all_count : 0}
 							</div>
 						</div>
 
@@ -95,18 +95,18 @@ class Teacherentry extends Component {
 									isAdmin === true ?
 										this.props.defaultActiveKey === "1" ?
 											<div className="ws100s xaxisreverseorder">
-												<div className="jiezhis h40s xiaoshou" onClick={()=>this.props.thisEnd(item.id)}>截止</div>
-												<div className="shanchu h40s xiaoshou" onClick={()=>this.props.thisdelete(item.id)}>删除</div>
+												<div className="jiezhis h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisEnd(item.id)}}>截止</div>
+												<div className="shanchu h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div>
 											</div>
 											:
 											item.edit_auth === true ?
 												<div className="ws100s xaxisreverseorder">
-													<div className="jiezhis h40s xiaoshou" onClick={()=>this.props.Signinnamestypes(item.id,true,item.name)}>编辑</div>
-													<div className="shanchu h40s xiaoshou" onClick={()=>this.props.thisdelete(item.id)}>删除</div>
+													<div className="jiezhis h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signinnamestypes(item.id,true,item.name)}}>编辑</div>
+													<div className="shanchu h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div>
 												</div>
 												:
 												<div className="ws100s xaxisreverseorder">
-													<div className="jiezhis h40s color-reds xiaoshou" onClick={()=>this.props.thisdelete(item.id)}>删除</div>
+													<div className="jiezhis h40s color-reds xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div>
 												</div>
 										:
 										(
@@ -116,7 +116,7 @@ class Teacherentry extends Component {
 														item.attendance_status?
 															(
 																item.attendance_status==="ABSENCE"?
-																	<div className="qiandaobutton xiaoshou" onClick={()=>this.props.Signin(item.mode,item.id,item.attendance_code)}>
+																	<div className="qiandaobutton xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signin(item.mode,item.id,item.attendance_code)}}>
 																		签到
 																	</div>
 																	:
diff --git a/public/react/src/modules/courses/signin/css/Signinstatistics.css b/public/react/src/modules/courses/signin/css/Signinstatistics.css
index ddcda4cd1..c7ff88c9f 100644
--- a/public/react/src/modules/courses/signin/css/Signinstatistics.css
+++ b/public/react/src/modules/courses/signin/css/Signinstatistics.css
@@ -210,4 +210,24 @@
     height: auto  !important;
     padding: 0px  !important;
     white-space: nowrap  !important;
-}
\ No newline at end of file
+}
+
+.color26C7C9 .ant-select-selection-selected-value{
+    margin: 0 30% !important;
+}
+
+.colorEAAE4E .ant-select-selection-selected-value{
+    margin: 0 40% !important;
+}
+
+.color909399 .ant-select-selection-selected-value{
+    margin: 0 37% !important;
+}
+
+.colorFF835C .ant-select-selection-selected-value{
+    margin: 0 37% !important;
+}
+
+/*.allSignedinlistbox .ant-select-selection-selected-value{*/
+/*    margin: 0 30% !important;*/
+/*}*/
\ No newline at end of file
diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css
index 867dff40d..7ad9a0d0c 100644
--- a/public/react/src/modules/courses/signin/css/signincdi.css
+++ b/public/react/src/modules/courses/signin/css/signincdi.css
@@ -358,6 +358,11 @@
 
 }
 
+.colorbluesigin{
+    font-size:16px;
+    font-weight:bold;
+    color:rgba(51,51,51,1);
+}
 .sptits{
     font-size:20px;
     font-family:MicrosoftYaHeiSemibold;
@@ -394,6 +399,15 @@
     white-space:nowrap;
     cursor: default;
 }
+.maxnamewidth200s{
+    text-align: center;
+    width: 200px;
+    max-width:200px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
 .maxnamewidth100s{
     width: 100px;
     max-width: 100px;
diff --git a/public/react/src/modules/courses/signin/student/Signedinlist.js b/public/react/src/modules/courses/signin/student/Signedinlist.js
index 5885e8a67..ea5ffb998 100644
--- a/public/react/src/modules/courses/signin/student/Signedinlist.js
+++ b/public/react/src/modules/courses/signin/student/Signedinlist.js
@@ -260,9 +260,10 @@ class Signedinlist extends Component {
         className: "textcenter",
         render: (text, record) => (
           <span>
+
             <Select key={record.index} defaultValue={record.attendance_status}
                     // className={"Signedinlistbox"}
-                    className={record.attendance_status==="NORMAL"?"color26C7C9 Signedinlistbox sginboxcolor26C7C9":record.attendance_status==="LEAVE"?"colorEAAE4E Signedinlistbox sginboxcolorEAAE4E":record.attendance_status==="ABSENCE"?this.props.defaultActiveKey==="2"?"colorFF835C Signedinlistbox sginboxcolorFF835C":"color909399 Signedinlistbox sginboxcolor909399":"Signedinlistbox"}
+                    className={record.attendance_status==="NORMAL"?"color26C7C9 Signedinlistbox sginboxcolor26C7C9 marginleft10":record.attendance_status==="LEAVE"?"colorEAAE4E Signedinlistbox sginboxcolorEAAE4E marginleft10":record.attendance_status==="ABSENCE"?this.props.defaultActiveKey==="2"?"colorFF835C Signedinlistbox sginboxcolorFF835C marginleft10":"color909399 Signedinlistbox sginboxcolor909399 marginleft10":"Signedinlistbox"}
 
                     style={{ width: 167 }} onChange={(e)=>this.handleChange(e,record.user_id)}>
                   {
@@ -339,6 +340,15 @@ class Signedinlist extends Component {
 
           </Col>
         </Row>
+        <style>
+          {
+            `
+                .marginleft10{
+                    margin-left: 10px !important;
+                }
+             `
+          }
+        </style>
         <div className={"backfff mt10"}>
 					{
 						this.state.loading===true?
diff --git a/public/react/src/modules/courses/signin/student/Signindetails.js b/public/react/src/modules/courses/signin/student/Signindetails.js
index d23ca76b2..a5df6c2b2 100644
--- a/public/react/src/modules/courses/signin/student/Signindetails.js
+++ b/public/react/src/modules/courses/signin/student/Signindetails.js
@@ -43,13 +43,10 @@ class Signindetails extends Component{
 				<div className="ws100s" style={{
 					position: "relative",
 				}}>
-					<div className="ws100s xaxisreverseorder" style={{
-						position: "absolute",
-						top: "-29px",
-					}}>
-						<p className="sortinxdirection xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}>
-							<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5"></i>
-						  <p className="fh mr20">	返回</p>
+					<div className="ws100s mb20">
+						<p className="sortinxdirection" >
+							<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}></i>
+						  <p className="fh mr20 colorbluesigin xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}>正在签到</p>
 						</p>
 
 					</div>
diff --git a/public/react/src/modules/courses/videostatistics/Videostatistics.js b/public/react/src/modules/courses/videostatistics/Videostatistics.js
index 8d88492b1..52d69b0fb 100644
--- a/public/react/src/modules/courses/videostatistics/Videostatistics.js
+++ b/public/react/src/modules/courses/videostatistics/Videostatistics.js
@@ -12,8 +12,8 @@ class Videostatistics extends Component{
 		super(props);
     this.state={
 			watch_staticsdata:[],
-			tisticsbool:true,
-			tisid:0,
+			tisticsbool:false,
+			tisid:null,
 		}
 
 
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js
index 6dbe44ae3..457c6d1f3 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js
@@ -36,7 +36,7 @@ class Videostatisticscom extends Component {
 					<div className="ws100s teacherentrydivs ">
 						<div className="ws100s sortinxdirection">
 							<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>
 						<style>
 							{
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
index d6b9a4fcb..764ddcb1f 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
@@ -1,24 +1,23 @@
 import React, {Component} from "react";
 import '../../signin/css/signincdi.css';
-import {Pagination,Table} from 'antd';
-import {getImageUrl} from 'educoder';
+import {Pagination, Table, Menu, Dropdown} from 'antd';
+import {getImageUrl, sortDirections} from 'educoder';
 import axios from 'axios';
 import LoadingSpin from "../../../../common/LoadingSpin";
 import NoneDatas from "../../signin/component/NoneDatas";
 
 
-
 //条目
-class Videostatisticscom extends Component {
+class Videostatisticscomtwo extends Component {
 	//条目组件
 	constructor(props) {
 		super(props);
 
 		this.state = {
-			data:[],
-			page:1,
-			limit:10,
-			members_count:0,
+			data: [],
+			page: 1,
+			limit: 10,
+			members_count: 0,
 			columnsstu: [
 				{
 					title: '序号',
@@ -50,7 +49,8 @@ class Videostatisticscom extends Component {
 					className: 'font-14',
 					width: '98px',
 					render: (text, record) => (
-						<span style={{width: '98px'}}>{record.is_finished}</span>
+						<span style={{width: '98px'}}>{record.is_finished === true ?
+							<span style={{color: "#5091FF"}}>是</span> : <span style={{color: "#E02020"}}>否</span>}</span>
 					),
 				},
 				{
@@ -60,6 +60,8 @@ class Videostatisticscom extends Component {
 					align: "center",
 					className: 'font-14 maxnamewidth150s',
 					width: '150px',
+					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span style={{width: '150px'}} className="maxnamewidth150s">{record.total_duration}</span>
 					),
@@ -71,6 +73,8 @@ class Videostatisticscom extends Component {
 					align: "center",
 					className: 'font-14 maxnamewidth100s',
 					width: '100px',
+					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span style={{width: '100px'}} className="maxnamewidth100s">{record.feq}</span>
 					),
@@ -83,7 +87,7 @@ class Videostatisticscom extends Component {
 					className: 'font-14 maxnamewidth100s',
 					width: '100px',
 					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>
 					),
 				},
 				{
@@ -94,35 +98,40 @@ class Videostatisticscom extends Component {
 					className: 'font-14 maxnamewidth100s',
 					width: '100px',
 					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,
-			order:undefined,
-			course_groups:[],
+			loading: false,
+			order: undefined,
+			course_groups: [],
+			fbbool: false,
+			groupsid: null,
 		}
 	}
 
 	componentDidMount() {
-    if(this.props.isAdmin()){
-    	//老师
-			const CourseId=this.props.match.params.coursesId;
+		this.setState({
+			order: undefined
+		})
+		if (this.props.isAdmin()) {
+			//老师
+			const CourseId = this.props.match.params.coursesId;
 
-			var data={
-				id:CourseId,
-				page:this.state.page,
+			var data = {
+				id: CourseId,
+				page: this.state.page,
 			}
-    	this.getdatas(data);
+			this.getdatas(data);
 
-		}else{
-    	//学生
-    	var data={
-				page:this.state.page,
+		} else {
+			//学生
+			var data = {
+				page: this.state.page,
 			}
 			this.getdatas(data);
 		}
-    this.fenbans();
+		this.fenbans();
 	}
 
 	componentDidUpdate = (prevProps) => {
@@ -131,21 +140,21 @@ class Videostatisticscom extends Component {
 	}
 
 	//分班
-	fenbans=()=>{
-		const CourseId=this.props.match.params.coursesId;
-		let url=`/courses/${CourseId}/course_groups.json`;
+	fenbans = () => {
+		const CourseId = this.props.match.params.coursesId;
+		let url = `/courses/${CourseId}/course_groups.json`;
 		axios.get(url).then((response) => {
-     if(response){
-     	console.log("分班");
-     	console.log("response");
-			 console.log(response);
-			 this.setState({
-				 course_groups:response.data.course_groups,
-				 current_group_id:response.data.current_group_id,
-				 none_group_member_count:response.data.none_group_member_count,
-				 group_count:response.data.group_count,
-			 })
-		 }
+			if (response) {
+				console.log("分班");
+				console.log("response");
+				console.log(response);
+				this.setState({
+					course_groups: response.data.course_groups,
+					current_group_id: response.data.current_group_id,
+					none_group_member_count: response.data.none_group_member_count,
+					group_count: response.data.group_count,
+				})
+			}
 
 		}).catch((error) => {
 
@@ -153,92 +162,283 @@ class Videostatisticscom extends Component {
 	}
 
 	//学生
-	getdatas=(data)=>{
+	getdatas = (data) => {
 		this.setState({
-			loading:true
+			loading: true
 		})
-		const CourseId=this.props.match.params.coursesId;
-		let url="";
-		if(this.props.isAdmin()){
-			url=`/course_videos/${this.props.tisid}/watch_histories.json`;
-		}else {
-			url=`/courses/${CourseId}/own_watch_histories.json`;
+		const CourseId = this.props.match.params.coursesId;
+		let url = "";
+		if (this.props.isAdmin()) {
+			url = `/course_videos/${this.props.tisid}/watch_histories.json`;
+		} else {
+			url = `/courses/${CourseId}/own_watch_histories.json`;
 		}
-		axios.get(url,{params:data}).then((response) => {
-			if(response){
-				if(response.data){
-					if(response.data.data.length>0){
-						let datalists=[];
+		axios.get(url, {params: data}).then((response) => {
+			if (response) {
+				if (response.data) {
+					if (response.data.data.length > 0) {
+						let datalists = [];
 						for (var i = 0; i < response.data.data.length; i++) {
 							datalists.push({
-								number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
-								user_name:response.data.data[i].user_name,
-								is_finished:response.data.data[i].is_finished,
-								total_duration:response.data.data[i].total_duration,
-								feq:response.data.data[i].feq,
-								start_at:response.data.data[i].start_at,
-								end_at:response.data.data[i].end_at,
+								number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
+								user_name: response.data.data[i].user_name,
+								is_finished: response.data.data[i].is_finished,
+								total_duration: response.data.data[i].total_duration,
+								feq: response.data.data[i].feq,
+								start_at: response.data.data[i].start_at,
+								end_at: response.data.data[i].end_at,
 							})
 						}
 
 						this.setState({
-							data:datalists,
-							members_count:response.data.count,
+							data: datalists,
+							members_count: response.data.count,
 						})
-					}else{
+					} else {
 						this.setState({
-							data:[],
-							members_count:response.data.count,
+							data: [],
+							members_count: response.data.count,
 						})
 					}
-				}else{
+				} else {
 					this.setState({
-						data:[],
-						members_count:response.data.count,
+						data: [],
+						members_count: response.data.count,
 					})
 				}
 
 
-
-				}
+			}
 			this.setState({
-				loading:false
+				loading: false
 			})
 		}).catch((error) => {
 			this.setState({
-				loading:false
+				loading: false
 			})
 		});
 	}
 
 
-
 	paginationonChange = (pageNumber) => {
 		this.setState({
 			page: pageNumber,
 		})
+		let data = {}
+		if (this.props.isAdmin()) {
+			//老师
+			const CourseId = this.props.match.params.coursesId;
+				data = {
+					id: CourseId,
+					page: pageNumber,
+					group_id: this.state.groupsid,
+					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) => {
+		this.setState({
+			groupsid: id
+		})
+//老师
+		const CourseId = this.props.match.params.coursesId;
+
+		var data = {};
+		if (id) {
+			data = {
+				id: CourseId,
+				page: this.state.page,
+				group_id: id
+			}
+
+		} else {
+			data = {
+				id: CourseId,
+				page: this.state.page
+			}
+		}
+		this.getdatas(data);
 	}
 
-	render() {
-  let {loading,data,page,limit,members_count,columnsstu}=this.state;
-		const  isAdmin =this.props.isAdmin();
+	//实训作业tbale 列表塞选数据
+	table1handleChange = (pagination, filters, sorter) => {
+		if (JSON.stringify(sorter) === "{}") {
+			//没有选择
+		} else {
+			try {
+				//学生学号排序
+				if (sorter.columnKey === "total_duration" || sorter.columnKey === "feq") {
+					let mysorder = "";
+					if (sorter.order === "ascend") {
+						if (sorter.columnKey === "total_duration") {
+							mysorder = "total_duration-asc";
+						} else {
+							mysorder = "freq-asc";
 
+						}
+						//升序
+						let data = {}
+						if (this.props.isAdmin()) {
+							//老师
+							const CourseId = this.props.match.params.coursesId;
+							if (this.state.groupsid) {
+								data = {
+									id: CourseId,
+									page: this.state.page,
+									group_id: this.state.groupsid,
+									order: mysorder,
+								}
+							} else {
+								data = {
+									id: CourseId,
+									page: this.state.page,
+									order: mysorder,
+								}
+							}
+						} else {
+							//学生
+							data = {
+								page: this.state.page,
+								order: mysorder,
+							}
+						}
+
+						this.getdatas(data);
+						this.setState({
+							order: mysorder,
+						})
+					} else if (sorter.order === "descend") {
+						if (sorter.columnKey === "total_duration") {
+							mysorder = "total_duration-desc";
+
+						} else {
+							mysorder = "freq-desc";
+
+						}
+						//降序
+						let data = {}
+						if (this.props.isAdmin()) {
+							//老师
+							const CourseId = this.props.match.params.coursesId;
+							if (this.state.groupsid) {
+								data = {
+									id: CourseId,
+									page: this.state.page,
+									group_id: this.state.groupsid,
+									order: mysorder,
+								}
+							} else {
+								data = {
+									id: CourseId,
+									page: this.state.page,
+									order: mysorder,
+								}
+							}
+						} else {
+							//学生
+							data = {
+								page: this.state.page,
+								order: mysorder,
+							}
+						}
+
+						this.getdatas(data);
+						this.setState({
+							order: mysorder,
+						})
+
+
+					}
+				}
+			} catch (e) {
+
+			}
+
+		}
+
+	}
+
+
+	render() {
+		let {loading, data, page, limit, members_count, columnsstu, fbbool, course_groups} = this.state;
+		const isAdmin = this.props.isAdmin();
+
+		const menu = (
+			<Menu>
+				<Menu.Item>
+					<a onClick={() => this.setcourse_groups(null)}>
+						<p className="maxnamewidth200s">全部</p>
+					</a>
+				</Menu.Item>
+				{
+					course_groups && course_groups.length > 0 ?
+						(
+							course_groups.map((item, key) => {
+								return (
+									<Menu.Item>
+										<a onClick={() => this.setcourse_groups(item.id)} key={key}>
+											<p className="maxnamewidth200s">{item.name}</p>
+										</a>
+									</Menu.Item>
+								)
+							})
+						)
+						:
+						""
+				}
+			</Menu>
+		);
 		return (
 			<React.Fragment>
-				<div className="ws100s" >
+				<div className="ws100s">
 					<div className="ws100s teacherentrydivs edu-back-white ">
 						<div className="ws100s sortinxdirection">
 							<div className="ws50s sptits">视频名称视频名称…</div>
 							<div className="ws50s sptitss xaxisreverseorder font-14" style={{
-								color:"#5091FF",
+								color: "#5091FF",
 								lineHeight: "42px",
 							}}>
-               <div className="xiaoshou" onClick={()=>this.props.tisticsbools(false,null)}>
-								 <span className="mr5 xiaoshou">视频统计总览</span><i className="iconfont icon-fanhui  font-13 xiaoshou"></i>
-							 </div>
-								<div className="xiaoshou">
-									<span className="mr5 xiaoshou">分班</span><i className="iconfont icon-sanjiaoxing-up  font-13 mr32 xiaoshou"></i>
+								<div className="xiaoshou" onClick={() => this.props.tisticsbools(false, null)}>
+									<span className="mr5 xiaoshou">视频统计总览</span><i className="iconfont icon-fanhui  font-13 xiaoshou"></i>
 								</div>
+								{
+									isAdmin === true ?
+										<div className="xiaoshou" onClick={() => this.fenbanone()}>
+											<Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={menu}
+																placement="bottomCenter">
+								   <span>
+										 	<span className="mr5 xiaoshou">分班</span>
+										 {
+											 fbbool === true ?
+												 <i className="iconfont icon-sanjiaoxing-down  font-13 mr32 xiaoshou"></i>
+												 :
+												 <i className="iconfont icon-sanjiaoxing-up  font-13 mr32 xiaoshou"></i>
+										 }
+									 </span>
+											</Dropdown>
+										</div>
+										:
+										""
+								}
+
 							</div>
 						</div>
 
@@ -253,7 +453,7 @@ class Videostatisticscom extends Component {
 							}
 						</style>
 						{
-							loading===true?
+							loading === true ?
 								<div style={{
 									minHeight: "400px",
 								}} className="ws100s">
@@ -262,14 +462,19 @@ class Videostatisticscom extends Component {
 								:
 								<div className="ws100s ysltableo teacherentrydivs">
 									{
-										data.length===0?
+										data.length === 0 ?
 											<div style={{
 												minHeight: "400px",
 											}} className="ws100s">
 												<NoneDatas></NoneDatas>
 											</div>
 											:
-											<Table columns={columnsstu} dataSource={data} pagination={false}/>
+											<Table
+												columns={columnsstu}
+												dataSource={data}
+												pagination={false}
+												onChange={this.table1handleChange}
+											/>
 									}
 
 
@@ -281,11 +486,11 @@ class Videostatisticscom extends Component {
 
 					<div className="mb30 clearfix educontent mt40 intermediatecenter">
 						{
-							data&&data.length>0?
+							data && data.length > 0 ?
 								<Pagination showQuickJumper current={this.state.page} onChange={this.paginationonChange}
 														pageSize={this.state.limit}
 														total={this.state.members_count}></Pagination>
-								:""
+								: ""
 						}
 
 					</div>
@@ -296,4 +501,4 @@ class Videostatisticscom extends Component {
 	}
 }
 
-export default Videostatisticscom;
+export default Videostatisticscomtwo;
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
index 3ec3af0fa..637ec306c 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
@@ -1,7 +1,7 @@
 import React, {Component} from "react";
 import '../../signin/css/signincdi.css';
 import {Pagination,Table} from 'antd';
-import {getImageUrl} from 'educoder';
+import {getImageUrl,sortDirections} from 'educoder';
 import axios from 'axios';
 import LoadingSpin from "../../../../common/LoadingSpin";
 import NoneDatas from "../../signin/component/NoneDatas";
@@ -44,6 +44,8 @@ class Videostatisticslist extends Component {
 					align: "center",
 					className: 'font-14',
 					width: '98px',
+					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span style={{width: '98px'}}>{record.people_num}</span>
 					),
@@ -55,6 +57,8 @@ class Videostatisticslist extends Component {
 					align: "center",
 					className: 'font-14 maxnamewidth150s',
 					width: '150px',
+					sorter: true,
+					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span style={{width: '150px'}} className="maxnamewidth150s">{record.total_time}</span>
 					),
@@ -87,11 +91,16 @@ class Videostatisticslist extends Component {
 			page:1,
 			limit:10,
 			members_count:0,
+			order:undefined,
 		}
 	}
 
 	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({
 			page: pageNumber,
 		})
-   this.togetdatas(pageNumber);
+		let data={
+			page:pageNumber,
+			order:this.state.order
+		}
+   this.togetdatas(data);
 	}
 
 
-	togetdatas(page){
+	togetdatas(data){
 		this.setState({
 			loading:true
 		})
 		const CourseId=this.props.match.params.coursesId;
 		let url=`/courses/${CourseId}/watch_video_histories.json`;
-		axios.get(url,{params:{
-			page:page
-			}
+		axios.get(url,{params:data
 		}).then((response) => {
-			if(response){
-				this.setState({
-					data:response.data&&response.data.videos?response.data.videos:[],
-					members_count:response.data.count,
-				})
+			if (response) {
+				if (response.data) {
+					if (response.data.videos.length > 0) {
+						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({
 				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() {
@@ -175,7 +267,13 @@ class Videostatisticslist extends Component {
 												<NoneDatas></NoneDatas>
 											</div>
 											:
-											<Table columns={columnsstu} dataSource={data} pagination={false}/>
+											<Table
+												columns={columnsstu}
+												dataSource={data}
+												pagination={false}
+												onChange={this.table1handleChange}
+
+											/>
 									}
 
 
diff --git a/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx b/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx
index 7e933462e..4757cfecf 100644
--- a/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx
+++ b/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx
@@ -6,6 +6,6 @@ export default ({
     callback(id)
   }
   return (
-    <a className={id === activeId ? "shaiItems shixun_repertoire active" : "shaiItems shixun_repertoire"} onClick={onClickHandler}>{text}</a>
+    <a className={id == activeId ? "shaiItems shixun_repertoire active" : "shaiItems shixun_repertoire"} onClick={onClickHandler}>{text}</a>
   )
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx b/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx
index c58ae81aa..0430149a7 100644
--- a/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx
+++ b/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx
@@ -12,13 +12,13 @@ const DiffObject = [
     { id: 3, text: '中高级' },
     { id: 4, text: '高级' }
 ]
-export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
+export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist,parsedid,newpalce }) => {
     const [data, setData] = useState({
         diff: 0,
-        searchValue: 'a',
+        searchValue: newpalce || 'a',
         navs: [],
         searchKey: '',
-        childValue: ''
+        childValue:parsedid
     })
     const { diff, searchValue, navs, childValue, searchKey } = data
     function diffSearch(diff) {
@@ -28,6 +28,15 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
         })
         StatusEnquiry([{ 'type': 2 }, { 'value': diff }])
     }
+    useEffect(() => {
+        setData({
+            ...data,
+            searchValue: newpalce || 'a',
+            childValue: parsedid
+        })
+    },[
+        newpalce,navs,parsedid
+    ])
     function onSearchAll() {
         if (searchValue !== 'a') {
             setData({ ...data, searchValue: 'a', childValue: '' })
@@ -61,12 +70,12 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
     function overlayMenu(item, id) {
         return <Menu>
             {
-                item.map((list, k) => <Menu.Item>
-                    <div className="mt5 subshaicontent-part" key={k}  >
+                item.map((list, k) => <Menu.Item key={list.id}>
+                    <div className="mt5 subshaicontent-part"   >
                         <a style={{ height: '20px' }} className={"mb15 shixun_repertoire color-dark"} name={list.id} id={id} onClick={getChildValue}>{list.name}</a>
                         <div className="sub-Item clearfix">
                             {
-                                list.tags.map((tag, e) => <a className={childValue === tag.id ? "shixun_repertoire active" : "shixun_repertoire"} key={e} id={tag.id} name={id} rel="subshaicontent" onClick={getChildValues}>{tag.name}</a>
+                                list.tags.map((tag, e) => <a className={childValue == tag.id ? "shixun_repertoire color-blue" : "shixun_repertoire"} key={e} id={tag.id} name={id} rel="subshaicontent" onClick={getChildValues}>{tag.name}</a>
                                 )
                             }
                         </div>
@@ -84,7 +93,6 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
         }
         init()
     }, [])
-    // item.id < 4 ? "bottomRight" : item.id >= 8 ? "bottomLeft" : "bottomCenter"
     return (
         <div className="edu-back-white shixun-search-bar" >
             <div className="educontent">
@@ -111,7 +119,7 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
                     <div className="clearfix">
                         <span className="shaiTitle fl">筛选：</span>
                         <div className="fl pr shaiAllItem mt1">
-                            {DiffObject.map(item => <A {...item} callback={diffSearch} activeId={diff} />)}
+                            {DiffObject.map(item => <A key={item.id} {...item} callback={diffSearch} activeId={diff} />)}
                         </div>
 
                     </div>