m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
courseware
dinglink 5 years ago
parent eac997530b b920733095
commit 733fd472d3
8 changed files with 118 additions and 50 deletions
Show Stats Download Patch File Download Diff File

1
public/react/package.json
Unescape View File

@ -78,6 +78,7 @@
"react-codemirror2": "^6.0.0", "react-codemirror2": "^6.0.0",
"react-content-loader": "^3.1.1", "react-content-loader": "^3.1.1",
"react-cookies": "^0.1.1", "react-cookies": "^0.1.1",
"react-datepicker": "^2.14.0",
"react-dev-utils": "^5.0.0", "react-dev-utils": "^5.0.0",
"react-dom": "^16.9.0", "react-dom": "^16.9.0",
"react-hot-loader": "^4.0.0", "react-hot-loader": "^4.0.0",

6
public/react/src/modules/courses/signin/css/Signinstatistics.css
Unescape View File

@ -205,3 +205,9 @@
.sginboxcolor909399 .ant-select-arrow{ .sginboxcolor909399 .ant-select-arrow{
color: #909399 !important; color: #909399 !important;
} }
.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item {
height: auto !important;
padding: 0px !important;
white-space: nowrap !important;
}

135
public/react/src/modules/courses/signin/model/Createsignmodel.js
Unescape View File

