diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b7a74cbc1..90a5e494e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -321,7 +321,7 @@ class ApplicationController < ActionController::Base end if !User.current.logged? && Rails.env.development? - User.current = User.find 3117 + User.current = User.find 1 end diff --git a/app/controllers/discusses_controller.rb b/app/controllers/discusses_controller.rb index 3b1dff96b..e6570a8bf 100644 --- a/app/controllers/discusses_controller.rb +++ b/app/controllers/discusses_controller.rb @@ -81,8 +81,7 @@ class DiscussesController < ApplicationController begin @discuss = Discuss.create!(:dis_id => params[:container_id], :dis_type => params[:container_type], :content => params[:content].gsub(" \;", "").strip, :user_id => current_user.id, - :praise_count => 0, :position => params[:position], :challenge_id => params[:challenge_id], - :hidden => !current_user.admin?) # 管理员回复的能够显示 + :praise_count => 0, :position => params[:position], :challenge_id => params[:challenge_id]) rescue Exception => e uid_logger_error("create discuss failed : #{e.message}") raise Educoder::TipException.new("评论异常，原因：#{e.message}") diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb index f091356eb..c3421215d 100644 --- a/app/controllers/ecloud_controller.rb +++ b/app/controllers/ecloud_controller.rb @@ -262,7 +262,7 @@ class EcloudController < ApplicationController u.login = "ecoder_#{user_info['mobile']}" u.type ='User' u.status = User::STATUS_ACTIVE - u.nickname = user_info[:username] + u.nickname = user_info['username'] u.lastname = user_info['username'] end diff --git a/app/controllers/weapps/attendances_controller.rb b/app/controllers/weapps/attendances_controller.rb index f61cc95c2..6804f0ce4 100644 --- a/app/controllers/weapps/attendances_controller.rb +++ b/app/controllers/weapps/attendances_controller.rb @@ -1,9 +1,10 @@ class Weapps::AttendancesController < ApplicationController before_action :require_login - before_action :find_course, only: [:create, :index, :student_attendances] - before_action :find_attendance, except: [:create, :index, :student_attendances] + before_action :find_course, only: [:create, :index, :student_attendances, :history_attendances] + before_action :find_attendance, except: [:create, :index, :student_attendances, :history_attendances] before_action :user_course_identity before_action :teacher_allowed, only: [:create] + before_action :edit_auth, only: [:update, :destroy, :end] def create ActiveRecord::Base.transaction do @@ -13,19 +14,34 @@ class Weapps::AttendancesController < ApplicationController group_ids.each do |group_id| @course.course_attendance_groups.create!(course_group_id: group_id, course_attendance: attendance) end + CreateStudentAttendanceRecordJob.perform_now(attendance.id, group_ids) else @course.course_attendance_groups.create!(course_group_id: 0, course_attendance: attendance) + CreateStudentAttendanceRecordJob.perform_later(attendance.id, [0]) end render_ok({attendance_id: attendance.id}) end end def index + tip_exception(403) if @user_course_identity >= Course::STUDENT + current_date = Date.current + current_end_time = Time.current.strftime("%H:%M:%S") + @current_attendance = @course.course_attendances.where("attendance_date = '#{current_date}' and end_time > '#{current_end_time}'").take + + all_attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')") + @all_member_attendances = CourseMemberAttendance.where(course_attendance_id: all_attendances) + if params[:group_id].present? + all_attendances = all_attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: [params[:group_id], 0]}) + @all_member_attendances = @all_member_attendances.joins(:course_member).where(course_members: {course_group_id: params[:group_id]}) + end + @history_attendances = all_attendances.order("id asc") + @all_history_count = @history_attendances.size end def student_attendances - tip_exception(403, "") if @user_course_identity != Course::STUDENT + tip_exception("学生身份的签到列表") if @user_course_identity != Course::STUDENT member = @course.students.find_by(user_id: current_user.id) current_date = Date.current current_end_time = Time.current.strftime("%H:%M:%S") @@ -49,8 +65,8 @@ class Weapps::AttendancesController < ApplicationController @leave_count = 0 @absence_count = 0 else - @normal_count = @course.course_member_attendances.where(course_attendance_id: student_attendance_ids, attendance_status: 1).size - @leave_count = @course.course_member_attendances.where(course_attendance_id: student_attendance_ids, attendance_status: 2).size + @normal_count = @course.course_member_attendances.where(course_attendance_id: student_attendance_ids, attendance_status: "NORMAL").size + @leave_count = @course.course_member_attendances.where(course_attendance_id: student_attendance_ids, attendance_status: "LEAVE").size @absence_count = student_attendance_ids.uniq.size - @normal_count - @leave_count end @@ -59,17 +75,49 @@ class Weapps::AttendancesController < ApplicationController end def show + @normal_count = @attendance.normal_count + @leave_count = @attendance.leave_count + @absence_count = @attendance.absence_count + @all_count = @attendance.course_member_attendances.size + + @_is_current_attendance = @attendance.current_attendance? + if @attendance.course_attendance_groups.first&.course_group_id.to_i == 0 + @groups = @course.course_groups + else + @groups = @course.course_groups.where(id: @attendance.course_attendance_groups.pluck(:course_group_id)) + end + + @groups = @groups.includes(:course_members) if @_is_current_attendance + + @all_attendances = @attendance.course_member_attendances end def update - tip_exception(403, "") unless @user_course_identity < Course::PROFESSOR || @attendance.user_id == current_user.id @attendance.update!(name: params[:name]) render_ok end def destroy + @attendance.destroy! + render_ok + end + + def history_attendances + current_date = Date.current + current_end_time = Time.current.strftime("%H:%M:%S") + + @history_attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or + (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')").order("id desc") + @all_history_count = @history_attendances.size + @history_attendances = paginate @history_attendances.includes(:course_member_attendances) + end + def end + a_end_time = "#{@attendance.attendance_date} #{@attendance.end_time}".to_time + tip_exception("该签到已截止") unless @attendance.current_attendance? + @attendance.update!(end_time: Time.current) + render_ok end private @@ -81,4 +129,8 @@ class Weapps::AttendancesController < ApplicationController @attendance = CourseAttendance.find params[:id] @course = @attendance.course end + + def edit_auth + tip_exception(403, "") unless @user_course_identity < Course::PROFESSOR || @attendance.user_id == current_user.id + end end \ No newline at end of file diff --git a/app/controllers/weapps/course_member_attendances_controller.rb b/app/controllers/weapps/course_member_attendances_controller.rb index 9eca18d4b..d4183c512 100644 --- a/app/controllers/weapps/course_member_attendances_controller.rb +++ b/app/controllers/weapps/course_member_attendances_controller.rb @@ -1,9 +1,21 @@ class Weapps::CourseMemberAttendancesController < ApplicationController before_action :require_login + before_action :find_course, :user_course_identity, only: [:update_status] + + def index + attendance = CourseAttendance.find params[:attendance_id] + @member_attendances = attendance.course_member_attendances + if params[:group_ids].present? + @member_attendances = @member_attendances.joins(:course_member).where(course_members: {course_group_id: params[:group_ids]}) + end + @member_attendances = @member_attendances.where(attendance_status: params[:attendance_status]) if params[:attendance_status].present? + @member_attendances = @member_attendances.joins(user: :user_extension).order("user_extensions.student_id asc") + @member_attendances = paginate @member_attendances.preload(user: :user_extension) + end def create tip_exception("签到码不能为空") if params[:code].blank? - tip_exception("attendance_mode参数不对") if [1, 2].include?(params[:attendance_mode]) + tip_exception("attendance_mode参数不对") unless ["NUMBER", "QRCODE"].include?(params[:attendance_mode]) attendance = CourseAttendance.find_by(attendance_code: params[:code]) tip_exception("签到码输入有误") if attendance.blank? || attendance.course.blank? @@ -11,19 +23,38 @@ class Weapps::CourseMemberAttendancesController < ApplicationController member = attendance.course.students.find_by(user_id: current_user.id) tip_exception("签到码输入有误") if member.blank? - start_time = "#{attendance.attendance_date} #{attendance.start_time}".to_time - end_time = "#{attendance.attendance_date} #{attendance.end_time}".to_time - Rails.logger.info("##############{start_time} #{end_time}") - tip_exception("不在签到时间内") unless start_time < Time.current && Time.current < end_time + tip_exception("不在签到时间内") unless attendance.current_attendance? - current_attendance = attendance.course_member_attendances.find_by(user_id: current_user.id) - tip_exception("请勿重复签到") if current_attendance.present? && current_attendance.attendance_status == 1 - tip_exception("您当前是请假状态，无法签到") if current_attendance.present? && current_attendance.attendance_status == 2 - tip_exception("您当前是旷课状态，无法签到") if current_attendance.present? && current_attendance.attendance_status == 0 + tip_exception("只支持数字签到") if attendance.mode != "ALL" && attendance.mode == "NUMBER" && params[:attendance_mode] == "QRCODE" + tip_exception("只支持二维码签到") if attendance.mode != "ALL" && attendance.mode == "QRCODE" && params[:attendance_mode] == "NUMBER" - unless current_attendance.present? + current_attendance = attendance.course_member_attendances.find_by(user_id: current_user.id) + if current_attendance.present? + tip_exception("请勿重复签到") if current_attendance.attendance_status == "NORMAL" + tip_exception("您当前是请假状态，无法签到") if current_attendance.attendance_status == "LEAVE" + tip_exception("您当前是旷课状态，无法签到") if current_attendance.attendance_status == "ABSENCE" && current_attendance.attendance_mode == "TEACHER" + current_attendance.update!(attendance_status: "NORMAL", attendance_mode: params[:attendance_mode]) + else attendance.course_member_attendances.create!(course_member_id: member.id, user_id: current_user.id, course_id: attendance.course_id, - course_group_id: member.course_group_id, attendance_status: 1, attendance_mode: params[:attendance_mode] || 2) + course_group_id: member.course_group_id, attendance_status: "NORMAL", attendance_mode: params[:attendance_mode]) + end + + render_ok + end + + def update_status + tip_exception("user_id不能为空") if params[:user_id].blank? + tip_exception(403, "无权限调整签到状态") if @user_course_identity > Course::ASSISTANT_PROFESSOR + tip_exception("attendance_status参数不对") unless ["NORMAL", "LEAVE", "ABSENCE"].include?(params[:attendance_status]) + attendance = @course.course_attendances.find_by!(id: params[:attendance_id]) + current_attendance = attendance.course_member_attendances.find_by(user_id: params[:user_id]) + if current_attendance.present? + current_attendance.update!(attendance_status: params[:attendance_status], attendance_mode: "TEACHER") + else + member = attendance.course.students.find_by(user_id: params[:user_id]) + tip_exception( "该用户非课堂学生") if member.blank? + attendance.course_member_attendances.create!(course_member_id: member.id, user_id: params[:user_id], course_id: attendance.course_id, + course_group_id: member.course_group_id, attendance_status: params[:attendance_status], attendance_mode: "TEACHER") end render_ok end diff --git a/app/helpers/weapps/attendances_helper.rb b/app/helpers/weapps/attendances_helper.rb index 087084288..30591c149 100644 --- a/app/helpers/weapps/attendances_helper.rb +++ b/app/helpers/weapps/attendances_helper.rb @@ -2,6 +2,19 @@ module Weapps::AttendancesHelper def student_attendance_status attendance, user st_attendance = attendance.course_member_attendances.find_by(user_id: user.id) - st_attendance.present? ? st_attendance.attendance_status : 0 + st_attendance.present? ? st_attendance.attendance_status : "ABSENCE" + end + + def group_attendance_count attendances, group + course_member_ids = group.course_members.pluck(:id) + attendances.select{|attendance| course_member_ids.include?(attendance.course_member_id) && attendance.attendance_status == "NORMAL"}.size + end + + def history_member_count member_attendances, status, attendance_id + member_attendances.select{|member_attendance| member_attendance.attendance_status == status && member_attendance.course_attendance_id == attendance_id}.size + end + + def cal_rate base, sum + sum == 0 ? 0 : (base.to_f / sum) end end \ No newline at end of file diff --git a/app/jobs/create_student_attendance_record_job.rb b/app/jobs/create_student_attendance_record_job.rb new file mode 100644 index 000000000..83a353565 --- /dev/null +++ b/app/jobs/create_student_attendance_record_job.rb @@ -0,0 +1,26 @@ +class CreateStudentAttendanceRecordJob < ApplicationJob + queue_as :default + + def perform(attendance_id, group_ids) + attendance = CourseAttendance.find_by(id: attendance_id) + course = attendance.course + return if attendance.blank? || course.blank? + + if group_ids.include?(0) + students = course.students + else + students = course.students.where(course_group_id: group_ids) + end + + attrs = %i[course_attendance_id user_id course_member_id course_id course_group_id created_at updated_at] + + same_attrs = {course_attendance_id: attendance.id, course_id: course.id} + + CourseMemberAttendance.bulk_insert(*attrs) do |worker| + + students.each do |student| + worker.add same_attrs.merge(user_id: student.user_id, course_member_id: student.id, course_group_id: student.course_group_id) + end + end + end +end diff --git a/app/jobs/student_join_attendance_record_job.rb b/app/jobs/student_join_attendance_record_job.rb new file mode 100644 index 000000000..f1b33c492 --- /dev/null +++ b/app/jobs/student_join_attendance_record_job.rb @@ -0,0 +1,28 @@ +class StudentJoinAttendanceRecordJob < ApplicationJob + queue_as :default + + def perform(member_id) + member = CourseMember.find_by(id: member_id) + course = member&.course + return if member.blank? || course.blank? + + current_date = Date.current + current_end_time = Time.current.strftime("%H:%M:%S") + group_ids = member.course_group_id == 0 ? [0] : [member.course_group_id, 0] + + current_attendance_ids = course.course_attendances.joins(:course_attendance_groups).where(course_group_id: group_ids). + where("(attendance_date = '#{current_date}' and start_time <= '#{current_end_time}' and end_time > '#{current_end_time}') or (attendance_date > '#{current_date}')").pluck(:id) + + + attrs = %i[course_attendance_id user_id course_member_id course_id course_group_id created_at updated_at] + + same_attrs = {course_member_id: member_id, course_id: course.id, user_id: member.user_id, course_group_id: member.course_group_id} + + CourseMemberAttendance.bulk_insert(*attrs) do |worker| + + current_attendance_ids.each do |attendance_id| + worker.add same_attrs.merge(course_attendance_id: attendance_id) + end + end + end +end diff --git a/app/models/course_attendance.rb b/app/models/course_attendance.rb index f3bcffc56..72a09750c 100644 --- a/app/models/course_attendance.rb +++ b/app/models/course_attendance.rb @@ -1,5 +1,8 @@ class CourseAttendance < ApplicationRecord + # status: 0: 未开启，1：已开启，2：已截止 # mode: 0 两种签到，1 二维码签到，2 数字签到 + enum mode: { ALL: 0, QRCODE: 1, NUMBER: 2 } + belongs_to :course belongs_to :user @@ -14,6 +17,32 @@ class CourseAttendance < ApplicationRecord after_create :generate_attendance_code + # 正常签到人数 + def normal_count + course_member_attendances.select{|member_attendance| member_attendance.attendance_status == "NORMAL"}.size + end + + # 请假人数 + def leave_count + course_member_attendances.select{|member_attendance| member_attendance.attendance_status == "LEAVE"}.size + end + + # 旷课人数 + def absence_count + course_member_attendances.select{|member_attendance| member_attendance.attendance_status == "ABSENCE"}.size + end + + # 总人数 + def all_count + course_member_attendances.size + end + + def current_attendance? + a_start_time = "#{attendance_date} #{start_time}".to_time + a_end_time = "#{attendance_date} #{end_time}".to_time + a_start_time < Time.current && Time.current < a_end_time + end + # 延迟生成邀请码 def attendance_code return generate_attendance_code diff --git a/app/models/course_member.rb b/app/models/course_member.rb index 4772f0c36..ec326a7ca 100644 --- a/app/models/course_member.rb +++ b/app/models/course_member.rb @@ -23,6 +23,12 @@ class CourseMember < ApplicationRecord # after_destroy :delete_works # after_create :work_operation + after_create :create_attendance_record + + def create_attendance_record + StudentJoinAttendanceRecordJob.perform_later(id) + end + def delete_works if self.role == "STUDENT" course = self.course diff --git a/app/models/course_member_attendance.rb b/app/models/course_member_attendance.rb index 3b8aafda0..152bb48b6 100644 --- a/app/models/course_member_attendance.rb +++ b/app/models/course_member_attendance.rb @@ -1,6 +1,8 @@ class CourseMemberAttendance < ApplicationRecord - # attendance_mode ：1 二维码签到，2 数字签到，3 老师签到 + # attendance_mode ：0 初始数据，1 二维码签到，2 数字签到，3 老师签到 + enum attendance_mode: { DEFAULT: 0, QRCODE: 1, NUMBER: 2, TEACHER: 3} # attendance_status ：1 正常签到，2 请假，0 旷课 + enum attendance_status: { NORMAL: 1, LEAVE: 2, ABSENCE: 0 } belongs_to :course_member belongs_to :user belongs_to :course diff --git a/app/services/application_service.rb b/app/services/application_service.rb index 81c48de95..6bf1c807a 100644 --- a/app/services/application_service.rb +++ b/app/services/application_service.rb @@ -9,6 +9,10 @@ class ApplicationService content.gsub(regex, '') end + def convert_https content + content.gsub("http:", "https:") + end + private def strip(str) diff --git a/app/services/videos/dispatch_callback_service.rb b/app/services/videos/dispatch_callback_service.rb index b32c87c4e..5adebea73 100644 --- a/app/services/videos/dispatch_callback_service.rb +++ b/app/services/videos/dispatch_callback_service.rb @@ -12,7 +12,7 @@ class Videos::DispatchCallbackService < ApplicationService # TODO:: 拆分事件分发 case params['EventType'] when 'FileUploadComplete' then # 视频上传完成 - video.file_url = params['FileUrl'] + video.file_url = convert_https(params['FileUrl']) video.filesize = params['Size'] video.upload_success video.save! diff --git a/app/views/weapps/attendances/history_attendances.json.jbuilder b/app/views/weapps/attendances/history_attendances.json.jbuilder new file mode 100644 index 000000000..1199338ed --- /dev/null +++ b/app/views/weapps/attendances/history_attendances.json.jbuilder @@ -0,0 +1,9 @@ +json.history_attendances @history_attendances do |attendance| + json.(attendance, :id, :name) + json.created_at attendance.created_at.strftime("%Y/%m/%d %H:%M") + json.normal_count attendance.normal_count + json.leave_count attendance.leave_count + json.absence_count attendance.absence_count + json.edit_auth @user_course_identity < Course::PROFESSOR || attendance.user_id == User.current.id +end +json.all_history_count @all_history_count \ No newline at end of file diff --git a/app/views/weapps/attendances/index.json.jbuilder b/app/views/weapps/attendances/index.json.jbuilder index e69de29bb..bff2e1218 100644 --- a/app/views/weapps/attendances/index.json.jbuilder +++ b/app/views/weapps/attendances/index.json.jbuilder @@ -0,0 +1,21 @@ +json.current_attendance do + json.(@current_attendance, :id, :normal_count, :all_count) if @current_attendance +end + +all_normal_rate = [] +all_absence_rate = [] +json.history_attendances @history_attendances.each_with_index.to_a do |attendance, index| + normal_count = history_member_count(@all_member_attendances, "NORMAL", attendance.id) + absence_count = history_member_count(@all_member_attendances, "ABSENCE", attendance.id) + all_count = @all_member_attendances.select{|member_attendance| member_attendance.course_attendance_id == attendance.id}.size + + json.index index + 1 + json.normal_rate cal_rate(normal_count, all_count) + all_normal_rate << cal_rate(normal_count, all_count) + json.absence_rate cal_rate(absence_count, all_count) + all_absence_rate << cal_rate(absence_count, all_count) +end + +json.all_history_count @all_history_count +json.avg_normal_rate @all_history_count == 0 ? 0 : all_normal_rate.sum / @all_history_count +json.avg_absence_rate @all_history_count == 0 ? 0 : all_absence_rate.sum / @all_history_count diff --git a/app/views/weapps/attendances/show.json.jbuilder b/app/views/weapps/attendances/show.json.jbuilder new file mode 100644 index 000000000..fa725a878 --- /dev/null +++ b/app/views/weapps/attendances/show.json.jbuilder @@ -0,0 +1,10 @@ +json.normal_count @normal_count +json.leave_count @leave_count +json.absence_count @absence_count +json.all_count @all_count +json.code @attendance.attendance_code +json.edit_auth @user_course_identity < Course::PROFESSOR || @attendance.user_id == User.current.id +json.course_groups @groups do |group| + json.(group, :id, :name, :course_members_count) + json.attendance_count group_attendance_count(@all_attendances, group) if @_is_current_attendance +end \ No newline at end of file diff --git a/app/views/weapps/course_member_attendances/index.json.jbuilder b/app/views/weapps/course_member_attendances/index.json.jbuilder new file mode 100644 index 000000000..d6d953af8 --- /dev/null +++ b/app/views/weapps/course_member_attendances/index.json.jbuilder @@ -0,0 +1,5 @@ +json.member_attendances @member_attendances.each do |member| + json.(member, :user_id, :attendance_status) + json.user_name member.user&.real_name + json.student_id member.user&.student_id +end \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index 723f58766..31a94e7ed 100644 --- a/config/application.rb +++ b/config/application.rb @@ -38,7 +38,6 @@ module Educoderplus origins '*' # location of your api resource '/*', :headers => :any, :methods => [:get, :post, :delete, :options, :put] - resource 'http://outin-396971199eed11e991a100163e1c7426.oss-cn-shanghai.aliyuncs.com/*', :headers => :any, :methods => [:get, :post, :delete, :options, :put] end end end diff --git a/config/routes.rb b/config/routes.rb index 5ef805f21..883005189 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1061,11 +1061,15 @@ Rails.application.routes.draw do resources :attendances, only: [:index, :update, :create, :show, :destroy], shallow: true do collection do get :student_attendances + get :history_attendances end + post :end, on: :member end end - resources :course_member_attendances, only: [:create] + resources :course_member_attendances, only: [:create, :index] do + post :update_status, on: :collection + end resources :homework_commons do post :update_settings, on: :member diff --git a/db/migrate/20200304062256_modidy_hidden_default_for_discusses.rb b/db/migrate/20200304062256_modidy_hidden_default_for_discusses.rb new file mode 100644 index 000000000..331d2c945 --- /dev/null +++ b/db/migrate/20200304062256_modidy_hidden_default_for_discusses.rb @@ -0,0 +1,5 @@ +class ModidyHiddenDefaultForDiscusses < ActiveRecord::Migration[5.2] + def change + change_column :discusses, :hidden, :boolean, :default => false + end +end diff --git a/lib/tasks/get_video_data.rake b/lib/tasks/get_video_data.rake index d38164923..2a009790e 100644 --- a/lib/tasks/get_video_data.rake +++ b/lib/tasks/get_video_data.rake @@ -29,6 +29,24 @@ namespace :video do end end + desc "将http修改成http" + task modify_http_to_https_file_url: :environment do + p "s" + if ENV['args'] + course_id = ENV['args'].split(",")[0] + video_ids = CourseVideo.where(course_id: course_id).pluck(:video_id) + videos = Video.where(id: video_ids) + if videos + videos.each do |v| + if v.file_url + file_url = v.file_url.gsub("http:", "https:") + v.update_column(:file_url, file_url) + end + end + end + end + end + # 执行示例 bundle exec rake video:sample args=2933,'2019-08-19 00:00:00','2019-11-09 23:59:59' task :sample => :environment do if ENV['args'] diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js index ef253aa83..77e2a4599 100644 --- a/public/react/scripts/build.js +++ b/public/react/scripts/build.js @@ -217,9 +217,11 @@ function generateNewIndexJsp() { ` var jsMinAllRegex = / var result = data .replace(jsMinAllRegex, code) + .replace(flvMinAllRegex, code) // .replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`) // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`) diff --git a/public/react/src/App.js b/public/react/src/App.js index 4c4908771..288afcb10 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -793,37 +793,37 @@ class App extends Component { render={ (props) => () }/> - () - }/> + {/* ()*/} + {/* }/>*/} - () - }/> + {/* ()*/} + {/* }/>*/} () } /> - () - } /> - - () - } /> - () - } /> - () - }/> + {/* ()*/} + {/* } />*/} + + {/* ()*/} + {/* } />*/} + {/* ()*/} + {/* } />*/} + {/* ()*/} + {/* }/>*/} () }/> - () - }/> + {/* ()*/} + {/* }/>*/} + + + {/*()*/} {/* }*/} {/*/>*/} + +
@@ -229,6 +242,7 @@ class LiveNew extends Component{ placeholder="请选择或输入直播平台名称" onChange={this.ChangePlatform} dataSource={dataSource} + className="plateAutoComplete" > )} diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js index 8a8ee0ace..2e20833ff 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js @@ -1298,10 +1298,12 @@ class CommonWorkSetting extends Component{ {/* 匿评数量 */}
匿评数量： - + diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index 9e514c468..80c250134 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -525,7 +525,6 @@ class Coursesleftnav extends Component{ } saveNavmodapost=(url,value,positiontype,coursesId)=>{ - axios.post(url, {name:value}).then((result)=>{ if(result!=undefined){ @@ -554,7 +553,8 @@ class Coursesleftnav extends Component{ } if(positiontype==="course_groups"){ - window.location.href=`/courses/${coursesId}/course_groups/${result.data.group_id}`; + this.props.updataleftNavfun(); + this.props.history.push(`/courses/${coursesId}/course_groups/${result.data.group_id}`); } } @@ -585,6 +585,7 @@ class Coursesleftnav extends Component{ } saveNavmoda=()=>{ + debugger; let {Navmodaltypename,setnavid,NavmodalValue}=this.state; let id =setnavid; diff --git a/public/react/src/modules/courses/members/CourseGroupListTable.js b/public/react/src/modules/courses/members/CourseGroupListTable.js index d0ccbd73a..6074f3649 100644 --- a/public/react/src/modules/courses/members/CourseGroupListTable.js +++ b/public/react/src/modules/courses/members/CourseGroupListTable.js @@ -66,7 +66,7 @@ function CourseGroupListTable(props) { className:"color-grey-6", render: (name, record, index) => { return 11 ? name : ''} onClick={() => onGoDetail(record)} style={''} - className="overflowHidden1" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}> + className="overflowHidden1 color-dark" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}> {name} } }, @@ -154,7 +154,7 @@ function CourseGroupListTable(props) { {!isCourseEnd && isAdmin && onDelete(record)} style={'grey'}>删除分班} {isStudent && addToDir(record)} style={''}>加入分班} - onGoDetail(record)} style={''}>查看 + onGoDetail(record)} style={''} className="color-dark">查看 } }) diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js index f98baaa09..5a4132491 100644 --- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js +++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js @@ -87,7 +87,9 @@ class Shixuninformation extends Component { this.props.form.setFieldsValue({ selectscripts: this.props.data && this.props.data.shixun.standard_scripts[0].id }) - this.get_mirror_script(this.props.data && this.props.data.shixun.standard_scripts[0].id) + console.log(this.props); + // debugger; + // this.get_mirror_script(this.props.data && this.props.data.shixun.standard_scripts[0].id) } else { this.props.form.setFieldsValue({ selectscripts: this.props.data && this.props.data.shixun.choice_standard_scripts diff --git a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js index 782a55b54..71f2cce90 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js +++ b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js @@ -8,7 +8,7 @@ import 'antd/lib/select/style/index.css'; import 'antd/lib/input/style/index.css'; -import './shixunCss/ShixunSearchBar.css'; +import './shixunCss/ShixunSearchBar.css'; import axios from 'axios'; @@ -206,9 +206,9 @@ render() { return (
-
-
- 方向： +
+
+ 方向：
  • 全部
    • + { + this.props.mygetHelmetapi&&this.props.mygetHelmetapi.shixun_banner_url? +
    +
    +
    +
    +
    +
    + : + "" + } + {/**/}