diff --git a/app/controllers/attendances_controller.rb b/app/controllers/attendances_controller.rb
index dc30df7e3..c8287f413 100644
--- a/app/controllers/attendances_controller.rb
+++ b/app/controllers/attendances_controller.rb
@@ -8,23 +8,38 @@ class AttendancesController < ApplicationController
current_date = Date.current
current_end_time = Time.current.strftime("%H:%M:%S")
+ member = @course.students.find_by(user_id: current_user.id)
+
if params[:history]
- @attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or
- (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')")
if @user_course_identity == Course::STUDENT
- member = @course.students.find_by(user_id: current_user.id)
- group_ids = [member&.course_group_id.to_i, 0]
- @attendances = @attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: group_ids})
+ history_attendance_ids = member.course_member_attendances.where(course_id: @course.id).pluck(:course_attendance_id)
+ @attendances = @course.course_attendances.where(id: history_attendance_ids.uniq).
+ where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')")
+ else
+ @attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or
+ (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')")
+ end
+ else
+ @attendances = @course.course_attendances.where("attendance_date > '#{current_date}' or
+ (attendance_date = '#{current_date}' and end_time > '#{current_end_time}')")
+ end
+
+ if @user_course_identity == Course::STUDENT
+ group_ids = [member&.course_group_id.to_i, 0]
+ @attendances = @attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: group_ids})
+
+ if params[:history]
attendance_ids = @attendances.pluck(:id)
@normal_count = @course.course_member_attendances.where(course_member_id: member&.id, course_attendance_id: attendance_ids, attendance_status: "NORMAL").size
@leave_count = @course.course_member_attendances.where(course_member_id: member&.id, course_attendance_id: attendance_ids, attendance_status: "LEAVE").size
@absence_count = @course.course_member_attendances.where(course_member_id: member&.id, course_attendance_id: attendance_ids, attendance_status: "ABSENCE").size
+ else
+ @attendances = @attendances.where("attendance_date = '#{current_date}' and start_time <= '#{current_end_time}' and end_time > '#{current_end_time}'")
end
- else
- @attendances = @course.course_attendances.where("attendance_date > '#{current_date}' or
- (attendance_date = '#{current_date}' and end_time > '#{current_end_time}')")
+
end
+
@attendances_count = @attendances.size
@attendances = @attendances.order("attendance_date desc, start_time desc")
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index d701575e7..930533bd0 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -114,11 +114,12 @@ class CoursesController < ApplicationController
#sql = "left join videos on videos.id=course_videos.video_id AND (videos.transcoded=1 OR videos.user_id = #{current_user.id})"
#@videos = paginate videos.joins(sql).includes(video: [user: :user_extension], user: :user_extension)
- videos = videos.includes(video: [user: :user_extension],user: :user_extension).select("course_videos.id, course_videos.title, course_videos.link, course_videos.user_id")
+ videos = videos.joins(:video).select("course_videos.id, course_videos.title, course_videos.link, course_videos.is_link,course_videos.user_id, course_videos.video_id")
videos = videos.where(videos: {transcoded: true})
.or(videos.where(videos: {user_id: current_user.id}))
- .or(videos.where(course_videos: {is_link: true}))
- @count = videos.count
+ .or(videos.where(course_videos: {is_link: true})).includes(video: [user: :user_extension], user: :user_extension)
+ @count = videos.count("course_videos.id")
+ logger.info("#######count:#{@count}")
@videos = paginate videos
end
diff --git a/app/controllers/weapps/attendances_controller.rb b/app/controllers/weapps/attendances_controller.rb
index 9740da15f..90f8c24b6 100644
--- a/app/controllers/weapps/attendances_controller.rb
+++ b/app/controllers/weapps/attendances_controller.rb
@@ -9,8 +9,10 @@ class Weapps::AttendancesController < ApplicationController
def create
ActiveRecord::Base.transaction do
attendance = @course.course_attendances.create!(create_params.merge(user_id: current_user.id))
- unless params[:group_ids].blank? || @course.course_groups.where(id: params[:group_ids]).count == @course.course_groups.count
- group_ids = @course.charge_group_ids(current_user) & params[:group_ids].map(&:to_i)
+ group_ids = params[:group_ids] || []
+ group_ids = group_ids.blank? ? @course.charge_group_ids(current_user) : @course.charge_group_ids(current_user) & params[:group_ids].map(&:to_i)
+ unless group_ids.blank? || @course.course_groups.where(id: group_ids).count == @course.course_groups.count
+ # group_ids = @course.charge_group_ids(current_user) & params[:group_ids].map(&:to_i)
group_ids.each do |group_id|
@course.course_attendance_groups.create!(course_group_id: group_id, course_attendance: attendance)
end
diff --git a/app/controllers/weapps/course_member_attendances_controller.rb b/app/controllers/weapps/course_member_attendances_controller.rb
index 21a687d60..254a89b1d 100644
--- a/app/controllers/weapps/course_member_attendances_controller.rb
+++ b/app/controllers/weapps/course_member_attendances_controller.rb
@@ -37,7 +37,7 @@ class Weapps::CourseMemberAttendancesController < ApplicationController
if params[:attendance_mode] == "QUICK"
attendance = CourseAttendance.find_by(id: params[:attendance_id])
else
- attendance = CourseAttendance.find_by(attendance_code: params[:code])
+ attendance = CourseAttendance.find_by(id: params[:attendance_id], attendance_code: params[:code])
end
tip_exception("该签到不存在") if attendance.blank? || attendance.course.blank?
diff --git a/app/models/course.rb b/app/models/course.rb
index bd36e65eb..a0daaea22 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -392,7 +392,7 @@ class Course < ApplicationRecord
# 课堂实训作业的评测次数
def evaluate_count
course_user_ids = students.pluck(:user_id)
- shixun_ids = homework_commons.joins(:homework_commons_shixun).where(homework_type: 4).pluck(:shixun_id)
+ shixun_ids = homework_commons.joins(:homework_commons_shixun).where(homework_type: "practice").pluck(:shixun_id)
return 0 if shixun_ids.blank?
Game.joins(:challenge).where(challenges: {shixun_id: shixun_ids}, games: {user_id: course_user_ids}).sum(:evaluate_count)
end
diff --git a/app/queries/weapps/subject_query.rb b/app/queries/weapps/subject_query.rb
index 0a3c9beb2..180176ce2 100644
--- a/app/queries/weapps/subject_query.rb
+++ b/app/queries/weapps/subject_query.rb
@@ -8,7 +8,7 @@ class Weapps::SubjectQuery < ApplicationQuery
end
def call
- subjects = @current_laboratory.subjects.unhidden.publiced
+ subjects = @current_laboratory.subjects.unhidden.publiced.show_moblied
# 课程体系的过滤
if params[:sub_discipline_id].present?
@@ -21,7 +21,7 @@ class Weapps::SubjectQuery < ApplicationQuery
# 搜索
if params[:keyword].present?
- subjects = subjects.where("subjects.name like '%#{params[:keyword]}%'")
+ subjects = subjects.where("subjects.name like :keyword", keyword: "%#{params[:keyword]}%")
end
subjects = subjects.left_joins(:shixuns, :repertoire).select('subjects.id, subjects.name, subjects.excellent, subjects.stages_count, subjects.status, subjects.homepage_show,
@@ -33,10 +33,10 @@ class Weapps::SubjectQuery < ApplicationQuery
private
def order_type
- params[:order] || "updated_at"
+ params[:order] == "updated_at" ? "updated_at" : "myshixuns_count"
end
def sort_type
- params[:sort] || "desc"
+ params[:sort] == "desc" ? "desc" : "asc"
end
end
\ No newline at end of file
diff --git a/app/services/weapps/shixun_search_service.rb b/app/services/weapps/shixun_search_service.rb
index 448bb1992..9fd7cce99 100644
--- a/app/services/weapps/shixun_search_service.rb
+++ b/app/services/weapps/shixun_search_service.rb
@@ -34,11 +34,18 @@ class Weapps::ShixunSearchService < ApplicationService
unless params[:keyword].blank?
keyword = params[:keyword].strip
shixuns = shixuns.joins(:user).
- where("concat(lastname, firstname) like :keyword or shixuns.name like :keyword",
- keyword: "%#{keyword}%", name: "%#{keyword.split(" ").join("%")}%").distinct
+ where("concat(lastname, firstname) like :keyword or shixuns.name like :keyword",
+ keyword: "%#{keyword}%", name: "%#{keyword.split(" ").join("%")}%").distinct
end
- shixuns.order("#{sort_str} #{order_str}")
+ order =
+ if sort_str == "wechat_myshixuns_count"
+ "is_wechat_support desc, myshixuns_count #{order_str}"
+ else
+ "#{sort_str} #{order_str}"
+ end
+
+ shixuns.order(order)
end
private
diff --git a/app/views/admins/courses/shared/_td.html.erb b/app/views/admins/courses/shared/_td.html.erb
index 87e6f305d..7b72179da 100644
--- a/app/views/admins/courses/shared/_td.html.erb
+++ b/app/views/admins/courses/shared/_td.html.erb
@@ -5,9 +5,9 @@
| <%= course.course_members_count %> |
<%= get_attachment_count(course, 0) %> |
-<%= course.course_homework_count(1) %> |
-<%= course.course_homework_count(3) %> |
-<%= course.course_homework_count(4) %> |
+<%= course.course_homework_count("normal") %> |
+<%= course.course_homework_count("group") %> |
+<%= course.course_homework_count("practice") %> |
<%= course.exercises_count %> |
<%= course.evaluate_count %> |
<%= course.is_public == 1 ? "--" : "√" %> |
diff --git a/app/views/weapps/shixun_lists/index.json.jbuilder b/app/views/weapps/shixun_lists/index.json.jbuilder
index fac238f45..10b66fdfa 100644
--- a/app/views/weapps/shixun_lists/index.json.jbuilder
+++ b/app/views/weapps/shixun_lists/index.json.jbuilder
@@ -5,5 +5,6 @@ json.shixun_list @results do |obj|
json.study_count obj.myshixuns_count
json.author_name obj.user.real_name
json.author_img url_to_avatar(obj.user)
+ json.pic url_to_avatar(obj)
end
json.shixuns_count @total_count
\ No newline at end of file
diff --git a/db/migrate/20200313104522_add_total_duration_to_watch_course_duration.rb b/db/migrate/20200313104522_add_total_duration_to_watch_course_duration.rb
index 400e52ac8..741be91f5 100644
--- a/db/migrate/20200313104522_add_total_duration_to_watch_course_duration.rb
+++ b/db/migrate/20200313104522_add_total_duration_to_watch_course_duration.rb
@@ -1,8 +1,8 @@
class AddTotalDurationToWatchCourseDuration < ActiveRecord::Migration[5.2]
def change
- add_column :watch_course_videos, :total_duration, :float, default: 0
- WatchVideoHistory.where("created_at < '2020-03-14 00:00:00'").each do |d|
- d.watch_course_video.increment!(:total_duration, d.total_duration) if d.watch_course_video.present?
- end
+ #add_column :watch_course_videos, :total_duration, :float, default: 0
+ #WatchVideoHistory.where("created_at < '2020-03-14 00:00:00'").each do |d|
+ # d.watch_course_video.increment!(:total_duration, d.total_duration) if d.watch_course_video.present?
+ #end
end
end
diff --git a/lib/tasks/video_transcode.rake b/lib/tasks/video_transcode.rake
index 4fb7c17bd..2b4a1eac7 100644
--- a/lib/tasks/video_transcode.rake
+++ b/lib/tasks/video_transcode.rake
@@ -3,17 +3,18 @@ namespace :video_transcode do
desc "视频转码成h264"
task :submit => :environment do
i = []
- Video.where.not(uuid: nil, file_url: nil).where(transcoded: false, status: "published").find_each do |v|
+ Video.where.not(uuid: nil, file_url: nil).where(transcoded: false).find_each do |v|
code_info = AliyunVod::Service.get_meta_code_info(v.uuid)
if v.file_url.include?('.mp4') && code_info[:codecnamne]&.include?("h264")
v.update(transcoded: true)
else
puts("uuid: #{v.uuid}")
i << "#{v.id}, #{v.file_url}, #{code_info[:codecnamne]}"
- AliyunVod::Service.submit_transcode_job(v.uuid, 'a0277c5c0c7458458e171b0cee6ebf5e')
+ AliyunVod::Service.submit_transcode_job(v.uuid, 'a0277c5c0c7458458e171b0cee6ebf5e') rescue nil
end
end
puts "###########转码个数:#{i.size}"
puts "###########id,file_url, codecnamne:#{i}"
+ Video.where(transcoded: false).update_all(transcoded: true)
end
end
\ No newline at end of file
diff --git a/public/react/package-lock.json b/public/react/package-lock.json
index a22a5a9ea..4cb59a032 100644
--- a/public/react/package-lock.json
+++ b/public/react/package-lock.json
@@ -13577,6 +13577,21 @@
"resolved": "http://registry.npm.taobao.org/q/download/q-1.5.1.tgz",
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
},
+ "qr.js": {
+ "version": "0.0.0",
+ "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
+ "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
+ },
+ "qrcode.react": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npm.taobao.org/qrcode.react/download/qrcode.react-1.0.0.tgz",
+ "integrity": "sha1-foiJ2zt2nlVejrRj1MbeIhw21d4=",
+ "requires": {
+ "loose-envify": "^1.4.0",
+ "prop-types": "^15.6.0",
+ "qr.js": "0.0.0"
+ }
+ },
"qs": {
"version": "6.7.0",
"resolved": "http://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz",
diff --git a/public/react/package.json b/public/react/package.json
index d29adb905..e644e2166 100644
--- a/public/react/package.json
+++ b/public/react/package.json
@@ -61,6 +61,7 @@
"postcss-loader": "2.0.8",
"promise": "8.0.1",
"prop-types": "^15.6.1",
+ "qrcode.react": "^1.0.0",
"qs": "^6.6.0",
"quill": "^1.3.7",
"quill-delta-to-html": "^0.11.0",
diff --git a/public/react/public/css/demo_index.html b/public/react/public/css/demo_index.html
index 7b0854698..59a7d4aec 100644
--- a/public/react/public/css/demo_index.html
+++ b/public/react/public/css/demo_index.html
@@ -30,6 +30,24 @@
+ -
+
+
签到-02
+ 
+
+
+ -
+
+
下箭头
+ 
+
+
+ -
+
+
签到-01
+ 
+
+
-
移动
@@ -2060,6 +2078,33 @@
+ -
+
+
+ 签到-02
+
+ .icon-qiandao-1
+
+
+
+ -
+
+
+ 下箭头
+
+ .icon-xiajiantou2
+
+
+
+ -
+
+
+ 签到-01
+
+ .icon-qiandao-
+
+
+
-
@@ -5059,6 +5104,30 @@
+ -
+
+
签到-02
+ #icon-qiandao-1
+
+
+ -
+
+
下箭头
+ #icon-xiajiantou2
+
+
+ -
+
+
签到-01
+ #icon-qiandao-
+
+
-
)
}
}
-export default LoadingSpin;
\ No newline at end of file
+export default LoadingSpin;
diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index e11a0c59f..30a3511c8 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -869,7 +869,7 @@ class CoursesIndex extends Component{
(props) => (
)
}
>
-
()
}
diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js
index a780f4dc6..6743cc3f7 100644
--- a/public/react/src/modules/courses/ListPageIndex.js
+++ b/public/react/src/modules/courses/ListPageIndex.js
@@ -28,10 +28,15 @@ const TeacherList= Loadable({
loader: () => import('./members/teacherList'),
loading: Loading,
})
+//主签到目录
+const Signinmain= Loadable({
+ loader: () => import('./signin/mymain/Signinmain'),
+ loading: Loading,
+});
//学生列表
const StudentsList= Loadable({
- loader: () => import('./members/studentsList'),
- loading: Loading,
+ loader: () => import('./members/studentsList'),
+ loading: Loading,
});
//分班列表
const CourseGroupList= Loadable({
@@ -266,6 +271,7 @@ class ListPageIndex extends Component{
(props) => ()
}
>
+ {/* 教师列表*/}
(this.updatabanners()} {...this.props} {...props} {...this.state} />)
@@ -277,6 +283,13 @@ class ListPageIndex extends Component{
(props) => ()
}
>
+ {/* 主签到 */}
+
()
+ }
+ >
+
()
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 cfc5ad343..8c3a2eb20 100644
--- a/public/react/src/modules/courses/Video/video-play/index.jsx
+++ b/public/react/src/modules/courses/Video/video-play/index.jsx
@@ -111,17 +111,14 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
log()
}
}
-
+ //循环播放， 累计时长不能清空
async function onEnded() {
log(() => {
logId = null
- logCount = 1
lastUpdatedTime = 0
- sumTimePlayed = 0
initLog = false
isLoging = false
isSeeking = false
- pos = []
}, true)
}
@@ -140,6 +137,8 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
log()
}
}
+ }else {
+ lastUpdatedTime = newTime
}
}
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index eaefd50e9..1c53a1efb 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -1097,7 +1097,8 @@ class Coursesleftnav extends Component{
item.type==="board"?:
item.type==="course_group"?:
item.type==="statistics"?:
- item.type==="video"?:""
+ item.type==="attendance"?:
+ item.type==="video"?:""
}
{/*||this.props.location.pathname===this.state.url&&key===this.state.indexs*/}
@@ -1238,7 +1239,7 @@ class Coursesleftnav extends Component{
item.type==="attachment"?:
item.type==="board"?:
item.type==="course_group"?:
-
+ item.type==="attendance"?:
item.type==="video"?:
item.type==="statistics"?:""
}
diff --git a/public/react/src/modules/courses/exercise/new/NullChildEditor.js b/public/react/src/modules/courses/exercise/new/NullChildEditor.js
index 5146f05ec..d2f710e55 100644
--- a/public/react/src/modules/courses/exercise/new/NullChildEditor.js
+++ b/public/react/src/modules/courses/exercise/new/NullChildEditor.js
@@ -19,11 +19,11 @@ const { Option } = Select;
class NullChildEditor extends Component{
constructor(props){
super(props);
-
+
this.state = {
}
}
-
+
// toMDMode = (that) => {
// if (this.mdReactObject) {
// let mdReactObject = this.mdReactObject;
@@ -41,7 +41,7 @@ class NullChildEditor extends Component{
render() {
let { question_title, question_score, question_type, question_choices, standard_answers } = this.state;
- let { question_id, index, onAnswerChange, addChildAnswer, toMDMode, exerciseIsPublish,
+ let { question_id, index, onAnswerChange, addChildAnswer, toMDMode, exerciseIsPublish,
answers } = this.props;
// marginTop: '18px'
return(
@@ -57,18 +57,24 @@ class NullChildEditor extends Component{
className={'nullChildEditor'}
placeholder={`请输入参考答案${itemIndex == 0 ?'':'(可选)'}`}
toMDMode={toMDMode} noStorage={true}
- mdID={`answer_${index}${itemIndex}`} height={155}
+ mdID={`answer_${index}${itemIndex}`} height={155}
initValue={item} onChange={(val) => onAnswerChange(index, itemIndex, val)}
>
{
standard_answers.map((answers, index) => {
- return
// answer.map((item, itemIndex) => {
// return
@@ -346,16 +362,16 @@ class NullEditor extends Component{
分
-
-
+
+
取消
保存
-
+
+ {
+ spal===true?
+
+
+
+
+ :
+
+
+
+
+
+
+ {datas&&datas.all_history_count}
+
+
+
+
+ {datas?(datas&&datas.avg_normal_rate*100).toFixed(0)+"%":""}
+
+
+
+
+ {datas?(datas&&datas.avg_absence_rate*100).toFixed(0)+"%":""}
+
+
+
+
+ {datas?(datas&&datas.avg_leave_rate*100).toFixed(0)+"%":""}
+
+
+
+
+ {newlist&&newlist.length>0?
+
+
+
+
+
+
+
+ 到课率
+
+
+
+
+
+ 旷课率
+
+
+
+
+
+ 请假率
+
+
+
+
+
+ 显示最近十次签到
+
+
+
+
+
+
+
+
+
+ {/**/}
+
+ `${val}%`
+ }}
+ />
+
+ {
+ return {
+ //自定义 tooltip 上显示的 title 显示内容等。
+ name: city,
+ title: name,
+ value: temperature+"%"
+ };
+ }]}
+ />
+ {
+ // return {
+ // //自定义 tooltip 上显示的 title 显示内容等。
+ // name: 'sold1',
+ // title: 'dddd' + month,
+ // value: temperature
+ // };
+ // }]}
+ />
+
+
+
+
:
+
+
}
+
+ }
+
+
+
+ {item && item.name}
+
+
+
+
+ 签到人数：
+
+
+
+ 已签到{item && item.normal_count ? item.normal_count : 0} /
+ 应签到 {item && item.all_count ? item.all_count : 0}
+
+
+
+
+
+
+
+
+
+ 签到发起人：
+
+
+ {item && item.author.user_name}
+
+
+
+ 签到方式：
+
+
+ {item && item.mode ?
+ item.mode === "QRCODE" ?
+ "二维码签到"
+ : item.mode === "NUMBER" ?
+ "数字签到"
+ : item.mode === "QUICK" ?
+ "快捷签到"
+ : ""
+ : ""}
+
+
+
+ 开始结束时间：
+
+
+ {item && item.attendance_date} {item && item.start_time}-{item && item.end_time}
+
+
+ {
+ defaultActiveKey === "1" ?
+
+ {
+ item && item.mode === "NUMBER" ?
+
+
{
+ jsCopy("file_path" + 1)
+ }}>
+ 复制签到码
+
+
+ {item&&item.code}
+
+
签到码：
+
+
+
+
+ :
+ item && item.mode === "QRCODE" ?
+
+
+ : ""
+ }
+
+
+
+
+ :
+ ""
+ }
+
+
+
+
+
+
+
![]({getUrl("/images/educoder/nodata.png")}/)
+
暂无相关数据
+
+
+
this.props.qiandaoxiangq(true,item.id):""}>
+ {
+ item.name
+ }
+
+
+
+
+
+ 签到人数：
+
+
+
+ 已签到{item.normal_count ? item.normal_count : 0} / 应签到 {item.all_count ? item.all_count : 0}
+
+
+
+
+
+
+
+
+
+ 签到发起人：
+
+
+ {item.author.user_name}
+
+
+
+ 签到方式：
+
+
+ {item.mode ?
+ item.mode === "QRCODE" ?
+ "二维码签到"
+ : item.mode === "NUMBER" ?
+ "数字签到"
+ : item.mode === "QUICK" ?
+ "快捷签到"
+ : ""
+ : ""}
+
+
+
+ 开始结束时间：
+
+
+ {item.attendance_date} {item.start_time}-{item.end_time}
+
+
+
+
+ {
+ isAdmin === true ?
+ this.props.defaultActiveKey === "1" ?
+
+
this.props.thisEnd(item.id)}>截止
+
this.props.thisdelete(item.id)}>删除
+
+ :
+ item.edit_auth === true ?
+
+
this.props.Signinnamestypes(item.id,true,item.name)}>编辑
+
this.props.thisdelete(item.id)}>删除
+
+ :
+
+
this.props.thisdelete(item.id)}>删除
+
+ :
+ (
+ this.props.defaultActiveKey === "1" ?
+
+ {
+ item.attendance_status?
+ (
+ item.attendance_status==="ABSENCE"?
+
this.props.Signin(item.mode,item.id,item.attendance_code)}>
+ 签到
+
+ :
+ item.attendance_status==="NORMAL"?
+
+ 正常签到
+
+ :""
+ )
+ :
+ ""
+ }
+
+
+ :
+
+ {
+ item.attendance_status?
+ item.attendance_status === "NORMAL" ?
+
+ 正常签到
+
+ : item.attendance_status === "LEAVE" ?
+
+ 请假
+
+ : item.attendance_status === "ABSENCE" ?
+
+ 旷课
+
+ :
+ ""
+ :
+ ""
+ }
+
+
+
+
+
+ )
+
+ }
+
+
+
+
+
+ {
+ Spin&&Spin===true?
+
+ :
+
+ (
+ mydatas&&mydatas.length>0?
+ mydatas.map((object, index) => {
+ return (
+ this.props.Signinnamestypes(id,b,a)}
+ Signin={(a,b,c)=>this.Signin(a,b,c)}
+ qiandaoxiangq={(b,id)=>this.props.qiandaoxiangq(b,id)}
+ thisdelete={(id)=>this.thisdelete(id)}
+ thisEnd={(id)=>this.thisEnd(id)}
+ item={object} key={index}
+ index={index}
+ defaultActiveKey={this.props.defaultActiveKey}
+ {...this.props}
+ {...this.state}
+ >
+
+ )
+ })
+ :
+
+ )
+
+ }
+
+
+ )
+ }
+}
+export default Teaccomponent;
diff --git a/public/react/src/modules/courses/signin/css/Signinstatistics.css b/public/react/src/modules/courses/signin/css/Signinstatistics.css
new file mode 100644
index 000000000..298ef9403
--- /dev/null
+++ b/public/react/src/modules/courses/signin/css/Signinstatistics.css
@@ -0,0 +1,207 @@
+.gutterrowbox{
+ height:150px;
+ border: none !important;
+}
+.gutterrowbox .ant-card-body{
+ height:150px;
+ position: relative;
+}
+.gutterrowboxcontent{
+ position: absolute;
+ bottom: 20px;
+ font-size:36px;
+ font-weight:400;
+ color:rgba(255,255,255,1);
+}
+.ml14{
+ margin-left: 14px !important;
+}
+.ml8{
+ margin-left: 8px !important;
+}
+.ml20{
+ margin-left: 20px !important;
+}
+.lishiqiandao{
+
+ height: 150px;
+
+ background-size: cover !important;
+ background-position: center !important;
+ background-repeat: no-repeat !important;
+}
+.daokeqiandao{
+
+ height: 150px;
+
+ background-size: cover !important;
+ background-position: center !important;
+ background-repeat: no-repeat !important;
+}
+.kuangkeqiandao{
+
+ height: 150px;
+
+ background-size: cover !important;
+ background-position: center !important;
+ background-repeat: no-repeat !important;
+}
+.qingjiaqiandao{
+
+ height: 150px;
+
+ background-size: cover !important;
+ background-position: center !important;
+ background-repeat: no-repeat !important;
+}
+
+.SigninstatisticsChart{
+ height:519px;
+ background:rgba(255,255,255,1);
+ box-shadow:0px 3px 7px 0px rgba(0, 0, 0, 0.05);
+}
+.pd30{
+ padding:30px;
+}
+.padding03000{
+ padding: 0px 30px 0px 0px;
+}
+
+.mindaoke{
+ width: 20px;
+ height: 20px;
+ background-image: url(./dot-green@2x.png);
+
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+}
+
+.minkuangke{
+ width: 20px;
+ height: 20px;
+ background-image: url(./dot-orange@2x.png);
+
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+}
+
+.minqingjia{
+ width: 20px;
+ height: 20px;
+ background-image: url(./dot-orange@2x1.png);
+
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+}
+
+.Signinstatisticsfont{
+ font-weight: 400;
+ color: rgba(153,153,153,1);
+ text-align: right;
+ margin-right: 20px;
+ line-height: 32px !important;
+ height: 32px !important;
+}
+.Signinstatisticsfontselect .ant-select-selection--single .ant-select-selection__rendered{
+ line-height: 32px !important;
+ height: 32px !important;
+}
+
+#form_in_modal_group_ids .ant-select-selection{
+ background: #fafafa !important;
+}
+
+#form_in_modal_attendance_date .ant-calendar-picker-input {
+ height:40px;
+}
+
+#form_in_modal_start_time{
+ height:40px;
+ background: #fafafa !important;
+}
+
+#form_in_modal_end_time{
+ height:40px;
+ background: #fafafa !important;
+}
+
+.Signedinlistbox .ant-select-selection--single{
+ height:40px !important;
+ background:rgba(255,255,255,1);
+ border:1px solid rgba(234,234,234,1);
+ border-radius:4px;
+}
+
+.Signedinlistbox .ant-select-selection__rendered{
+ line-height: 40px !important;
+}
+
+.Signedintextright{
+ text-align: right;
+}
+
+.color26C7C9{
+ color:#26C7C9;
+}
+
+.colorEAAE4E{
+ color:#EAAE4E;
+}
+
+.colorFF835C{
+ color:#FF835C;
+}
+
+.color909399{
+ color:#909399;
+}
+
+.color1890FF{
+ color:#1890FF;
+}
+
+.backfff .ant-table-thead tr th{
+ background: #fff;
+ border-bottom:1px solid #EBEBEB !important;
+}
+
+.textcenter{
+ text-align: center !important;
+}
+
+.sginboxcolor26C7C9 .ant-select-selection--single{
+ border:1px solid #26C7C9 !important;
+ }
+
+.sginboxcolor26C7C9 .ant-select-arrow{
+ color: #26C7C9 !important;
+}
+
+.sginboxcolorEAAE4E .ant-select-selection--single{
+ border:1px solid #EAAE4E !important;
+}
+
+.sginboxcolorEAAE4E .ant-select-arrow{
+ color: #EAAE4E !important;
+}
+
+.sginboxcolorFF835C .ant-select-selection--single{
+ border:1px solid #FF835C !important;
+}
+
+.sginboxcolorFF835C .ant-select-arrow{
+ color: #FF835C !important;
+}
+
+
+
+.sginboxcolor909399 .ant-select-selection--single{
+ border:1px solid #909399 !important;
+}
+
+.sginboxcolor909399 .ant-select-arrow{
+ color: #909399 !important;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/signin/css/dot-green@2x.png b/public/react/src/modules/courses/signin/css/dot-green@2x.png
new file mode 100644
index 000000000..a9a2cea51
Binary files /dev/null and b/public/react/src/modules/courses/signin/css/dot-green@2x.png differ
diff --git a/public/react/src/modules/courses/signin/css/dot-orange@2x.png b/public/react/src/modules/courses/signin/css/dot-orange@2x.png
new file mode 100644
index 000000000..0489eb573
Binary files /dev/null and b/public/react/src/modules/courses/signin/css/dot-orange@2x.png differ
diff --git a/public/react/src/modules/courses/signin/css/dot-orange@2x1.png b/public/react/src/modules/courses/signin/css/dot-orange@2x1.png
new file mode 100644
index 000000000..a2faaabf7
Binary files /dev/null and b/public/react/src/modules/courses/signin/css/dot-orange@2x1.png differ
diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css
new file mode 100644
index 000000000..09379ff4c
--- /dev/null
+++ b/public/react/src/modules/courses/signin/css/signincdi.css
@@ -0,0 +1,354 @@
+/* 中间居中 */
+.intermediatecenter{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+}
+/* 简单居中 */
+.intermediatecenterysls{
+ display: flex;
+ align-items: center;
+}
+
+/* 头顶部居中 */
+.topcenter{
+ display: -webkit-flex;
+ flex-direction: column;
+ align-items: center;
+
+}
+/* 均匀分开 */
+.spacearound{
+ display: flex;
+ justify-content: space-around;
+
+}
+/* 两边靠墙中间均匀分开 */
+.spacebetween{
+ display: flex;
+ justify-content: space-between;
+}
+/* 从左分开 */
+.spacearoundflexstart{
+
+ display: flex;
+ justify-content: flex-start;
+}
+.spacebetween{
+ display: flex;
+ justify-content: space-between;
+}
+
+.unpsysls{
+ display: inline-block;
+ text-align: justify;
+ font-size: 28px;
+}
+
+/* x轴正方向排序 */
+/* 一 二 三 四 五 六 七 八 */
+.sortinxdirection{
+ display: flex;
+ flex-direction:row;
+}
+/* x轴反方向排序 */
+/* 八 七 六 五 四 三 二 一 */
+.xaxisreverseorder{
+ display: flex;
+ flex-direction:row-reverse;
+}
+/* 垂直布局 正方向*/
+/* 一
+ 二
+ 三
+ 四
+ 五
+ 六
+ 七
+ 八 */
+.verticallayout{
+ display: flex;
+ flex-direction:column;
+}
+/* 垂直布局 反方向*/
+.reversedirection{
+ display: flex;
+ flex-direction:column-reverse;
+}
+/* 两端对齐 */
+.alignmentatbothends{
+ display: flex;
+ justify-content: space-between;
+}
+.file_path_input{
+ position: absolute;
+ right: -50%;
+}
+.ws100s{
+ width: 100%;
+}
+
+.ws70s{
+ width: 70%;
+ }
+
+.ws75s{
+ width: 75%;
+}
+.ws80s{
+ width: 80%;
+}
+.ws50s{
+ width: 50%;
+}
+.hs30s{
+ height: 30%;
+}
+.ws20s{
+ width: 20%;
+}
+.ws25s{
+ width: 25%;
+}
+.yslmaxheigthk{
+
+}
+.mysligtes{
+ font-size:16px;
+ font-family:Microsoft YaHei;
+ font-weight:bold;
+ color:rgba(144,147,153,1);
+ padding-left: 34px;
+}
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar {
+ border-bottom: 1px solid #ffffff !important;
+ background: #ffffff !important;
+ background-color: #ffffff !important;
+ margin: 0 !important;
+}
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar .ant-tabs-nav-container {
+ padding-left: 25px;
+}
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar .ant-tabs-nav-container .ant-tabs-ink-bar{
+ width: 68px !important;
+ left: 14px;
+
+}
+
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar .ant-tabs-tab{
+ padding: 25px 16px !important;
+ font-size: 16px;
+ font-family: Microsoft YaHei;
+ font-weight: bold;
+
+}
+.positiondivs{
+ position: absolute;
+ top: 0;
+ right: 0;
+}
+.posiivs{
+ padding: 30px 5px !important;
+ font-size: 16px;
+ font-family: Microsoft YaHei;
+ font-weight: bold;
+ color: #1890ff;
+ margin-right: 20px;
+}
+
+.posiivsicon{
+ padding: 22px 0px !important;
+ font-size: 16px;
+ font-family: Microsoft YaHei;
+ font-weight: bold;
+ color: #1890ff;
+ }
+.posiivsiconmyss{
+ font-size: 14px;
+ font-family: Microsoft YaHei;
+ color: #999999;
+}
+.xiaoshou{
+ cursor:pointer !important;
+}
+.xiaoshout{
+ cursor:default !important;
+}
+
+.teacherentrydiv{
+ padding-left: 32px;
+ padding-right: 32px;
+ padding-top: 20px;
+ padding-bottom: 20px;
+}
+
+.teachedivp{
+ font-size:16px;
+ font-family:Microsoft YaHei;
+ font-weight:bold;
+ color:rgba(51,51,51,1);
+}
+.ymaxnamewidthdivp{
+ max-width:100%;
+ width: 100%;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ cursor: default;
+}
+.teachedivps{
+ font-size:14px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:rgba(144,147,153,1);
+}
+.teachedivpsy{
+ font-size:14px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:#333333;
+
+}
+.progressivps{
+ width:200px;
+ margin-left: 10px;
+
+}
+.progressivpss{
+ font-size:12px;
+ line-height: 23px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:rgba(64,158,255,1);
+ margin-left: 15px;
+}
+.w60ys{
+ width: 60px;
+ }
+
+.ymaxnamewidth60{
+ max-width: 70px;
+ width: 70px;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ cursor: default;
+}
+.ymaxnamewidth80{
+ max-width: 80px;
+ width: 80px;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ cursor: default;
+}
+.w80ys{
+ width: 80px;
+}
+
+.jiezhis{
+ font-size:14px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:rgba(64,158,255,1);
+}
+.shanchu{
+ font-size:14px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:rgba(245,108,108,1);
+ margin-right: 30px;
+}
+
+.qiandaobutton{
+ font-size:16px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:rgba(255,255,255,1);
+ text-align: center;
+ line-height: 40px;
+ width:100px;
+ height:40px;
+ background:rgba(64,158,255,1);
+ border-radius:4px;
+}
+
+.zcqiandao{
+ width:100px;
+ height:40px;
+ border:1px solid rgba(38,199,201,1);
+ border-radius:4px;
+ font-size:16px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:rgba(38,199,201,1);
+ text-align: center;
+ line-height: 40px;
+
+}
+.qjqiandao{
+ width:100px;
+ height:40px;
+ border:1px solid #EAAE4E;
+ border-radius:4px;
+ font-size:16px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:#EAAE4E;
+ text-align: center;
+ line-height: 40px;
+
+
+}
+
+.kkqiandao{
+ width:100px;
+ height:40px;
+ border:1px solid #FF835C;
+ border-radius:4px;
+ font-size:16px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:#FF835C;
+ text-align: center;
+ line-height: 40px;
+
+}
+.h40s{
+ line-height: 40px !important;
+}
+.h28s{
+ line-height: 28px !important;
+}
+.mt40{
+ margin-top: 40px !important;
+}
+
+.h500{
+ min-height: 500px;
+}
+.kkp{
+ font-size:14px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+}
+.pr32{
+ padding-right: 32px;
+}
+
+.mr20r{
+ margin-right: 20px;
+}
+
+.color-reds{
+ color:rgba(245,108,108,1) !important;
+}
+
+.fh{
+ font-size:16px;
+ font-family:Microsoft YaHei;
+ font-weight:400;
+ color:rgba(153,153,153,1);
+
+}
diff --git a/public/react/src/modules/courses/signin/model/Createsignmodel.js b/public/react/src/modules/courses/signin/model/Createsignmodel.js
new file mode 100644
index 000000000..ade031ef2
--- /dev/null
+++ b/public/react/src/modules/courses/signin/model/Createsignmodel.js
@@ -0,0 +1,295 @@
+import "../css/Signinstatistics.css"
+import React from 'react'
+import { Modal , Form, Input, Radio,DatePicker, TimePicker,Select,Button} from 'antd';
+import moment from 'moment';
+import axios from 'axios';
+function range(start, end) {
+ const result = [];
+ for (let i = start; i < end; i++) {
+ result.push(i);
+ }
+ return result;
+}
+
+function disabledDateTime() {
+ return {
+ disabledMinutes: () => range(1, 30).concat(range(31, 60)),
+ // disabledSeconds: () => range(0,60)
+ }
+}
+
+function disabledDate(current) {
+ return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
+
+ class extends React.Component {
+ constructor(props){
+ super(props);
+ this.state = {
+ course_groups:[],
+ type:false,
+ dateString:null
+ }
+ }
+ componentDidMount() {
+ const coursesId=this.props.match.params.coursesId;
+ let newurl=`/courses/${coursesId}/all_course_groups.json`;
+ axios.get(newurl).then((response) => {
+
+ this.setState({
+ course_groups:response.data.course_groups
+ })
+
+ })
+
+ }
+
+ hideCreatesign=(e)=>{
+ e.preventDefault();
+ const {settabsdata,hideCreatesign} = this.props;
+ const coursesId=this.props.match.params.coursesId;
+ this.setState({
+ type:true
+ })
+ this.props.form.validateFields((err, values) => {
+ if (!err) {
+ if(moment(values.end_time).format('HH:mm') {
+ if (response.data.status == 0) {
+ this.props.showNotification(`创建签到成功`);
+ this.setState({
+ type:false
+ })
+ hideCreatesign()
+ settabsdata()
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }else{
+ this.setState({
+ type:false
+ })
+ }
+
+
+ });
+ }
+ getDisabledHours=()=> {
+ let hours = []
+ if(this.state.dateString===moment().format('YYYY-MM-DD')){
+ let time = moment().format('HH:mm')
+ let timeArr = time.split(':')
+ for (var i = 0; i < parseInt(timeArr[0]); i++) {
+ hours.push(i)
+ }
+ }
+
+ return hours
+ }
+
+ getDisabledMinutes=(selectedHour)=>{
+ let minutes = []
+ if(this.state.dateString===moment().format('YYYY-MM-DD')){
+ let time = moment().format('HH:mm')
+ let timeArr = time.split(':')
+ if (selectedHour == parseInt(timeArr[0])) {
+ for(var i = 0; i < parseInt(timeArr[1]); i++) {
+ minutes.push(i)
+ }
+ }
+ }
+ return minutes
+ }
+
+ onChange=(date, dateString)=>{
+ this.setState({
+ dateString:dateString
+ })
+ }
+ render() {
+ const { visible, form ,setRadio,Radiolist,hideCreatesign} = this.props;
+ let {course_groups}=this.state;
+ const { getFieldDecorator } = form;
+ const { Option } = Select;
+ const formItemLayout = {
+ labelCol: { span: 4 },
+ wrapperCol: { span: 19},
+ };
+
+ const leftbuton={
+ "width":"130px",
+ "height":"40px",
+ "border":"1px solid rgba(76,172,255,1)",
+ "border-radius":"4px",
+ }
+
+ const rightbuton={
+ "width":"130px",
+ "height":"40px",
+ "background":"#4CACFF",
+ "border-radius":"4px",
+ }
+ const format = 'HH:mm';
+
+ return (
+
+
+
+ );
+ }
+ },
+);
+
+class Createsignmodel extends React.Component {
+ state = {
+ Radiolist: "",
+ };
+ setRadio=(e)=>{
+
+ this.setState({
+ Radiolist:e.target.value
+ })
+ }
+ render() {
+ return (
+
+ this.setRadio(e)}
+ />
+
+ );
+ }
+}
+
+export default Createsignmodel;
+
+
diff --git a/public/react/src/modules/courses/signin/model/Qrcodesignin.js b/public/react/src/modules/courses/signin/model/Qrcodesignin.js
new file mode 100644
index 000000000..1979a6370
--- /dev/null
+++ b/public/react/src/modules/courses/signin/model/Qrcodesignin.js
@@ -0,0 +1,77 @@
+import React,{ Component } from "react";
+import { Modal , Button} from 'antd';
+import QRCode from 'qrcode.react';
+
+class Qrcodesignin extends Component {
+ constructor(props) {
+ super(props)
+ }
+ render() {
+
+ const leftbuton={
+ "width":"130px",
+ "height":"40px",
+ "border":"1px solid rgba(76,172,255,1)",
+ "border-radius":"4px",
+ }
+
+ const rightbuton={
+ "width":"130px",
+ "height":"40px",
+ "background":"#4CACFF",
+ "border-radius":"4px",
+ }
+ return(
+
+ {this.props.Qrcodesignintype?
+
+
+ :""}
+
+
+ )
+ }
+
+}
+
+
+
+
+
+
+export default Qrcodesignin
diff --git a/public/react/src/modules/courses/signin/model/Signinname.js b/public/react/src/modules/courses/signin/model/Signinname.js
new file mode 100644
index 000000000..47b181151
--- /dev/null
+++ b/public/react/src/modules/courses/signin/model/Signinname.js
@@ -0,0 +1,105 @@
+import React,{ Component } from "react";
+
+import { Modal , Form, Input,Button} from 'antd';
+import axios from 'axios';
+
+class Signinname extends Component {
+ constructor(props) {
+ super(props)
+ }
+ setdatas=()=>{
+ this.props.form.validateFields((err, values) => {
+ if (!err) {
+ const url = `/weapps/attendances/${this.props.switattendance_id}.json`;
+ let data={
+ name:values.name,
+ }
+ axios.put(url, data)
+ .then((result) => {
+ if (result.data.status === 0) {
+ try {
+ this.props.showNotification(`修改成功`);
+ }catch (e) {
+
+ }
+ this.props.getsetdatas();
+ this.props.Signinnamestypes(null,false,"")
+ }else{
+ this.props.showNotification(result.data.message);
+
+ }
+ }).catch((error) => {
+ })
+ }
+ });
+
+
+
+ }
+ render() {
+ const { getFieldDecorator } = this.props.form;
+ const formItemLayout = {
+ wrapperCol: { span: 25},
+ };
+
+ const leftbuton={
+ "width":"130px",
+ "height":"40px",
+ "border":"1px solid rgba(76,172,255,1)",
+ "border-radius":"4px",
+ }
+
+ const rightbuton={
+ "width":"130px",
+ "height":"40px",
+ "background":"#4CACFF",
+ "border-radius":"4px",
+ }
+ return(
+
+ {this.props.Signinnamestype?
+
+
+ :""}
+
+
+ )
+ }
+
+}
+
+
+
+
+const Signinnames = Form.create({ name: 'Signinnames' })(Signinname);
+
+export default Signinnames
diff --git a/public/react/src/modules/courses/signin/model/Studentssignmodel.js b/public/react/src/modules/courses/signin/model/Studentssignmodel.js
new file mode 100644
index 000000000..fa2f22882
--- /dev/null
+++ b/public/react/src/modules/courses/signin/model/Studentssignmodel.js
@@ -0,0 +1,107 @@
+import React,{ Component } from "react";
+
+import { Modal , Form, Input,Button} from 'antd';
+import axios from 'axios';
+
+class Studentssignmodel extends Component {
+ constructor(props) {
+ super(props)
+ }
+ setdatas=()=>{
+ this.props.form.validateFields((err, values) => {
+ if (!err) {
+ const url = `/weapps/course_member_attendances.json`;
+ let data={
+ code:values.name,
+ attendance_mode:"NUMBER",
+ attendance_id:this.props.Studentssigntypedata.attendance_id,
+ }
+ axios.post(url, data)
+ .then((result) => {
+ if (result.data.status === 0) {
+ try {
+ this.props.showNotification(`签到成功`);
+ }catch (e) {
+
+ }
+ this.props.getsetdatas();
+ this.props.Gotomodes(null,false)
+ }else{
+ this.props.showNotification(result.data.message);
+
+ }
+ }).catch((error) => {
+ })
+ }
+ });
+
+
+
+ }
+ render() {
+ const { getFieldDecorator } = this.props.form;
+ const formItemLayout = {
+ wrapperCol: { span: 25},
+ };
+
+ const leftbuton={
+ "width":"130px",
+ "height":"40px",
+ "border":"1px solid rgba(76,172,255,1)",
+ "border-radius":"4px",
+ }
+
+ const rightbuton={
+ "width":"130px",
+ "height":"40px",
+ "background":"#4CACFF",
+ "border-radius":"4px",
+ }
+ return(
+
+ {this.props.Studentssigntype?
+
+
+ :""}
+
+
+ )
+ }
+
+}
+
+
+
+
+const Studentssignmodels = Form.create({ name: 'Studentssignmodel' })(Studentssignmodel);
+
+export default Studentssignmodels
diff --git a/public/react/src/modules/courses/signin/model/sigininmodes.js b/public/react/src/modules/courses/signin/model/sigininmodes.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/react/src/modules/courses/signin/mymain/Signinmain.js b/public/react/src/modules/courses/signin/mymain/Signinmain.js
new file mode 100644
index 000000000..6912508ba
--- /dev/null
+++ b/public/react/src/modules/courses/signin/mymain/Signinmain.js
@@ -0,0 +1,44 @@
+import React,{ Component } from "react";
+import '../css/signincdi.css';
+import { Tabs } from 'antd';
+import Teachers_signin from '../teacher/Teachers_signin';
+import Students_signin from '../student/Signindetails';
+import axios from 'axios';
+
+const { TabPane } = Tabs;
+// 主签到目录 主签到目录
+class Signinmain extends Component{
+ constructor(props){
+ super(props);
+
+ this.state={
+
+ }
+ }
+
+ componentDidMount() {
+
+ }
+
+ componentDidUpdate = (prevProps) => {
+
+
+ }
+
+
+ // 主签到目录
+ render(){
+ const isAdmin = this.props.isAdmin()
+
+ return(
+
+
+
+
+
+
+
+ )
+ }
+}
+export default Signinmain;
diff --git a/public/react/src/modules/courses/signin/student/Signedinlist.js b/public/react/src/modules/courses/signin/student/Signedinlist.js
new file mode 100644
index 000000000..5885e8a67
--- /dev/null
+++ b/public/react/src/modules/courses/signin/student/Signedinlist.js
@@ -0,0 +1,385 @@
+import "../css/Signinstatistics.css"
+import React,{ Component } from "react";
+import { Row, Col,Select,Table,Pagination } from 'antd';
+import axios from 'axios';
+import LoadingSpin from "../../../../common/LoadingSpin";
+import NoneDatas from "../component/NoneDatas";
+const { Option } = Select;
+
+class Signedinlist extends Component {
+
+ constructor(props) {
+ super(props)
+ this.state={
+ limit:5,
+ page:1,
+ loading:false,
+ attendanceslist:[],
+ data:null,
+ group_ids:[],
+ members_count:0,
+ attendance_status:undefined,
+ state:[
+ {id:undefined,name:"全部状态"},
+ {id:"NORMAL",name:"正常签到"},
+ {id:"LEAVE",name:"请 假"},
+ {id:"ABSENCE",name:this.props.defaultActiveKey ==="2"?"旷 课":"未签到"},
+ ],
+ newstate:[
+ {id:"NORMAL",name:"正常签到"},
+ {id:"LEAVE",name:"请 假"},
+ {id:"ABSENCE",name:this.props.defaultActiveKey ==="2"?"旷 课":"未签到"},
+ ],
+ course_members_count:'--',
+ attendance_count:'--',
+ }
+ }
+
+ componentDidMount() {
+ this.getdatas(this.props&&this.props.switattendance_id,1,[],undefined)
+ // this.getpath()
+ }
+ componentDidUpdate(prevProps, prevState) {
+ if(prevProps.headdata!=this.props.headdata){
+
+ if(this.props.headdata){
+ let listattendanceslist=[];
+ listattendanceslist.push({id:undefined,name:"全部分班"})
+ if(this.props.headdata.course_groups){
+
+ if(this.props.headdata.course_groups.length>0){
+ this.props.headdata.course_groups.map((item,key)=>{
+ listattendanceslist.push(item)
+ })
+ }
+ }
+ this.setState({
+ attendanceslist:listattendanceslist,
+ data:this.props.headdata,
+ course_members_count:this.props.headdata.normal_count,
+ attendance_count:this.props.headdata.all_count
+ })
+ }
+
+
+ }
+ }
+ getdatas=(id,page,group_ids,attendance_status)=>{
+ this.setState({
+ loading:true,
+ member_attendances:[],
+ })
+ let that=this;
+ let url=`/weapps/course_member_attendances.json`;
+ axios.get(url,{params:{
+ group_ids:group_ids,
+ attendance_id:id,
+ attendance_status:attendance_status,
+ page:page,
+ limit:5,
+ }
+ }).then((response) => {
+
+ if(response){
+ this.setState({
+ member_attendances:response.data.member_attendances,
+ members_count:response.data.members_count,
+
+ })
+
+ }
+ this.setState({
+ loading:false
+ })
+ }).catch((error) => {
+ that.setState({
+ loading:false
+ })
+
+ });
+ }
+ handleChangegroup_ids=(value)=>{
+ let neval
+ if(!value){
+ neval=[]
+ this.setState({
+ group_ids: [],
+ page:1
+ })
+ }else{
+ neval=[value]
+ this.setState({
+ group_ids: [value],
+ page:1
+ })
+ }
+
+ let {page,attendance_status}=this.state;
+ this.getdatas(this.props&&this.props.switattendance_id,1,neval,attendance_status)
+ if(this.props.defaultActiveKey==="1"){
+ this.getpath(value)
+ }
+
+ }
+ getpath=(id)=>{
+ let listattendanceslist=[]
+ let url=`/weapps/attendances/${this.props&&this.props.switattendance_id}.json`;
+ axios.get(url).then((response) => {
+ if(response.data){
+ listattendanceslist.push({id:undefined,name:"全部分班"})
+ if(response.data.course_groups.length>0){
+ response.data.course_groups.map((item,key)=>{
+ listattendanceslist.push(item)
+ })
+ }
+ if(id){
+ response.data.course_groups.map((item,key)=>{
+ if(item.id===id){
+ this.setState({
+ course_members_count:item.course_members_count,
+ attendance_count: item.attendance_count
+ })
+ }
+
+ })
+ }else{
+ this.setState({
+ course_members_count:response.data.normal_count,
+ attendance_count: response.data.all_count
+ })
+ }
+ this.setState({
+ attendanceslist:listattendanceslist,
+ data:response.data
+ })
+
+ }
+
+ })
+ }
+ handleChangestate=(value)=>{
+ let neval
+ if(!value){
+ neval=undefined
+ this.setState({
+ attendance_status:undefined,
+ page:1
+ })
+ }else{
+ neval=value
+ this.setState({
+ attendance_status: value,
+ page:1
+ })
+ }
+
+ let {page,group_ids}=this.state;
+ this.getdatas(this.props&&this.props.switattendance_id,1,group_ids,neval)
+ }
+ paginationonChange = (pageNumber) => {
+ this.setState({
+ page: pageNumber,
+ })
+ let {group_ids,attendance_status}=this.state;
+ this.getdatas(this.props&&this.props.switattendance_id,pageNumber,group_ids,attendance_status)
+
+ }
+
+ handleChange=(attendance_status,value)=>{
+
+ let {member_attendances}=this.state;
+ let newmember_attendances=member_attendances;
+
+ newmember_attendances.map((item,key)=>{
+ if(item.user_id===value){
+ item.attendance_status=attendance_status
+ }
+ })
+
+
+ let url=`/weapps/course_member_attendances/update_status.json`;
+
+ axios.post(url, {
+ attendance_id:this.props.switattendance_id,
+ attendance_status:attendance_status,
+ course_id:this.props.match.params.coursesId,
+ user_id: value,
+ })
+ .then((response) => {
+ if (response.data.status == 0) {
+ this.props.showNotification(`修改状态成功`);
+ this.setState({
+ member_attendances:newmember_attendances
+ })
+ this.props.mygetdatas()
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+
+
+
+ }
+ render() {
+ let {attendanceslist,state,data,member_attendances,newstate,attendance_status}=this.state;
+
+ const columns = [
+ {
+ title: '序号',
+ dataIndex: 'index',
+ key: 'index',
+ width:300,
+ className: "textcenter",
+ },
+ {
+ title: '姓名',
+ dataIndex: 'user_name',
+ key: 'user_name',
+ width:300,
+ className: "textcenter",
+ render: (text, record) => (
+ {record.user_name===null?"--":record.user_name}
+ )
+ },
+ {
+ title: '学号',
+ dataIndex: 'student_id',
+ key: 'student_id',
+ width:300,
+ className: "textcenter",
+ render: (text, record) => (
+ {record.student_id===null?"--":record.student_id}
+ )
+ },
+ {
+ title: '状态',
+ key: 'attendance_status',
+ width:300,
+ dataIndex: 'attendance_status',
+ className: "textcenter",
+ render: (text, record) => (
+
+
+
+ ),
+ },
+ ];
+
+ return(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {this.props.defaultActiveKey==="2"?
+ 正常签到：{data&&data.normal_count}
+ 请假：{data&&data.leave_count}
+ 旷课：{data&&data.absence_count}
+ :
+ 已签到：{this.state.course_members_count}
+ 应签到：{this.state.attendance_count}
+ }
+
+
+
+
+
+
+ {
+ this.state.loading===true?
+
+
+
+ :
+ member_attendances&&member_attendances.length===0?
+
+ {/**/}
+
+
+
+ :
+ // loading={this.state.loading}
+
+
+ }
+
+
+ {
+ member_attendances&&member_attendances.length>0?
+
+ :""
+ }
+
+
+
+
this.props.qiandaoxiangq(false)}>
+
+
返回
+
+
+
+
+
+
+ {/* 列表+筛选 */}
+
+ this.mygetdatas()}
+ defaultActiveKey={this.props.defaultActiveKey}
+ switattendance_id={this.props.switattendance_id}
+ headdata={headdata}
+ {...this.props}
+ {...this.state}
+ />
+
+
+ {/*编辑名称*/}
+
this.Signinnamestypes(id,b,a)}
+ getsetdatas={()=>this.getsetdatas()}
+ />
+ {/*创建实训*/}
+ this.hideCreatesign()}
+ settabsdata={()=>this.settabsdata()}
+ />
+ {/*签到*/}
+ this.Gotomodes(d,b)}
+ getsetdatas={()=>this.getsetdatas()}
+ />
+ {/*二维码*/}
+ this.getsetdatas()}
+ GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)}
+ />
+ {
+ switchs===false?
+
+
+
+
+ 共{attendances_count}个签到正在进行
+ this.Signinnamestypes(id,b,a)}
+ qiandaoxiangq={(b,id)=>this.qiandaoxiangq(b,id)}
+ Gotomodes={(d,b)=>this.Gotomodes(d,b)}
+ GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)}
+ getsetdatas={()=>this.getsetdatas()}
+ datas={datas}
+ defaultActiveKey={defaultActiveKey}
+ {...this.state}
+ {...this.props}
+
+ >
+
+
+
+
+
+
+
+
已完成{attendances_count}次签到
+ {
+ isAdmin===false?
+
+
旷课：{absence_count}
+
请假：{leave_count}
+
正常签到：{normal_count}
+
+
+ :
+ ""
+ }
+
+ {
+ isAdmin?
+
+
+
this.Createsign()}>创建签到
+
+ :""
+ }
+
+
+
+ -
+
+
签到-02
+ 
+
+
+ -
+
+
下箭头
+ 
+
+
+ -
+
+
签到-01
+ 
+
+
+ -
+
+
移动
+ 
+
+
+ -
+
+
下移2
+ 
+
+
+ -
+
+
上移2
+ 
+
+
+ -
+
+
下移
+ 
+
+
+ -
+
+
上移
+ 
+
+
+ -
+
+
编辑
+ 
+
+
+ -
+
+
删除
+ 
+
+
+ -
+
+
选择
+ 
+
+
-
编辑
@@ -2012,6 +2078,105 @@
+ -
+
+
+ 签到-02
+
+ .icon-qiandao-1
+
+
+
+ -
+
+
+ 下箭头
+
+ .icon-xiajiantou2
+
+
+
+ -
+
+
+ 签到-01
+
+ .icon-qiandao-
+
+
+
+ -
+
+
+ 移动
+
+ .icon-yidong
+
+
+
+ -
+
+
+ 下移2
+
+ .icon-xiayi1
+
+
+
+ -
+
+
+ 上移2
+
+ .icon-shangyi1
+
+
+
+ -
+
+
+ 下移
+
+ .icon-xiayi
+
+
+
+ -
+
+
+ 上移
+
+ .icon-shangyi
+
+
+
+ -
+
+
+ 编辑
+
+ .icon-bianji5
+
+
+
+ -
+
+
+ 删除
+
+ .icon-shanchu3
+
+
+
+ -
+
+
+ 选择
+
+ .icon-xuanze
+
+
+
-
@@ -4939,6 +5104,94 @@
+ -
+
+
签到-02
+ #icon-qiandao-1
+
+
+ -
+
+
下箭头
+ #icon-xiajiantou2
+
+
+ -
+
+
签到-01
+ #icon-qiandao-
+
+
+ -
+
+
移动
+ #icon-yidong
+
+
+ -
+
+
下移2
+ #icon-xiayi1
+
+
+ -
+
+
上移2
+ #icon-shangyi1
+
+
+ -
+
+
下移
+ #icon-xiayi
+
+
+ -
+
+
上移
+ #icon-shangyi
+
+
+ -
+
+
编辑
+ #icon-bianji5
+
+
+ -
+
+
删除
+ #icon-shanchu3
+
+
+ -
+
+
选择
+ #icon-xuanze
+
+
-