Merge branch 'courseware' of http://bdgit.educoder.net/Hjqreturn/educoder into courseware

app/controllers/admins/courses_controller.rb

@@ -7,13 +7,13 @@ class Admins::CoursesController < Admins::BaseController
     courses = Admins::CourseQuery.call(params)
     @ended_courses = courses.where(is_end: 1).size
     @processed_courses = courses.where(is_end: 0).size
-    @courses = paginate courses.includes(:school, :students, :attachments, :homework_commons, teacher: :user_extension)
+    @courses = paginate courses.includes(:school, :students, :teacher_course_members, :informs, :course_videos, :attachments, :homework_commons, teacher: :user_extension)
 
     respond_to do |format|
       format.js
       format.html
       format.xlsx do
-        @courses = courses.includes(:school, :students, :attachments, :homework_commons, :course_acts, teacher: :user_extension)
+        @courses = courses.includes(:school, :students, :teacher_course_members, :informs, :course_videos, :attachments, :homework_commons, :course_activities, teacher: [user_extension: :department])
         filename = "课堂列表_#{Time.current.strftime('%Y%m%d%H%M%S')}.xlsx"
         render xlsx: 'index', filename: filename
       end

app/controllers/course_videos_controller.rb

@@ -26,14 +26,13 @@ class CourseVideosController < ApplicationController
 
      @watch_course_videos = course_video.watch_course_videos.joins("
        JOIN watch_video_histories ON watch_video_histories.watch_course_video_id = watch_course_videos.id
+       JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id} AND role = 4
      ").group("watch_video_histories.watch_course_video_id").where("watch_course_videos.end_at IS NOT NULL").select("watch_course_videos.id")
 
     @count = @watch_course_videos.count.count
 
     if params[:group_id].present?
-      @watch_course_videos = @watch_course_videos.joins("
+      @watch_course_videos = @watch_course_videos.where("course_members.course_group_id = ?", params[:group_id])
-        JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id}
-      ").where("course_members.course_group_id = ?", params[:group_id])
     end
 
     @watch_course_videos = @watch_course_videos.select("count(watch_video_histories.id) AS freq, watch_course_videos.*")

app/controllers/courses_controller.rb

@@ -1494,6 +1494,7 @@ class CoursesController < ApplicationController
         SELECT watch_course_videos.course_video_id, SUM(watch_course_videos.total_duration) AS time, COUNT(watch_course_videos.course_video_id) AS num
         FROM watch_course_videos
         JOIN course_videos ON course_videos.id = watch_course_videos.course_video_id AND watch_course_videos.end_at IS NOT NULL
+        JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id} AND role = 4
         WHERE course_videos.course_id = #{@course.id}
         GROUP BY watch_course_videos.course_video_id
       ) AS hisotries ON hisotries.course_video_id = course_videos.id").select("course_videos.id")
@@ -1523,6 +1524,7 @@ class CoursesController < ApplicationController
         SELECT watch_course_videos.course_video_id, COUNT(watch_course_videos.course_video_id) AS num
         FROM watch_course_videos
         JOIN course_videos ON course_videos.id = watch_course_videos.course_video_id
+        JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id} AND role = 4
         WHERE course_videos.course_id = #{@course.id} AND watch_course_videos.user_id = #{current_user.id} AND watch_course_videos.end_at IS NOT NULL
         GROUP BY watch_course_videos.course_video_id
       ) AS hisotries ON hisotries.course_video_id = course_videos.id").select("course_videos.id")
@@ -1543,9 +1545,12 @@ class CoursesController < ApplicationController
 
   # 课堂视频的统计总览
   def watch_statics
