diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index fee6eb724..332e8ea73 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -42,11 +42,11 @@ if (isDev) { window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' } // 超管 -debugType="admin"; +// debugType="admin"; // 老师 // debugType="teacher"; // 学生 -// debugType="student"; +debugType="student"; diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js index 0f6c8e9ae..6cbb48858 100644 --- a/public/react/src/modules/courses/signin/component/Teacherentry.js +++ b/public/react/src/modules/courses/signin/component/Teacherentry.js @@ -112,10 +112,24 @@ class Teacherentry extends Component { ( 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"? +
+ 正常签到 +
+ :"" + ) + : + "" + } -
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..a03df188d 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,76 @@ class Teaccomponent extends Component{ } //截止 thisEnd=(attendance_id)=>{ - const url = `/weapps/attendances/${attendance_id}/end.json`; - var data={ - } - 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) { + // + // } + this.props.getsetdatas(); + }else{ + this.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); + 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 { + this.props.showNotification(`删除成功`); + }catch (e) { + + } + + this.props.getsetdatas(); + }else{ + this.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={