+ {
+ item.attendance_status?
+ (
+ item.attendance_status==="ABSENCE"?
+
this.props.Signin(item.mode,item.id,item.attendance_code)}>
+ 签到
+
+ :
+ item.attendance_status==="NORMAL"?
+
+ 正常签到
+
+ :""
+ )
+ :
+ ""
+ }
-
this.props.Signin(item.mode,item.id,item.attendance_code)}>
- 签到
-
diff --git a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
index 5b8d21b1d..099625aaf 100644
--- a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
+++ b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
@@ -4,8 +4,9 @@ import axios from 'axios';
import Teacherentry from "../Teacherentry";
import NoneDatas from '../NoneDatas';
import LoadingSpin from '../../../../../common/LoadingSpin';
+import { Modal, Button } from 'antd';
-import Listjihe from "../../../../question/component/Listjihe";
+const { confirm } = Modal;
//在线学习
class Teaccomponent extends Component{
@@ -34,55 +35,78 @@ class Teaccomponent extends Component{
}
//截止
thisEnd=(attendance_id)=>{
- const url = `/weapps/attendances/${attendance_id}/end.json`;
- var data={
+ let thiss=this
- }
- axios.post(url, data)
- .then((result) => {
- if (result.data.status === 0) {
- // try {
- // this.props.showNotification(`截止成功`);
- // }catch (e) {
- //
- // }
- this.props.getsetdatas();
- }else{
- this.props.showNotification(result.data.message);
+ confirm({
+ title: '提示',
+ content: '确认截止此签到吗?',
+ onOk() {
+ const url = `/weapps/attendances/${attendance_id}/end.json`;
+ var data={
}
- }).catch((error) => {
- //console.log(error);
- })
+ axios.post(url, data)
+ .then((result) => {
+ if (result.data.status === 0) {
+ // try {
+ // this.props.showNotification(`截止成功`);
+ // }catch (e) {
+ //
+ // }
+ thiss.props.getsetdatas();
+ }else{
+ thiss.props.showNotification(result.data.message);
+
+ }
+ }).catch((error) => {
+ //console.log(error);
+ })
+ },
+ onCancel() {
+
+ },
+ });
+
}
//删除
thisdelete=(attendance_id)=>{
- const url = `/weapps/attendances/${attendance_id}.json`;
- var data={
-
- }
- axios.delete(url, data)
- .then((result) => {
- if (result.data.status === 0) {
- // try {
- // this.props.showNotification(`删除成功`);
- // }catch (e) {
- //
- // }
-
- this.props.getsetdatas();
- }else{
- this.props.showNotification(result.data.message);
+ let thiss=this
+ confirm({
+ title: '提示',
+ content: '确认删除此签到吗?',
+ onOk () {
+ const url = `/weapps/attendances/${attendance_id}.json`;
+ var data={
}
- }).catch((error) => {
- //console.log(error);
- })
+ axios.delete(url, data)
+ .then((result) => {
+ if (result.data.status === 0) {
+ // try {
+ // thiss.props.showNotification(`删除成功`);
+ // }catch (e) {
+ //
+ // }
+
+ thiss.props.getsetdatas();
+ }else{
+ thiss.props.showNotification(result.data.message);
+
+ }
+ }).catch((error) => {
+ //console.log(error);
+ })
+ },
+ onCancel() {
+
+ },
+ });
+
}
//学生签到
Signin=(attendance_mode,attendance_id,code)=>{
- debugger
+
const url = `/weapps/course_member_attendances.json`;
var data={
diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css
index 95fe4ac71..09379ff4c 100644
--- a/public/react/src/modules/courses/signin/css/signincdi.css
+++ b/public/react/src/modules/courses/signin/css/signincdi.css
@@ -208,6 +208,7 @@
font-family:Microsoft YaHei;
font-weight:400;
color:#333333;
+
}
.progressivps{
width:200px;
diff --git a/public/react/src/modules/courses/signin/student/Signedinlist.js b/public/react/src/modules/courses/signin/student/Signedinlist.js
index 17de0cabc..1f1074b49 100644
--- a/public/react/src/modules/courses/signin/student/Signedinlist.js
+++ b/public/react/src/modules/courses/signin/student/Signedinlist.js
@@ -2,6 +2,8 @@ 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 {
@@ -79,10 +81,13 @@ class Signedinlist extends Component {
this.setState({
member_attendances:response.data.member_attendances,
members_count:response.data.members_count,
- loading:false
+
})
}
+ this.setState({
+ loading:false
+ })
}).catch((error) => {
that.setState({
loading:false
@@ -293,13 +298,39 @@ class Signedinlist extends Component {
-
+ {
+ this.state.loading===true?
+
+
+
+ :
+ member_attendances&&member_attendances.length===0?
+
+ {/**/}
+
+
+
+ :
+ // loading={this.state.loading}
+
+
+ }
+
-
+ {
+ member_attendances&&member_attendances.length>0?
+
+ :""
+ }
+
this.mygetdatas()}
defaultActiveKey={this.props.defaultActiveKey}
switattendance_id={this.props.switattendance_id}
headdata={headdata}
diff --git a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
index 1a8326885..ae2507887 100644
--- a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
+++ b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
@@ -111,6 +111,18 @@ class Students_signin extends Component{
leave_count:response.data.leave_count,
absence_count:response.data.absence_count,
})
+ if(response.data.attendances.length===0&&mydata.page!==1){
+ this.setState({
+ page:mydata.page-1,
+ limit:5
+ })
+ let data={
+ key: mydata.key,
+ page:mydata.page-1,
+ limit:5
+ }
+ this.gogetdatas(data);
+ }
}
}
this.setState({
@@ -198,11 +210,9 @@ class Students_signin extends Component{
switchs:bool,
switattendance_id:id,
})
- // if(bool){
- // var currenturl = window.location.href;
- // var newUrl = (currenturl.split("?"))[0];
- // window.history.pushState('','',newUrl+'?type='+2);
- // }
+ if(bool===false){
+ this.getsetdatas();
+ }
}