-    @total_duration = @course.course_videos.joins(:watch_course_videos).sum(:total_duration).round(2)
+    course_videos = @course.course_videos.joins(:watch_course_videos).joins("
-    @frequencies = @course.course_videos.joins([watch_course_videos: :watch_video_histories]).count(:id)
+      JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id} AND role = 4
-    @people_num = @course.course_videos.joins(:watch_course_videos).count(:id)
+    ").where("watch_course_videos.end_at IS NOT NULL")
+    @total_duration = course_videos.sum(:total_duration).round(0)
+    @frequencies = course_videos.joins("JOIN watch_video_histories ON watch_course_videos.id = watch_video_histories.watch_course_video_id").count(:id)
+    @people_num = course_videos.count(:id)
     render json: {
       total_duration: @total_duration,
       freq: @frequencies,

app/controllers/subjects_controller.rb

@@ -244,7 +244,7 @@ class SubjectsController < ApplicationController
       @subject.update_attributes(public: 1)
       ApplyAction.create(container_type: "ApplySubject", container_id: @subject.id, user_id: current_user.id, status: 0)
       begin
-        Educoder::Sms.send(mobile: '18711011226', send_type:'publish_subject' , name: '管理员')
+        Educoder::Sms.send(mobile: '17347001317', send_type:'publish_subject' , name: '管理员')
       rescue => e
         uid_logger_error("发送验证码出错: #{e}")
       end

app/models/course.rb

@@ -406,6 +406,15 @@ class Course < ApplicationRecord
     homework_commons.select{|homework| homework.homework_type == type}.size
   end
 
+  # 课堂作业数
+  def published_course_homework_count type
+    homework_commons.select{|homework| homework.homework_type == type && homework.publish_time.present? && homework.publish_time <= Time.now}.size
+  end
+
+  def student_works_count
+    StudentWork.joins(:homework_common).where(homework_commons: {course_id: id}).where("work_status > 0").size
+  end
+
   private
 
   #创建课程后，给该用户发送消息

app/services/create_watch_video_service.rb

@@ -33,12 +33,10 @@ class CreateWatchVideoService < ApplicationService
           if watch_course_video.present?
             watch_course_video.total_duration = watch_course_video.watch_video_histories.sum(:total_duration)
             watch_course_video.end_at = current_time
-            if !watch_course_video.is_finished && watch_course_video.watch_duration < params[:watch_duration]
+            if !watch_course_video.is_finished
               # 更新课程视频的时长及是否看完状态
-              watch_course_video.watch_duration = params[:watch_duration]
+              watch_course_video.watch_duration = params[:watch_duration] if watch_course_video.watch_duration < params[:watch_duration]
-              if params[:ed].present?
+              watch_course_video.is_finished = watch_course_video.total_duration >= watch_course_video.duration if params[:ed].present?
-                watch_course_video.is_finished = watch_course_video.total_duration >= watch_course_video.duration
-              end
             end
             watch_course_video.save!
           end

app/views/admins/courses/index.xlsx.axlsx

@@ -3,22 +3,28 @@ wb = xlsx_package.workbook
 wb.styles do |s|
   blue_cell = s.add_style :bg_color => "FAEBDC", :sz => 10,:height => 25,:b => true, :border => { :style => :thin, :color =>"000000" },:alignment => {wrap_text: true,:horizontal => :center,:vertical => :center}
   wb.add_worksheet(name: "课堂列表") do |sheet|
-    sheet.add_row %w(ID 课堂名称 成员 资源 普通作业 分组作业 实训作业 试卷 评测次数 私有 状态 单位 创建者 创建时间 动态时间), :height => 25,:style => blue_cell
+    sheet.add_row %w(ID 课堂名称 老师 学生 资源 公告 视频 普通作业 分组作业 实训作业 实训作业已发布数 作品数 试卷 评测次数 私有 状态 单位 部门 创建者 创建时间 动态时间), :height => 25,:style => blue_cell
 
     @courses.each do |course|
       data = [
         course.id,
         course.name,
-        course.course_members_count,
+        course.teacher_course_members.size,
+        course.students.size,
         get_attachment_count(course, 0),
-        course.course_homework_count(1),
+        course.informs.size,
-        course.course_homework_count(3),
+        course.course_videos.size,
-        course.course_homework_count(4),
+        course.course_homework_count("normal"),
+        course.course_homework_count("group"),
+        course.course_homework_count("practice"),
+        course.published_course_homework_count("practice"),
+        course.student_works_count,
         course.exercises_count,
         course.evaluate_count,
         course.is_public == 1 ? "--" : "√",
         course.is_end ? "已结束" : "正在进行",
         course.school&.name,
+        course.teacher&.department_name,
         course.teacher&.real_name,
         course.created_at&.strftime('%Y-%m-%d %H:%M'),
         course.max_activity_time ? course.max_activity_time&.strftime('%Y-%m-%d %H:%M') : "--"

app/views/admins/courses/shared/_list.html.erb

@@ -3,18 +3,22 @@
   <tr>
     <th width="4%">序号</th>
     <th width="4%">ID</th>
-    <th width="10%" class="text-left">课堂名称</th>
+    <th width="8%" class="text-left">课堂名称</th>
-    <th width="5%">成员</th>
+    <th width="4%">老师</th>
+    <th width="4%">学生</th>
     <th width="4%">资源</th>
+    <th width="4%">公告</th>
+    <th width="4%">视频</th>
     <th width="4%">普通作业</th>
     <th width="4%">分组作业</th>
     <th width="4%">实训作业</th>
+    <th width="4%">作品数</th>
     <th width="4%">试卷</th>
     <th width="6%">评测次数</th>
     <th width="4%">私有</th>
-    <th width="6%">状态</th>
+    <th width="4%">状态</th>
-    <th width="10%">单位</th>
+    <th width="8%">单位</th>
-    <th width="7%">创建者</th>
+    <th width="6%">创建者</th>
     <th width="10%"><%= sort_tag('创建时间', name: 'created_at', path: admins_courses_path) %></th>
     <th width="4%">首页</th>
     <th width="5%">邮件通知</th>

app/views/admins/courses/shared/_td.html.erb

@@ -3,11 +3,15 @@
 <td class="text-left">
   <%= link_to(course.name, "/classrooms/#{course.id}", target: '_blank') %>
 </td>
-<td><%= course.course_members_count %></td>
+<td><%= course.teacher_course_members.size %></td>
+<td><%= course.students.size %></td>
 <td><%= get_attachment_count(course, 0) %></td>
+<td><%= course.informs.size %></td>
+<td><%= course.course_videos.size %></td>
 <td><%= course.course_homework_count("normal") %></td>
 <td><%= course.course_homework_count("group") %></td>
 <td><%= course.course_homework_count("practice") %></td>
+<td><%= course.student_works_count %></td>
 <td><%= course.exercises_count %></td>
 <td><%= course.evaluate_count %></td>
 <td><%= course.is_public == 1 ? "--" : "√" %></td>

app/views/course_videos/watch_histories.json.jbuilder

@@ -2,7 +2,7 @@ json.data do
   json.array! @watch_course_videos do |d|
     json.user_name d.user&.real_name
     json.is_finished d.is_finished ? true : false
-    json.total_duration d.total_duration.round(2)
+    json.total_duration d.total_duration.round(0)
     json.feq d['freq']
     json.start_at d.start_at.to_s
     json.end_at d.end_at.to_s

app/views/courses/left_banner.json.jbuilder

@@ -30,6 +30,7 @@ json.course_modules @course_modules.each do |mod|
 
           json.third_category category.children do |child|
             json.partial! "category_info", category: child
+            json.parent_id child.parent_id
           end
         end
     end

app/views/courses/own_watch_histories.json.jbuilder

@@ -3,7 +3,7 @@ json.data do
     json.title d.title
     json.user_name @current_user&.real_name
     json.is_finished d.is_finished ? true : false
-    json.total_duration d.total_duration.round(2)
+    json.total_duration d.total_duration.round(0)
     json.freq d['freq']
     json.start_at d.start_at.to_s
     json.end_at d.end_at.to_s

app/views/courses/watch_video_histories.json.jbuilder

@@ -4,7 +4,7 @@ json.videos do
     json.title v.title
     json.user_name v.user&.real_name
     json.people_num v['people_num']
-    json.total_time v['total_time']
+    json.total_time v['total_time'].round(0)
   end
 end
 json.count @count

lib/educoder/sms.rb

@@ -21,7 +21,7 @@ module  Educoder
 
     def self.notify_admin(opt)
       opt[:name]   = '管理员'
-      opt[:mobile] = ENV['NOTIFY_ADMIN_PHONE'] || EduSetting.get('notify_admin_phone') || '18711085785'
+      opt[:mobile] = ENV['NOTIFY_ADMIN_PHONE'] || EduSetting.get('notify_admin_phone') || '18670760309'
       send(opt)
     end
 
@@ -49,7 +49,7 @@ module  Educoder
       elsif send_type == "apply_pro_certification" || send_type == "apply_auth"
         params['text'] = "【Edu实训】亲爱的#{name}，有新的#{send_type == 'apply_pro_certification'?'职业':'实名'}认证申请，请尽快处理"
       elsif send_type == "publish_subject" ||send_type == "publish_shixun"|| send_type == "user_apply_auth" || send_type == "discuss"
-        params['mobile'] = EduSetting.get('subject_shixun_notify_phone') || '18711011226' if send_type == "publish_subject" || send_type == "publish_shixun"
+        params['mobile'] = EduSetting.get('subject_shixun_notify_phone') || '17347001317' if send_type == "publish_subject" || send_type == "publish_shixun"
         params['text'] = "【Edu实训】亲爱的#{name}，有新的#{send_type == 'publish_subject'?'实训路径':(send_type == 'publish_shixun' ? '实训' : (send_type == 'discuss' ? '实训评论':'试用'))}申请发布，请尽快处理"
       elsif send_type == 'join_course_multi_role'
         params['text'] = "【Edu实训】亲爱的#{user_name}，您的课堂#{name}有助教或者教师申请加入，请尽快审核"

public/react/src/modules/courses/Video/VideoIndex.js

@@ -12,7 +12,7 @@ import Videostatistics from '../videostatistics/Videostatistics';
 import './video.css';
 import '../css/Courses.css';
 import '../publicNav/nav.css';
-
+import Videostatisticscomtwo from '../videostatistics/component/Videostatisticscomtwo';
 const PAGE_SIZE = 15;
 const LIVE_PAGE_SIZE = 10;
 const $ = window.$;
@@ -378,7 +378,12 @@ class VideoIndex extends Component {
 							</div>
 						</div>
 						:
+						(
+							isAdmin?
 								<Videostatistics {...this.props} {...this.state} statisticsy={(b) => this.statisticsy(b)}></Videostatistics>
+								:
+								<Videostatisticscomtwo {...this.props} {...this.state} mytitle={""} ></Videostatisticscomtwo>
+						)
 				}
 				{
 					statistics === false ?

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -2519,7 +2519,6 @@ class Listofworksstudentone extends Component {
 		axios.get(url).then((response) => {
 			if (response) {
 				if (response.data.status === 0) {
-					setTimeout(() => {
 						this.props.showNotification(`${response.data.message}`);
 						// var homeworkid = this.props.match.params.homeworkid;
 						this.Getalistofworks(homeworkid, false);
@@ -2529,12 +2528,14 @@ class Listofworksstudentone extends Component {
 						} catch (e) {
 
 						}
-					}, 2500);
 				}
 			}
 			// this.Getalistofworkstwo("", "", "", "", 1, 20);
 		}).catch((error) => {
 			console.log(error)
+			this.setState({
+				computeTimetype:true
+			})
 		});
 
 	}
@@ -3364,10 +3365,6 @@ class Listofworksstudentone extends Component {
 		axios.get(url).then((response) => {
 			if (response) {
 				if (response.data.status === 0) {
-					// if(response.data.message!==undefined){
-					// 	return;
-					// }
-					setTimeout(() => {
 						this.setState({
 							loadingstate: true
 						})
@@ -3382,13 +3379,13 @@ class Listofworksstudentone extends Component {
 						} catch (e) {
 
 						}
-
-					}, 2500);
 				}
-				// this.props.history.replace( matchurl );
 			}
 		}).catch((error) => {
 			console.log(error)
+			this.setState({
+				computeTimetype:true
+			})
 		});
 
 	};
@@ -3672,27 +3669,9 @@ class Listofworksstudentone extends Component {
 
 											<li className="clearfix mt10">
 												<div className="fr search-newysl" style={{marginBottom: '1px'}}>
-													{/*{course_is_end===true?"":<span>*/}
+
-													{/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
-													{/*	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
-													{/*		查看最新成绩*/}
-													{/*	</div>:""):*/}
-													{/*	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-													{/*		(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
-													{/*			查看最新成绩*/}
-													{/*		</div>:"")*/}
-													{/*}*/}
-													{/*</span>}*/}
 													<span className="search-newyslw fr ml20">
-										{/*<Search*/}
+
-										{/*	placeholder="请输入姓名或学号搜索"*/}
-										{/*	id="subject_search_input"*/}
-										{/*	autoComplete="off"*/}
-										{/*	value={searchtext}*/}
-										{/*	// onKeyUp={(e) => this.onSearchKeywordKeyUpt(e)}*/}
-										{/*	onInput={this.inputSearchValuest}*/}
-										{/*	onSearch={this.searchValuest}*/}
-										{/*></Search>*/}
 										 {publicSearchs("请输入姓名或学号搜索",this.searchValuest,this.inputSearchValuest,this.inputSearchValuest)}
 										</span>
 												</div>
@@ -3993,27 +3972,7 @@ class Listofworksstudentone extends Component {
 
 																	<div className="fr">
 
-																		{/*<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
+
-																		{/*							{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
-																		{/*	{computeTimetype===true?*/}
-																		{/*		(this.props.isNotMember()===false?*/}
-																		{/*			(*/}
-																		{/*				teacherdata&&teacherdata.update_score===true?*/}
-																		{/*					<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
-																		{/*						查看最新成绩*/}
-																		{/*					</div>*/}
-																		{/*					:""*/}
-																		{/*			)*/}
-																		{/*			:"")*/}
-																		{/*		:*/}
-																		{/*		(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-																		{/*			this.props.isNotMember()===false?*/}
-																		{/*				<div className={"computeTimes font-16"}>*/}
-																		{/*					查看最新成绩*/}
-																		{/*				</div>*/}
-																		{/*				:"")*/}
-																		{/*	}*/}
-																		{/*</span>}*/}
 
 																	</div>
 
@@ -4238,24 +4197,7 @@ class Listofworksstudentone extends Component {
 																	</style>
 																	<div className="fr">
 
-																		{/*<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
+
-																		{/*				{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
-																		{/*	{computeTimetype===true?*/}
-
-																		{/*		(this.props.isNotMember()===false?*/}
-																		{/*			(*/}
-																		{/*				teacherdata&&teacherdata.update_score===true?*/}
-																		{/*					<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
-																		{/*						查看最新成绩*/}
-																		{/*					</div>:""*/}
-																		{/*			)*/}
-																		{/*			:""):*/}
-																		{/*		teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-																		{/*			(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
-																		{/*				查看最新成绩*/}
-																		{/*			</div>:"")*/}
-																		{/*	}*/}
-																		{/*</span>}*/}
 																	</div>
 																</div>
 															</div>

public/react/src/modules/courses/signin/component/Detailss.js

@@ -65,9 +65,16 @@ class Detailss extends Component {
 					position: "relative"
 				}}>
 					<div className="ws100s teacherentrydiv ">
-						<p className="ws100s teachedivp ymaxnamewidthdivp">
+						<div className="ws100s sortinxdirection">
+							<p className="sortinxdirection" style={{color:'#5091FF'}} onClick={()=>this.props.qiandaoxiangq(false)}>
+								<i style={{color:'#5091FF'}} className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}></i>
+								<p style={{color:'#5091FF'}} className="fh mr27 colorbluesigin xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}>返回</p>
+							</p>
+							<p className="ws100s teachedivp ymaxnamewidthdivp86">
 								{item && item.name}
 							</p>
+						</div>
+
 
 						<div className="ws100s sortinxdirection mt17">
 							<div className="teachedivps">

public/react/src/modules/courses/signin/css/signincdi.css

@@ -102,6 +102,9 @@
 .ws50s{
      width: 50%;
  }
+.ws40s{
+    width: 40%;
+}
 .hs30s{
     height: 30%;
 }
@@ -211,6 +214,14 @@
     white-space:nowrap;
     cursor: default;
 }
+.ymaxnamewidthdivp86{
+    max-width:86%;
+    width: 86%;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
 .teachedivps{
     font-size:14px;
     font-family:Microsoft YaHei;
@@ -408,6 +419,14 @@
     white-space:nowrap;
     cursor: default;
 }
+.maxnamewidth140s{
+    width: 140px;
+    max-width: 140px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
 .maxnamewidth200s{
     text-align: center;
     width: 200px;
@@ -425,6 +444,14 @@
     white-space:nowrap;
     cursor: default;
 }
+.maxnamewidth90s{
+    width: 90px;
+    max-width: 90px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
 .maxnamewidth100s{
     width: 100px;
     max-width: 100px;
@@ -440,3 +467,6 @@
 .mr32{
     margin-right: 32px;
 }
+.mr27{
+    margin-right: 27px;
+}

public/react/src/modules/courses/signin/student/Signindetails.js

@@ -43,14 +43,8 @@ class Signindetails extends Component{
 				<div className="ws100s" style={{
 					position: "relative",
 				}}>
-					<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>
           <Detailss
+						qiandaoxiangq={(b)=>this.props.qiandaoxiangq(b)}
 						defaultActiveKey={this.props.defaultActiveKey}
 						headdata={headdata}
 						switattendance_id={this.props.switattendance_id}

public/react/src/modules/courses/videostatistics/Videostatistics.js

@@ -14,6 +14,7 @@ class Videostatistics extends Component{
 			watch_staticsdata:[],
 			tisticsbool:false,
 			tisid:null,
+			mytitle:""
 		}
 
 
@@ -43,16 +44,17 @@ class Videostatistics extends Component{
 		 });
 	 }
 
-	tisticsbools=(bool,id)=>{
+	tisticsbools=(bool,id,mytitle)=>{
 		this.setState({
 			tisticsbool:bool,
 			tisid:id,
+			mytitle:mytitle
 		})
 	}
 
 
 	render(){
-		let {watch_staticsdata,tisticsbool,tisid}= this.state;
+		let {watch_staticsdata,tisticsbool,tisid,mytitle}= this.state;
 
 		return(
 			<React.Fragment>
@@ -62,28 +64,19 @@ class Videostatistics extends Component{
 							<div className="ws100s" style={{
 								position: "relative",
 							}}>
-								<div className="ws100s xaxisreverseorder" style={{
-									position: "absolute",
-									top: "-29px",
-								}}>
-									<p className="sortinxdirection xiaoshou" onClick={()=>this.props.statisticsy(false)}>
-										<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5"></i>
-										<p className="fh mr20">	返回</p>
-									</p>
 
-								</div>
+								<Videostatisticscom {...this.state} {...this.props} watch_staticsdata={watch_staticsdata} statisticsy={(b)=>this.props.statisticsy(b)}></Videostatisticscom>
-								<Videostatisticscom {...this.state} {...this.props} watch_staticsdata={watch_staticsdata} ></Videostatisticscom>
 
 
 
 								<div>
-									<Videostatisticslist  {...this.state} {...this.props} tisticsbools={(b,id)=>this.tisticsbools(b,id)}></Videostatisticslist>
+									<Videostatisticslist  {...this.state} {...this.props} tisticsbools={(b,id,t)=>this.tisticsbools(b,id,t)}></Videostatisticslist>
 
 
 								</div>
 							</div>
 							:
-            <Videostatisticscomtwo  {...this.state} {...this.props} tisid={tisid} tisticsbools={(b,id)=>this.tisticsbools(b,id)}></Videostatisticscomtwo>
+            <Videostatisticscomtwo  {...this.state} {...this.props} tisid={tisid} mytitle={mytitle} tisticsbools={(b,id,t)=>this.tisticsbools(b,id,t)}></Videostatisticscomtwo>
 					}
 
 				</div>

public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js

@@ -35,7 +35,11 @@ class Videostatisticscom extends Component {
 				}}>
 					<div className="ws100s teacherentrydivss ">
 						<div className="ws100s sortinxdirection">
-							<div className="ws50s sptits">视频统计总览</div>
+								<p className="sortinxdirection h40s" onClick={()=>this.props.statisticsy(false)} style={{color:'#5091FF'}}>
+									<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin xiaoshou h40s" onClick={()=>this.props.statisticsy(false)} style={{color:'#5091FF'}}></i>
+									<p style={{color:'#5091FF'}} className="fh mr20 colorbluesigin xiaoshou h40s" onClick={()=>this.props.statisticsy(false)}>返回</p>
+								</p>
+							<div className="ws40s sptits font-18">视频统计总览</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>

public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js

@@ -5,6 +5,7 @@ import {getImageUrl, sortDirections,formatSeconds} from 'educoder';
 import axios from 'axios';
 import LoadingSpin from "../../../../common/LoadingSpin";
 import NoneDatas from "../../signin/component/NoneDatas";
+import moment from 'moment';
 
 
 //条目
@@ -52,9 +53,9 @@ class Videostatisticscomtwo extends Component {
 					key: 'is_finished',
 					align: "center",
 					className: 'font-14',
-					width: '98px',
+					width: '90px',
 					render: (text, record) => (
-						<span style={{width: '98px'}}>{record.is_finished === true ?
+						<span style={{width: '90px'}}>{record.is_finished === true ?
 							<span style={{color: "#5091FF"}}>是</span> : <span style={{color: "#E02020"}}>否</span>}</span>
 					),
 				},
@@ -63,12 +64,12 @@ class Videostatisticscomtwo extends Component {
 					dataIndex: 'total_duration',
 					key: 'total_duration',
 					align: "center",
-					className: 'font-14 maxnamewidth150s',
+					className: 'font-14 maxnamewidth140s',
-					width: '150px',
+					width: '140px',
 					sorter: true,
 					sortDirections: sortDirections,
 					render: (text, record) => (
-						<span style={{width: '150px'}} className="maxnamewidth150s"><a className="maxnamewidth150s" style={{
+						<span style={{width: '140px'}} className="maxnamewidth140s"><a className="maxnamewidth140s" style={{
 							color:"#333333"
 						}} title={record.total_duration}>{record.total_duration}</a></span>
 					),
@@ -78,13 +79,13 @@ class Videostatisticscomtwo extends Component {
 					dataIndex: 'feq',
 					key: 'feq',
 					align: "center",
-					className: 'font-14 maxnamewidth100s',
+					className: 'font-14 maxnamewidth140s',
-					width: '100px',
+					width: '140px',
 					sorter: true,
 					sortDirections: sortDirections,
 					render: (text, record) => (
-						<span style={{width: '100px'}} className="maxnamewidth100s">
+						<span style={{width: '140px'}} className="maxnamewidth140s">
-						<a  className="maxnamewidth100s" style={{
+						<a  className="maxnamewidth140s" style={{
 							color:"#333333"
 						}}  title={record.feq}>{record.feq}</a>
 						</span>
@@ -95,13 +96,13 @@ class Videostatisticscomtwo extends Component {
 					dataIndex: 'start_at',
 					key: 'start_at',
 					align: "center",
-					className: 'font-14 maxnamewidth100s',
+					className: 'font-14 maxnamewidth90s',
-					width: '100px',
+					width: '90px',
 					render: (text, record) => (
-						<span style={{width: '100px'}} >
+						<span style={{width: '90px'}} >
-							<a  className="maxnamewidth100s" style={{
+							<a  className="maxnamewidth90s" style={{
 								color:"#333333"
-							}}  title=	{record.start_at}>	{record.start_at}</a>
+							}}  title=	{moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')}>	{record.start_at}</a>
 						</span>
 					),
 				},
@@ -110,13 +111,13 @@ class Videostatisticscomtwo extends Component {
 					dataIndex: 'end_at',
 					key: 'end_at',
 					align: "center",
-					className: 'font-14 maxnamewidth100s',
+					className: 'font-14 maxnamewidth90s',
-					width: '100px',
+					width: '90px',
 					render: (text, record) => (
-						<span style={{width: '100px'}} >
+						<span style={{width: '90px'}} >
-								<a  className="maxnamewidth100s" style={{
+								<a  className="maxnamewidth90s" style={{
 									color:"#333333"
-								}}  title=	{record.end_at}>{record.end_at}</a>
+								}}  title={moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')}>{record.end_at}</a>
 						</span>
 					),
 				}
@@ -126,6 +127,7 @@ class Videostatisticscomtwo extends Component {
 			course_groups: [],
 			fbbool: false,
 			groupsid: null,
+			none_group_member_count:0,
 		}
 	}
 
@@ -164,9 +166,9 @@ class Videostatisticscomtwo extends Component {
 		let url = `/courses/${CourseId}/course_groups.json`;
 		axios.get(url).then((response) => {
 			if (response) {
-				console.log("分班");
+				// console.log("分班");
-				console.log("response");
+				// console.log("response");
-				console.log(response);
+				// console.log(response);
 				this.setState({
 					course_groups: response.data.course_groups,
 					current_group_id: response.data.current_group_id,
@@ -206,6 +208,7 @@ class Videostatisticscomtwo extends Component {
 								feq: response.data.data[i].feq,
 								start_at: response.data.data[i].start_at,
 								end_at: response.data.data[i].end_at,
+								title: response.data.data[i].title,
 							})
 						}
 
@@ -288,12 +291,26 @@ class Videostatisticscomtwo extends Component {
 				group_id: id
 			}
 
+		} else {
+			try {
+				if(id!==null&&id===0){
+					data = {
+						id: CourseId,
+						page: this.state.page,
+						group_id: id
+					}
 				}else{
 					data = {
 						id: CourseId,
 						page: this.state.page
 					}
 				}
+
+			}catch (e) {
+
+			}
+
+		}
 		this.getdatas(data);
 	}
 
@@ -398,7 +415,7 @@ class Videostatisticscomtwo extends Component {
 
 	render() {
 		let {loading, data, page, limit, members_count, columnsstu, fbbool, course_groups} = this.state;
-		const isAdmin = this.props.isAdmin();
+		const isAdmin = this.props&& this.props.isAdmin();
 
 		const menu = (
 			<Menu>
@@ -423,21 +440,57 @@ class Videostatisticscomtwo extends Component {
 						:
 						""
 				}
+				{
+					this.state.none_group_member_count&&this.state.none_group_member_count>0?
+						<Menu.Item>
+							<a onClick={() => this.setcourse_groups(0)}>
+								<p className="maxnamewidth200yss">未分班</p>
+							</a>
+						</Menu.Item>
+						:
+						""
+				}
 			</Menu>
 		);
+
+		let mytitle="";
+		if(isAdmin){
+			mytitle=this.props&&this.props.mytitle;
+
+		}else{
+			if(this.state.data){
+				if(this.state.data.length>0){
+					try {
+						if(this.state.data[0].title){
+							mytitle=this.state.data[0].title;
+						}
+					}catch (e) {
+
+					}
+
+				}
+			}
+
+		}
+
 		return (
 			<React.Fragment>
 				<div className="ws100s">
 					<div className="ws100s teacherentrydivss edu-back-white ">
 						<div className="ws100s sortinxdirection">
-							<div className="ws50s sptits">视频名称视频名称…</div>
+							<div className="ws50s sptits font-18">{mytitle}</div>
 							<div className="ws50s sptitss xaxisreverseorder font-14" style={{
 								color: "#5091FF",
 								lineHeight: "42px",
 							}}>
+								{
+									isAdmin === true ?
 										<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()}>
@@ -447,9 +500,9 @@ class Videostatisticscomtwo extends Component {
 										 	<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>
+												 :
+												 <i className="iconfont icon-sanjiaoxing-down  font-13 mr32 xiaoshou"></i>
 										 }
 									 </span>
 											</Dropdown>
@@ -466,13 +519,13 @@ class Videostatisticscomtwo extends Component {
 							{
 								`
 								 .ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
-									 padding: 10px 10px;
+									 padding: 10px 5px;
 									}
 								`
 							}
 						</style>
 
-								<div className="ws100s ysltableo mt10">
+								<div className="ws100s ysltableo mt10" style={{	minHeight: "400px"}}>
 									{
 										data.length === 0 ?
 											<div style={{

public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js

@@ -97,7 +97,7 @@ class Videostatisticslist extends Component {
 					className: 'font-14',
 					width: '50px',
 					render: (text, record) => (
-						<span style={{width: '50px',color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id)}>详情</span>
+						<span style={{width: '50px',color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id,record.title)}>详情</span>
 					),
 				}
 			],
@@ -252,7 +252,7 @@ class Videostatisticslist extends Component {
 					<div className="ws100s edu-back-white">
 						<div className="ws100s teacherentrydivss ">
 							<div className="ws100s sortinxdirection">
-								<div className="ws100s sptits">统计详情</div>
+								<div className="ws100s sptits font-16">统计详情</div>
 							</div>
 
 						</div>
@@ -266,7 +266,7 @@ class Videostatisticslist extends Component {
 							}
 						</style>
 
-								<div className="ws100s ysltableo teacherentrydivs pdinstop0">
+								<div className="ws100s ysltableo teacherentrydivs pdinstop0" style={{	minHeight: "400px"}}>
 									{
 										data.length===0?
 											<div style={{