@ -1,8 +1,10 @@
import "../css/Signinstatistics.css" import "../css/Signinstatistics.css"
import React from 'react' import React from 'react'
import { Modal , Form, Input, Radio,DatePicker, TimePicker,Select,Button} from 'antd'; import { Modal , Form, Input, Radio,DatePicker,Select,Button} from 'antd';
import moment from 'moment'; import moment from 'moment';
import axios from 'axios'; import axios from 'axios';
import TimePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
function range(start, end) { function range(start, end) {
const result = []; const result = [];
for (let i = start; i < end; i++) { for (let i = start; i < end; i++) {
@ -30,9 +32,26 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
this.state = { this.state = {
course_groups:[], course_groups:[],
type:false, type:false,
dateString:null dateString:null,
start_time: "",
end_time:""
} }
} }
handleChangestart_time = (date) => {
console.log(moment(date).format('HH:mm'))
this.setState({
start_time: date
});
};
handleChangeend_time=(date)=>{
console.log(moment(date).format('HH:mm'))
this.setState({
end_time: date
});
}
componentDidMount() { componentDidMount() {
const coursesId=this.props.match.params.coursesId; const coursesId=this.props.match.params.coursesId;
let newurl=`/courses/${coursesId}/all_course_groups.json`; let newurl=`/courses/${coursesId}/all_course_groups.json`;
@ -101,32 +120,32 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
}); });
} }
getDisabledHours=()=> { // getDisabledHours=()=> {
let hours = [] // let hours = []
if(this.state.dateString===moment().format('YYYY-MM-DD')){ // if(this.state.dateString===moment().format('YYYY-MM-DD')){
let time = moment().format('HH:mm') // let time = moment().format('HH:mm')
let timeArr = time.split(':') // let timeArr = time.split(':')
for (var i = 0; i < parseInt(timeArr[0]); i++) { // for (var i = 0; i < parseInt(timeArr[0]); i++) {
hours.push(i) // hours.push(i)
} // }
} // }
//
return hours // return hours
} // }
//
getDisabledMinutes=(selectedHour)=>{ // getDisabledMinutes=(selectedHour)=>{
let minutes = [] // let minutes = []
if(this.state.dateString===moment().format('YYYY-MM-DD')){ // if(this.state.dateString===moment().format('YYYY-MM-DD')){
let time = moment().format('HH:mm') // let time = moment().format('HH:mm')
let timeArr = time.split(':') // let timeArr = time.split(':')
if (selectedHour == parseInt(timeArr[0])) { // if (selectedHour == parseInt(timeArr[0])) {
for(var i = 0; i < parseInt(timeArr[1]); i++) { // for(var i = 0; i < parseInt(timeArr[1]); i++) {
minutes.push(i) // minutes.push(i)
} // }
} // }
} // }
return minutes // return minutes
} // }
onChange=(date, dateString)=>{ onChange=(date, dateString)=>{
this.setState({ this.setState({
@ -147,14 +166,14 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
"width":"130px", "width":"130px",
"height":"40px", "height":"40px",
"border":"1px solid rgba(76,172,255,1)", "border":"1px solid rgba(76,172,255,1)",
"border-radius":"4px", "borderRadius":"4px",
} }
const rightbuton={ const rightbuton={
"width":"130px", "width":"130px",
"height":"40px", "height":"40px",
"background":"#4CACFF", "background":"#4CACFF",
"border-radius":"4px", "borderRadius":"4px",
} }
const format = 'HH:mm'; const format = 'HH:mm';
@ -181,7 +200,7 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
{course_groups.map((item,key)=>{ {course_groups.map((item,key)=>{
return( return(
<Option value={item.id}>{item.name}</Option> <Option value={item.id} key={key}>{item.name}</Option>
) )
})} })}
@ -226,21 +245,63 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
onChange={this.onChange} onChange={this.onChange}
/>)} />)}
</Form.Item> </Form.Item>
<style>
{
`
#form_in_modal_start_time{
width:413px;
padding-left: 10px;
}
#form_in_modal_end_time{
width:413px;
padding-left: 10px;
}
`
}
</style>
<Form.Item label="开始时间："> <Form.Item label="开始时间：">
{getFieldDecorator('start_time', { {getFieldDecorator('start_time', {
rules: [{ type: 'object', required: true, message: '请选择开始时间' }], rules: [{ type: 'object', required: true, message: '请选择开始时间' }],
})(<TimePicker style={{width:"413px"}} format={format} getPopupContainer={trigger => trigger.parentNode}/>)} })(
// <TimePicker style={{width:"413px"}} format={format} getPopupContainer={trigger => trigger.parentNode}/>
<TimePicker
style={{width:"413px"}}
selected={this.state.start_time}
onChange={date => this.handleChangestart_time(date)}
showTimeSelect
showTimeSelectOnly
timeIntervals={1}
timeCaption="Time"
timeFormat="HH:mm"
getPopupContainer={trigger => trigger.parentNode}
/>
)}
</Form.Item> </Form.Item>
<Form.Item label="结束时间："> <Form.Item label="结束时间：">
{getFieldDecorator('end_time', { {getFieldDecorator('end_time', {
rules: [{ type: 'object', required: true, message: '请选择结束时间' }], rules: [{ type: 'object', required: true, message: '请选择结束时间' }],
})(<TimePicker style={{width:"413px"}} format={format} getPopupContainer={trigger => trigger.parentNode} })(
disabledHours={this.getDisabledHours} // <TimePicker style={{width:"413px"}} format={format} getPopupContainer={trigger => trigger.parentNode}
disabledMinutes={this.getDisabledMinutes} // disabledHours={this.getDisabledHours}
// disabledMinutes={this.getDisabledMinutes}
/>)} //
// />
<TimePicker
style={{width:"413px"}}
selected={this.state.end_time}
onChange={date => this.handleChangeend_time(date)}
showTimeSelect
showTimeSelectOnly
timeIntervals={1}
minTime={this.state.dateString===moment().format('YYYY-MM-DD')||this.state.dateString===null?new Date():false}
maxTime={this.state.dateString===moment().format('YYYY-MM-DD')||this.state.dateString===null?moment().endOf('day').toDate():false}
timeCaption="Time"
timeFormat="HH:mm"
getPopupContainer={trigger => trigger.parentNode}
/>
)}
</Form.Item> </Form.Item>

4
public/react/src/modules/courses/signin/model/Qrcodesignin.js
Unescape View File

