Skip to content

B
biz.qingxiao.com
Commit 3459aa54 authored by wangxuelai's avatar wangxuelai
Browse files
Options

Merge remote-tracking branch 'origin/bww-v2' into webpack-change

parents dea75c4f 4cbab6ae
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 13 deletions
src/pages/studentinfo/ChangeCourse.js
View file @ 3459aa54
......@@ -134,7 +134,7 @@ class ChangeCourseForm extends React.Component {
],
})(
<Select style={{ width: 200 }} placeholder="请选择更换的课程" onChange={this.changeToTargetCourse}>
{targetCourseList.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
{targetCourseList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)}
</Form.Item>
{selectedCourseInfo.course_mode == 3 &&
......@@ -162,7 +162,7 @@ class ChangeCourseForm extends React.Component {
placeholder="请选择班级"
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>,
)}
</Form.Item>
......
src/pages/studentinfo/index.js
View file @ 3459aa54
......@@ -484,8 +484,6 @@ class StudentMgt extends React.Component {
erpCountdown,
erpCounting,
} = this.props;
console.log(this.props, 'this.props');
console.log(classRecordsList, 'classRecordsList');
const { getFieldDecorator } = this.props.form;
const { logCourseId } = this.state;
const dateFormat = 'YYYY/MM/DD';
......
src/pages/teacherinfo/index.js
View file @ 3459aa54
......@@ -504,7 +504,7 @@ class teachersForm extends React.Component {
{
title: '上课教室',
dataIndex: 'time',
key: 'time',
key: 'class_room_id',
render: (text, record, index) => {
return (
<div className={pageStyle.tableoperatebox}>
......@@ -554,7 +554,7 @@ class teachersForm extends React.Component {
{
title: '上课时间',
dataIndex: 'time',
key: 'time',
key: 'start_date',
render: (text, record, index) => {
return (
<div className={pageStyle.tableoperatebox}>
......@@ -758,6 +758,7 @@ class teachersForm extends React.Component {
onCancel={this.hideCallDetail}
>
<Table
rowKey="id"
dataSource={callStudentList}
columns={callDetailColumns}
loading={callStudentListLoading}
......@@ -780,6 +781,7 @@ class teachersForm extends React.Component {
>
<Row>
<Table
rowKey="id"
dataSource={studentChangeScheduleList}
columns={studentChangeScheduleColumns}
loading={studentChangeScheduleListLoading}
......@@ -813,7 +815,7 @@ class teachersForm extends React.Component {
<Col xs={{ span: 12 }} sm={{ span: 5 }} lg={{ span: 5 }} xl={{ span: 3 }} xxl={{ span: 2 }} className={pageStyle.avatarbox}>
<img className={pageStyle.avatar} src={(teachersdetail.avatar && imagify(teachersdetail.avatar)) || `${__IMGCDN__}defaultavatar.png`} alt={teachersdetail.nickname} />
</Col>
<Col span="12" >
<Col span={12}>
<Descriptions>
<Descriptions.Item label="姓名" className={pageStyle.item}>{teachersdetail.nickname}</Descriptions.Item>
</Descriptions>
......@@ -837,6 +839,7 @@ class teachersForm extends React.Component {
<TabPane tab="当前授课" key="1">
<div className={pageStyle.tablebox}>
<Table
rowKey="id"
dataSource={teacherclasslist}
columns={classinfo}
pagination={false}
......@@ -872,7 +875,7 @@ class teachersForm extends React.Component {
授课班级：
<Select style={{ width: '100%', maxWidth: 233 }} placeholder="班级列表" value={copyTeachersScheduleListQueryParams.class_id} onChange={e => this.searchParamsChange(e, 'classId')}>
<Option value="">全部班级</Option>
{teacherClassListForSearch.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
{teacherClassListForSearch.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>
</div>
</Col>
......@@ -886,12 +889,12 @@ class teachersForm extends React.Component {
</div>
</Col>
</Row>
<Row gutter={24} tyle="flex" align="center">
<Row gutter={24} tyle="flex">
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 6 }}>
<div className={pageStyle.formitemlabel}>授课课程：
<Select style={{ width: '100%', maxWidth: 233 }} value={copyTeachersScheduleListQueryParams.course_id} placeholder="课程列表" onChange={e => this.searchParamsChange(e, 'courseId')}>
<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>
</div>
</Col>
......@@ -900,7 +903,7 @@ class teachersForm extends React.Component {
<span style={{ marginRight: 28 }}>教室：</span>
<Select style={{ width: '100%', maxWidth: 233 }} value={copyTeachersScheduleListQueryParams.class_room_id} placeholder="教室列表" onChange={e => this.searchParamsChange(e, 'class_room_id')}>
<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>
</div>
</Col>
......@@ -915,6 +918,7 @@ class teachersForm extends React.Component {
</div>
<div className={pageStyle.tablebox}>
<Table
rowKey="id"
dataSource={teachersschedulelist}
columns={RecordColumns}
pagination={false}
......@@ -938,7 +942,7 @@ class teachersForm extends React.Component {
</TabPane>
<TabPane tab="排课表" key="3">
<div>
<Row className={pageStyle.timechoice} type="flex" align="middle">
<Row className={pageStyle.timechoice} type="flex">
<Col xs={{ span: 24 }} sm={{ span: 12 }} lg={{ span: 8 }} xl={{ span: 8 }} xxl={{ span: 5 }}>
<div className={pageStyle.dianmingtime}>一周点名情况 {scheduleListQueryParams.start_time}～{scheduleListQueryParams.end_time}</div>
</Col>
......@@ -950,7 +954,7 @@ class teachersForm extends React.Component {
</Row>
</div>
<div className={pageStyle.tablebox}>
<Table scroll={{ x: 'max-content' }} dataSource={scheduleList} columns={columns} />
<Table scroll={{ x: 'max-content' }} rowKey="id" dataSource={scheduleList} columns={columns} />
</div>
</TabPane>
</Tabs>
......
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