Skip to content

B
biz.qingxiao.com
Commit e0efe7b5 authored by baixian's avatar baixian
Browse files
Options

最新代码提交

parent 6225c745
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 13 deletions
src/components/CallStudents.js
View file @ e0efe7b5
......@@ -634,7 +634,7 @@ class CallStudentsForm extends React.Component {
<span className={pageStyle.detaildesc}>{(callStudentSchedule.class_room && callStudentSchedule.class_room.title) || '未设置'}</span>
</Col>
</Row>
<Row gutter={16} className={pageStyle.detailrow} type="flex" align="middle" style={{ marginBottom: '12px' }}>
<Row gutter={16} className={pageStyle.detailrow} type="flex" style={{ marginBottom: '12px' }}>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<span className={pageStyle.detailtitle}>上课时间：</span>
<span className={pageStyle.detaildesc}>{callStudentSchedule.start_date_format}-{callStudentSchedule.end_date_format}</span>
......@@ -662,7 +662,7 @@ class CallStudentsForm extends React.Component {
<span className={pageStyle.detaildesc}>{(classDetail.class_room && classDetail.class_room.title) || '未设置'}</span>
</Col>}
</Row>
<Row gutter={16} className={pageStyle.detailrow} type="flex" align="middle" style={{ marginBottom: '12px' }}>
<Row gutter={16} className={pageStyle.detailrow} type="flex" style={{ marginBottom: '12px' }}>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ marginBottom: '20px' }}>
<span className={pageStyle.detailtitle}>总课时：</span>
<span className={pageStyle.detaildesc}>{classDetail.total}</span>
......@@ -696,7 +696,7 @@ class CallStudentsForm extends React.Component {
}
</Col>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 12 }} style={{ marginBottom: '24px' }}>
<Row type="flex" align="left">
<Row type="flex">
<Input
suffix={
<Icon type="search" style={{ color: 'rgba(0,0,0,.45)' }} />
......
src/pages/classdetail/ChangeCourse.js
View file @ e0efe7b5
......@@ -102,7 +102,7 @@ class ChangeCourse extends React.Component {
<Radio.Button value={2}>学员信息</Radio.Button>
</Radio.Group>
{changeScheduleIndex == 1 &&
<Form className="modalform" hideRequiredMark={() => (true)} labelAlign="left">
<Form className="modalform" hideRequiredMark labelAlign="left">
<Form.Item
label="上课日期："
labelCol={{
......@@ -138,7 +138,7 @@ class ChangeCourse extends React.Component {
initialValue: `${selectScheduleinfo.start_date_format}-${selectScheduleinfo.end_date_format}`,
})(
<Select placeholder="请选择上课时间" style={{ width: '224px' }}>
{timeArr.map(ele => <Option value={`${ele.start_time}-${ele.end_time}`}>{`${ele.start_time}-${ele.end_time}`}</Option>)}
{timeArr.map(ele => <Option key={ele.end_time} value={`${ele.start_time}-${ele.end_time}`}>{`${ele.start_time}-${ele.end_time}`}</Option>)}
</Select>)}
</Col>
</Row>
......@@ -162,7 +162,7 @@ class ChangeCourse extends React.Component {
})(
<Select style={{ width: '224px' }}>
<Option value="">无</Option>
{teacherList.map(ele => <Option value={ele.id}>{ele.nickname}</Option>)}
{teacherList.map(ele => <Option key={ele.id} value={ele.id}>{ele.nickname}</Option>)}
</Select>)}
</Col>
</Row>
......@@ -183,9 +183,9 @@ class ChangeCourse extends React.Component {
{getFieldDecorator('class_room_id', {
initialValue: selectScheduleinfo.class_room_id == 0 ? '' : selectScheduleinfo.class_room_id,
})(
<Select defaultValue="1" style={{ width: '224px' }}>
<Select style={{ width: '224px' }}>
<Option value="">空</Option>
{classroomList.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
{classroomList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)}
</Col>
</Row>
......@@ -213,6 +213,7 @@ class ChangeCourse extends React.Component {
}
{changeScheduleIndex == 2 &&
<Table
rowKey={scheduleStudentList => scheduleStudentList.name}
dataSource={scheduleStudentList}
columns={schedulestudentcolumns}
scroll={{ x: 400 }}
......
src/pages/classdetail/CourseTimeList.js
View file @ e0efe7b5
......@@ -46,7 +46,7 @@ class AddCourseTime extends React.Component {
</Col>
<Col lg={{ span: 19 }} md={{ span: 20 }} xs={{ span: 24 }} style={{ }}>
{timeArr && timeArr.map(ele => (
<div className={pageStyle.timeitem}>
<div key={ele.start_time} className={pageStyle.timeitem}>
<span className={pageStyle.itemContent}>{ele.start_time}～{ele.end_time}</span>
<Icon onClick={() => delTime(ele)} type="close-circle" theme="twoTone" style={{ color: '#FF5252', fontSize: '12px' }} twoToneColor="#FF5252" />
</div>
......
src/pages/classdetail/index.js
View file @ e0efe7b5
......@@ -1464,7 +1464,7 @@ class ClassDetailForm extends React.Component {
<span className={pageStyle.detaildesc}>{classDetail.total > 0 ? classDetail.total : '-'}</span>
</Col>
</Row>
<Row gutter={16} className={pageStyle.detailrow} type="flex" align="middle">
<Row gutter={16} className={pageStyle.detailrow} type="flex">
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<span className={pageStyle.detailtitle}>在读人数：</span>
<span className={pageStyle.detaildesc}>{classDetail.class_student_count}</span>
......@@ -1496,6 +1496,7 @@ class ClassDetailForm extends React.Component {
selectedRowKeys: selectedToDelPlansKey,
onChange: this.onDelPLanSelectChange,
}}
rowKey={coursePlansList => coursePlansList.name}
dataSource={coursePlansList}
columns={courseplancolumns}
scroll={{ x: 'max-content' }}
......@@ -1518,7 +1519,7 @@ class ClassDetailForm extends React.Component {
</div>
</TabPane>
<TabPane tab="班级学员" key="2">
<Row type="flex" align="middle" justify="space-between" className={pageStyle.courseoperate}>
<Row type="flex" justify="space-between" className={pageStyle.courseoperate}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 12 }}>
{hasBtnPower('sjd/classdetail', 'addClassStudent') && <Button className={pageStyle.courseoperatebtn} onClick={this.toAddClassStudent} type="primary" ghost>添加学员</Button>}
{hasBtnPower('sjd/classdetail', 'changeClass') && <Button className={pageStyle.courseoperatebtn} onClick={this.studentsChangeClass}>调至其他班级</Button>}
......@@ -1541,6 +1542,7 @@ class ClassDetailForm extends React.Component {
selectedRowKeys: selectedToDelStudentsKey,
onChange: this.onDelStudentsSelectChange,
}}
rowKey={classStudentList => classStudentList.name}
dataSource={classStudentList}
columns={studentcolumns}
scroll={{ x: 700 }}
......@@ -1563,12 +1565,12 @@ class ClassDetailForm extends React.Component {
</div>
</TabPane>
<TabPane tab="点名情况" key="3">
<Row type="flex" align="middle" justify="space-between" className={pageStyle.courseoperate}>
<Row type="flex" justify="space-between" className={pageStyle.courseoperate}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 8 }} style={{ display: 'flex', alignItems: 'center', marginBottom: '12px' }}>
<div className={pageStyle.dianmingtime}>一周点名情况 {scheduleListQueryParams.start_time}～{scheduleListQueryParams.end_time}</div>
<Select value={scheduleListQueryParams.teacher_id} onChange={this.filterTeachersSchedule}>
<Option value="">全部老师</Option>
{classDetail.school_teachers && classDetail.school_teachers.map(ele => <Option value={ele.id}>{ele.nickname}</Option>)}
{classDetail.school_teachers && classDetail.school_teachers.map(ele => <Option key={ele.id} value={ele.id}>{ele.nickname}</Option>)}
</Select>
</Col>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 16 }} className={pageStyle.searchcol} style={{ marginBottom: '12px' }}>
......@@ -1580,6 +1582,7 @@ class ClassDetailForm extends React.Component {
</Row>
<div className={pageStyle.studenttablebox}>
<Table
rowKey={scheduleList => scheduleList.call_time}
dataSource={scheduleList}
columns={coursecolumns}
scroll={{ x: 'max-content' }}
......@@ -1621,6 +1624,7 @@ class ClassDetailForm extends React.Component {
>
<Row>
<Table
rowKey={classList => classList.title}
dataSource={classList}
columns={exchangeClassColumns}
scroll={{ x: 'max-content' }}
......@@ -1661,6 +1665,7 @@ class ClassDetailForm extends React.Component {
</Row>
<Row>
<Table
rowKey={toAddStudentList => toAddStudentList.name}
dataSource={toAddStudentList}
columns={addstudentColumns}
scroll={{ x: 'max-content' }}
......@@ -1701,6 +1706,7 @@ class ClassDetailForm extends React.Component {
>
<Row>
<Table
rowKey={studentChangeScheduleList => studentChangeScheduleList.coursetime}
dataSource={studentChangeScheduleList}
columns={studentChangeScheduleColumns}
loading={studentChangeScheduleListLoading}
......
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