diff --git a/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js b/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js index 5f0c2c699..0f84980bc 100644 --- a/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js +++ b/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js @@ -1,6 +1,7 @@ import "../css/Signinstatistics.css"; import React,{ Component } from "react"; import { Row, Col,Card,Select} from 'antd'; +import {getImageUrl} from 'educoder'; import axios from 'axios'; import { Chart, @@ -96,6 +97,24 @@ class Signinstatistics extends Component { +
{datas&&datas.all_history_count}
diff --git a/public/react/src/modules/courses/signin/css/Signinstatistics.css b/public/react/src/modules/courses/signin/css/Signinstatistics.css index 16067e5c2..820d07f1c 100644 --- a/public/react/src/modules/courses/signin/css/Signinstatistics.css +++ b/public/react/src/modules/courses/signin/css/Signinstatistics.css @@ -14,45 +14,45 @@ color:rgba(255,255,255,1); } .ml14{ - margin-left: 14px; + margin-left: 14px !important; } .ml8{ - margin-left: 8px; + margin-left: 8px !important; } .ml20{ - margin-left: 20px; + margin-left: 20px !important; } .lishiqiandao{ - + height: 150px; - background-image: url(./lishi.png); - background-size: cover; - background-position: center; - background-repeat: no-repeat; + + background-size: cover !important; + background-position: center !important; + background-repeat: no-repeat !important; } .daokeqiandao{ height: 150px; - background-image: url(./daoke.png); - background-size: cover; - background-position: center; - background-repeat: no-repeat; + + background-size: cover !important; + background-position: center !important; + background-repeat: no-repeat !important; } .kuangkeqiandao{ height: 150px; - background-image: url(./kuangke.png); - background-size: cover; - background-position: center; - background-repeat: no-repeat; + + background-size: cover !important; + background-position: center !important; + background-repeat: no-repeat !important; } .qingjiaqiandao{ height: 150px; - background-image: url(./qingjia.png); - background-size: cover; - background-position: center; - background-repeat: no-repeat; + + background-size: cover !important; + background-position: center !important; + background-repeat: no-repeat !important; } .SigninstatisticsChart{ diff --git a/public/react/src/modules/courses/signin/model/Createsignmodel.js b/public/react/src/modules/courses/signin/model/Createsignmodel.js index 735d32de9..9b0d57461 100644 --- a/public/react/src/modules/courses/signin/model/Createsignmodel.js +++ b/public/react/src/modules/courses/signin/model/Createsignmodel.js @@ -3,6 +3,24 @@ 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' })( @@ -121,7 +139,10 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })( {getFieldDecorator('attendance_date', { rules: [{ type: 'object', required: true, message: '请选择签到日期',}], - })( trigger.parentNode}/>)} + })( trigger.parentNode} + disabledTime={disabledDateTime} + disabledDate={disabledDate} + />)}