@ -12,14 +12,14 @@ class Qrcodesignin extends Component {
"width":"130px", "width":"130px",
"height":"40px", "height":"40px",
"border":"1px solid rgba(76,172,255,1)", "border":"1px solid rgba(76,172,255,1)",
"border-radius":"4px", "borderRadius":"4px",
} }
const rightbuton={ const rightbuton={
"width":"130px", "width":"130px",
"height":"40px", "height":"40px",
"background":"#4CACFF", "background":"#4CACFF",
"border-radius":"4px", "borderRadius":"4px",
} }
return( return(
<React.Fragment> <React.Fragment>

4
public/react/src/modules/courses/signin/model/Signinname.js
Unescape View File

@ -46,14 +46,14 @@ class Signinname extends Component {
"width":"130px", "width":"130px",
"height":"40px", "height":"40px",
"border":"1px solid rgba(76,172,255,1)", "border":"1px solid rgba(76,172,255,1)",
"border-radius":"4px", "borderRadius":"4px",
} }
const rightbuton={ const rightbuton={
"width":"130px", "width":"130px",
"height":"40px", "height":"40px",
"background":"#4CACFF", "background":"#4CACFF",
"border-radius":"4px", "borderRadius":"4px",
} }
return( return(
<React.Fragment> <React.Fragment>

4
public/react/src/modules/courses/signin/model/Studentssignmodel.js
Unescape View File

@ -48,14 +48,14 @@ class Studentssignmodel extends Component {
"width":"130px", "width":"130px",
"height":"40px", "height":"40px",
"border":"1px solid rgba(76,172,255,1)", "border":"1px solid rgba(76,172,255,1)",
"border-radius":"4px", "borderRadius":"4px",
} }
const rightbuton={ const rightbuton={
"width":"130px", "width":"130px",
"height":"40px", "height":"40px",
"background":"#4CACFF", "background":"#4CACFF",
"border-radius":"4px", "borderRadius":"4px",
} }
return( return(
<React.Fragment> <React.Fragment>

6
public/react/src/modules/login/Trialapplication.js
Unescape View File

@ -386,7 +386,7 @@ class Trialapplication extends Component {
{ {
isRenders === false ? "" : isRenders === false ? "" :
<div style={{"border-radius": "10px"}}> <div style={{"borderRadius": "10px"}}>
<style> <style>
{ {
` `
@ -545,14 +545,14 @@ class Trialapplication extends Component {
<Dialog open={true} id="DialogIDysl" <Dialog open={true} id="DialogIDysl"
disableEscapeKeyDown={true} disableEscapeKeyDown={true}
style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}} style={{display: isRenders == false ? 'none' : '', "borderRadius": "10px"}}
> >
<div id="closeIcon" onClick={() => { <div id="closeIcon" onClick={() => {
this.handleDialogClose() this.handleDialogClose()
}}> }}>
<i className="iconfont icon-shanchudiao"></i> <i className="iconfont icon-shanchudiao"></i>
</div> </div>
<div className={"login_register_content"} style={{"border-radius": "10px", "width": "560px"}}> <div className={"login_register_content"} style={{"borderRadius": "10px", "width": "560px"}}>
<div className={"login_register_content"} style={ <div className={"login_register_content"} style={
user_phone_binded === true ? user_phone_binded === true ?

6
public/react/src/modules/login/Trialapplicationysl.js
Unescape View File

@ -404,7 +404,7 @@ class Trialapplicationysl extends Component {
{ {
isRenders === false ? "" : isRenders === false ? "" :
<div style={{"border-radius": "10px"}}> <div style={{"borderRadius": "10px"}}>
<style> <style>
{ {
` `
@ -563,14 +563,14 @@ class Trialapplicationysl extends Component {
<Dialog open={true} id="DialogIDysl" <Dialog open={true} id="DialogIDysl"
disableEscapeKeyDown={true} disableEscapeKeyDown={true}
style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}} style={{display: isRenders == false ? 'none' : '', "borderRadius": "10px"}}
> >
<div id="closeIcon" onClick={() => { <div id="closeIcon" onClick={() => {
this.handleDialogClose() this.handleDialogClose()
}}> }}>
<i className="iconfont icon-shanchudiao"></i> <i className="iconfont icon-shanchudiao"></i>
</div> </div>
<div className={"login_register_content"} style={{"border-radius": "10px", "width": "560px"}}> <div className={"login_register_content"} style={{"borderRadius": "10px", "width": "560px"}}>
<div className={"login_register_content"} style={ <div className={"login_register_content"} style={
user_phone_binded === true ? user_phone_binded === true ?

Write Preview
Loading…
Cancel
Save