Commit 199b66f4 authored by wangxuelai's avatar wangxuelai

’‘

parent 733374b7
...@@ -57,7 +57,7 @@ class OpeartorChangeForm extends React.Component { ...@@ -57,7 +57,7 @@ class OpeartorChangeForm extends React.Component {
message: '请选择操作人', message: '请选择操作人',
}, },
], ],
})(<Select>{teacherList.map(ele => <Option value={ele.id}>{ele.nickname}</Option>)}</Select>) })(<Select>{teacherList.map(ele => <Option key={ele.id} value={ele.id}>{ele.nickname}</Option>)}</Select>)
} }
</Form.Item> </Form.Item>
</Form> </Form>
......
...@@ -10,7 +10,7 @@ class Errorpage extends React.Component { ...@@ -10,7 +10,7 @@ class Errorpage extends React.Component {
render() { render() {
return ( return (
<div className={errorPageStyle.errorpage}> <div className={errorPageStyle.errorpage}>
<a href="#/sjd/activemanager"><img className="fade" src={`${__IMGCDN__}images/404.png`} alt="商家岛" /></a> <a href="#/sjd/indexstaic"><img className={errorPageStyle.fade} src={`${__IMGCDN__}qxlogo.png`} alt="商家岛" /></a>
<div> <div>
<h1 className="fade">温馨提示:您访问的地址不存在!</h1> <h1 className="fade">温馨提示:您访问的地址不存在!</h1>
<p className="fade">你正在寻找的页面无法找到。 <p className="fade">你正在寻找的页面无法找到。
......
.errorpage{ .errorpage{
text-align: center; text-align: center;
margin: 50px 0; margin: 50px 0;
}
.fade{
width: 200px;
border-radius: 50%;
margin-bottom: 20px;
} }
\ No newline at end of file
...@@ -167,7 +167,7 @@ class HeadquarterMgtForm extends React.Component { ...@@ -167,7 +167,7 @@ class HeadquarterMgtForm extends React.Component {
<Button icon="plus" className={pageStyle.headerbtn} type="primary" onClick={() => this.showModal(true)}>新增</Button> <Button icon="plus" className={pageStyle.headerbtn} type="primary" onClick={() => this.showModal(true)}>新增</Button>
<Modal <Modal
title="新增校区" title="新增校区"
centered="true" centered
visible={addOrUpdateDiaShow} visible={addOrUpdateDiaShow}
onOk={this.handleOk} onOk={this.handleOk}
onCancel={() => this.showModal(false)} onCancel={() => this.showModal(false)}
...@@ -202,7 +202,7 @@ class HeadquarterMgtForm extends React.Component { ...@@ -202,7 +202,7 @@ class HeadquarterMgtForm extends React.Component {
{/* <Button className={pageStyle.headerbtn}>批量操作</Button> */} {/* <Button className={pageStyle.headerbtn}>批量操作</Button> */}
</div> </div>
<div className={pageStyle.tablebox}> <div className={pageStyle.tablebox}>
<Table dataSource={headquarterDetail} columns={columns} /> <Table dataSource={headquarterDetail} rowKey="id" columns={columns} />
</div> </div>
</div> </div>
); );
......
...@@ -322,7 +322,7 @@ class Hqstatistical extends React.Component { ...@@ -322,7 +322,7 @@ class Hqstatistical extends React.Component {
<Col span={4} className={pageStyles.pagetitle}> <Col span={4} className={pageStyles.pagetitle}>
<Select value={chartParamas1.sid} style={{ width: 200 }} onChange={this.typeChange1}> <Select value={chartParamas1.sid} style={{ width: 200 }} onChange={this.typeChange1}>
<Option value="">全部</Option> <Option value="">全部</Option>
{headquarterListdata && headquarterListdata.map(ele => <Option value={ele.school_id}>{ele.school.title}</Option>)} {headquarterListdata && headquarterListdata.map(ele => <Option key={ele.school_id} value={ele.school_id}>{ele.school.title}</Option>)}
</Select> </Select>
</Col> </Col>
<Col span={8} className={pageStyles.pagetitle}><RangePicker onChange={this.rangePickerOk1} /></Col> <Col span={8} className={pageStyles.pagetitle}><RangePicker onChange={this.rangePickerOk1} /></Col>
...@@ -364,7 +364,7 @@ class Hqstatistical extends React.Component { ...@@ -364,7 +364,7 @@ class Hqstatistical extends React.Component {
<Col span={4} className={pageStyles.pagetitle}> <Col span={4} className={pageStyles.pagetitle}>
<Select value={chartParamas2.sid} style={{ width: 200 }} onChange={this.typeChange2}> <Select value={chartParamas2.sid} style={{ width: 200 }} onChange={this.typeChange2}>
<Option value="">全部</Option> <Option value="">全部</Option>
{headquarterListdata && headquarterListdata.map(ele => <Option value={ele.school_id}>{ele.school.title}</Option>)} {headquarterListdata && headquarterListdata.map(ele => <Option key={ele.school_id} value={ele.school_id}>{ele.school.title}</Option>)}
</Select> </Select>
</Col> </Col>
<Col span={8} className={pageStyles.pagetitle}><RangePicker onChange={this.rangePickerOk2} /></Col> <Col span={8} className={pageStyles.pagetitle}><RangePicker onChange={this.rangePickerOk2} /></Col>
......
...@@ -170,7 +170,7 @@ class LoginForm extends React.Component { ...@@ -170,7 +170,7 @@ class LoginForm extends React.Component {
})( })(
<Input <Input
placeholder="请输入手机号" placeholder="请输入手机号"
maxLength="11" maxLength={11}
/>, />,
)} )}
</FormItem> </FormItem>
...@@ -184,7 +184,7 @@ class LoginForm extends React.Component { ...@@ -184,7 +184,7 @@ class LoginForm extends React.Component {
{ pattern: /^[0-9]{4}$/, message: '验证码是4位数字验证码' }, { pattern: /^[0-9]{4}$/, message: '验证码是4位数字验证码' },
], ],
})( })(
<Input className="no_border" type="text" autoComplete="off" placeholder="输入验证码" maxLength="4" />, <Input className="no_border" type="text" autoComplete="off" placeholder="输入验证码" maxLength={4} />,
)} )}
</FormItem> </FormItem>
</Col> </Col>
......
...@@ -158,7 +158,7 @@ class LoginForm extends React.Component { ...@@ -158,7 +158,7 @@ class LoginForm extends React.Component {
{ max: 11, message: '手机号长度为11位!' }, { max: 11, message: '手机号长度为11位!' },
], ],
})( })(
<Input placeholder="请输入手机号" autoComplete="off" maxLength="11" />, <Input placeholder="请输入手机号" autoComplete="off" maxLength={11} />,
)} )}
</FormItem> </FormItem>
<Row className={`loginrow ${LoginStyles.verycoderow}`}> <Row className={`loginrow ${LoginStyles.verycoderow}`}>
...@@ -188,7 +188,7 @@ class LoginForm extends React.Component { ...@@ -188,7 +188,7 @@ class LoginForm extends React.Component {
{ pattern: /^[0-9]{4}$/, message: '验证码是4位数字验证码' }, { pattern: /^[0-9]{4}$/, message: '验证码是4位数字验证码' },
], ],
})( })(
<Input className="no_border" type="text" autoComplete="off" placeholder="输入验证码" maxLength="4" />, <Input className="no_border" type="text" autoComplete="off" placeholder="输入验证码" maxLength={4} />,
)} )}
</FormItem> </FormItem>
</Col> </Col>
......
...@@ -127,7 +127,7 @@ class LoginForm extends React.Component { ...@@ -127,7 +127,7 @@ class LoginForm extends React.Component {
{ max: 11, message: '手机号长度为11位!' }, { max: 11, message: '手机号长度为11位!' },
], ],
})( })(
<Input placeholder="手机号" maxLength="11" />, <Input placeholder="手机号" maxLength={11} />,
)} )}
</FormItem> </FormItem>
<Row className={`loginrow ${LoginStyles.verycoderow}`}> <Row className={`loginrow ${LoginStyles.verycoderow}`}>
...@@ -157,7 +157,7 @@ class LoginForm extends React.Component { ...@@ -157,7 +157,7 @@ class LoginForm extends React.Component {
{ pattern: /^[0-9]{4}$/, message: '验证码是4位数字验证码' }, { pattern: /^[0-9]{4}$/, message: '验证码是4位数字验证码' },
], ],
})( })(
<Input className="no_border" type="text" autoComplete="off" placeholder="输入验证码" maxLength="4" />, <Input className="no_border" type="text" autoComplete="off" placeholder="输入验证码" maxLength={4} />,
)} )}
</FormItem> </FormItem>
</Col> </Col>
......
...@@ -171,7 +171,7 @@ class JoinSchoolAddForm extends React.Component { ...@@ -171,7 +171,7 @@ class JoinSchoolAddForm extends React.Component {
<Row className={pageStyles.schoollist} gutter={32}> <Row className={pageStyles.schoollist} gutter={32}>
{schoolList.map((ele) => { {schoolList.map((ele) => {
return ( return (
<div key={ele}> <div key={ele.id}>
<Col className={pageStyles.schoolcardbox} xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 8 }}> <Col className={pageStyles.schoolcardbox} xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 8 }}>
<div className={pageStyles.schoolbox} onClick={() => this.goSchoolSystem(ele)}> <div className={pageStyles.schoolbox} onClick={() => this.goSchoolSystem(ele)}>
<Row className={pageStyles.schoolnamebox} type="flex" justify="space-between" align="middle"> <Row className={pageStyles.schoolnamebox} type="flex" justify="space-between" align="middle">
......
...@@ -149,7 +149,7 @@ class RenewEdit extends React.Component { ...@@ -149,7 +149,7 @@ class RenewEdit extends React.Component {
})( })(
<Select style={{ width: 200 }} onChange={this.courseChange}> <Select style={{ width: 200 }} onChange={this.courseChange}>
<Option value="">请选择课程</Option> <Option value="">请选择课程</Option>
{renewCourses.map(ele => <Option value={ele.id}>{ele.title}</Option>)} {renewCourses.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)} </Select>)}
</Form.Item> </Form.Item>
</Col> </Col>
...@@ -314,7 +314,7 @@ class RenewEdit extends React.Component { ...@@ -314,7 +314,7 @@ class RenewEdit extends React.Component {
// onChange={handleChange} // onChange={handleChange}
style={{ width: '55%' }} style={{ width: '55%' }}
> >
{classList.map(ele => <Option value={ele.id}>{ele.title}</Option>)} {classList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>, </Select>,
)} )}
</Form.Item> </Form.Item>
......
...@@ -281,7 +281,7 @@ class SelfJoinForm extends React.Component { ...@@ -281,7 +281,7 @@ class SelfJoinForm extends React.Component {
})( })(
<Select style={{ width: 200 }} onChange={this.courseChange} placeholder="请选择购买课程"> <Select style={{ width: 200 }} onChange={this.courseChange} placeholder="请选择购买课程">
<Option value="">请选择购买课程</Option> <Option value="">请选择购买课程</Option>
{courseList.map(ele => <Option value={ele.id}>{ele.title}</Option>)} {courseList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)} </Select>)}
</Form.Item> </Form.Item>
</Col> </Col>
...@@ -451,7 +451,7 @@ class SelfJoinForm extends React.Component { ...@@ -451,7 +451,7 @@ class SelfJoinForm extends React.Component {
// onChange={handleChange} // onChange={handleChange}
style={{ width: '55%' }} style={{ width: '55%' }}
> >
{classList.filter(ele => ele.graduation_status == 1).map(ele => <Option value={`${ele.id}`}>{ele.title}</Option>)} {classList.filter(ele => ele.graduation_status == 1).map(ele => <Option key={ele.id} value={`${ele.id}`}>{ele.title}</Option>)}
</Select>, </Select>,
)} )}
</Form.Item> </Form.Item>
......
...@@ -206,7 +206,7 @@ class StudentAddForm extends React.Component { ...@@ -206,7 +206,7 @@ class StudentAddForm extends React.Component {
message: '姓名最多20个字符', message: '姓名最多20个字符',
}, },
], ],
})(<Input style={{ width: 200 }} maxlength="20" placeholder="输入姓名" />)} })(<Input style={{ width: 200 }} maxlength={20} placeholder="输入姓名" />)}
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={24} className={pageStyle.name} > <Col span={24} className={pageStyle.name} >
...@@ -320,7 +320,7 @@ class StudentAddForm extends React.Component { ...@@ -320,7 +320,7 @@ class StudentAddForm extends React.Component {
message: '请输入手机号码', message: '请输入手机号码',
}, },
], ],
})(<Input maxLength="11" style={{ width: 200 }} placeholder="输入手机号码" />)} })(<Input maxLength={11} style={{ width: 200 }} placeholder="输入手机号码" />)}
</Form.Item> </Form.Item>
</Col> </Col>
</Col> </Col>
......
...@@ -116,7 +116,7 @@ class eliminateEdit extends React.Component { ...@@ -116,7 +116,7 @@ class eliminateEdit extends React.Component {
rules: [{ required: true, message: '课程不能为空' }], rules: [{ required: true, message: '课程不能为空' }],
})( })(
<Select style={{ width: 200 }} onChange={this.selectMyCourse} placeholder="请选择课程"> <Select style={{ width: 200 }} onChange={this.selectMyCourse} placeholder="请选择课程">
{courseExcludeClassTypeList.map(ele => <Option value={ele.id}>{ele.course.title}</Option>)} {courseExcludeClassTypeList.map(ele => <Option key={ele.id} value={ele.id}>{ele.course.title}</Option>)}
</Select>)} </Select>)}
</Form.Item> </Form.Item>
{getFieldValue('student_course_id') != undefined ? ( {getFieldValue('student_course_id') != undefined ? (
......
...@@ -732,14 +732,14 @@ class StudentMgt extends React.Component { ...@@ -732,14 +732,14 @@ class StudentMgt extends React.Component {
<div className={pageStyle.formitemlabel}>报读课程</div> <div className={pageStyle.formitemlabel}>报读课程</div>
<Select className={pageStyle.selectitem} placeholder="请选择所属课程" value={searchstudentListQueryParams.course_id} onChange={e => this.searchParamsChange(e, 'Select', 'course_id')}> <Select className={pageStyle.selectitem} placeholder="请选择所属课程" value={searchstudentListQueryParams.course_id} onChange={e => this.searchParamsChange(e, 'Select', 'course_id')}>
<Option value="">全部课程</Option> <Option value="">全部课程</Option>
{courseList.map(ele => <Option value={ele.id}>{ele.title}</Option>)} {courseList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select> </Select>
</Col> </Col>
<Col className={pageStyle.formitem} xs={{ span: 12 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}> <Col className={pageStyle.formitem} xs={{ span: 12 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<div className={pageStyle.formitemlabel}>所在班级</div> <div className={pageStyle.formitemlabel}>所在班级</div>
<Select className={pageStyle.selectitem} placeholder="班级列表" value={searchstudentListQueryParams.class_id} onChange={e => this.searchParamsChange(e, 'Select', 'class_id')}> <Select className={pageStyle.selectitem} placeholder="班级列表" value={searchstudentListQueryParams.class_id} onChange={e => this.searchParamsChange(e, 'Select', 'class_id')}>
<Option value="">全部班级</Option> <Option value="">全部班级</Option>
{classList.map(ele => <Option value={ele.id}>{ele.title}</Option>)} {classList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select> </Select>
</Col> </Col>
<Col className={pageStyle.formitem} xs={{ span: 12 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}> <Col className={pageStyle.formitem} xs={{ span: 12 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
...@@ -811,6 +811,7 @@ class StudentMgt extends React.Component { ...@@ -811,6 +811,7 @@ class StudentMgt extends React.Component {
columns={columns} columns={columns}
pagination={false} pagination={false}
scroll={{ x: 'max-content' }} scroll={{ x: 'max-content' }}
rowKey="id"
footer={() => ( footer={() => (
<div className="tablefooterbox"> <div className="tablefooterbox">
<span className="tablefooterstatic">{studentListTotal}条数据</span> <span className="tablefooterstatic">{studentListTotal}条数据</span>
......
...@@ -173,7 +173,7 @@ class NewRenewEdit extends React.Component { ...@@ -173,7 +173,7 @@ class NewRenewEdit extends React.Component {
})( })(
<Select style={{ width: 200 }} onChange={this.courseChange}> <Select style={{ width: 200 }} onChange={this.courseChange}>
<Option value="">请选择课程</Option> <Option value="">请选择课程</Option>
{renewCourses.map(ele => <Option value={ele.id}>{ele.title}</Option>)} {renewCourses.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)} </Select>)}
</Form.Item> </Form.Item>
</Col> </Col>
...@@ -338,7 +338,7 @@ class NewRenewEdit extends React.Component { ...@@ -338,7 +338,7 @@ class NewRenewEdit extends React.Component {
// onChange={handleChange} // onChange={handleChange}
style={{ width: '55%' }} style={{ width: '55%' }}
> >
{classList.map(ele => <Option value={ele.id}>{ele.title}</Option>)} {classList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>, </Select>,
)} )}
</Form.Item> </Form.Item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment