Skip to content

B
biz.qingxiao.com
Commit 7e293eb4 authored by wangxuelai's avatar wangxuelai
Browse files
Options

Merge remote-tracking branch 'origin/bww-develop'

parents 50012506 7c606da9
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 74 deletions
src/components/CallStudents.js
View file @ 7e293eb4
......@@ -639,7 +639,7 @@ class CallStudentsForm extends React.Component {
<span className={pageStyle.detailtitle}>上课时间：</span>
<span className={pageStyle.detaildesc}>{callStudentSchedule.start_date_format}-{callStudentSchedule.end_date_format}</span>
</Col>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ marginBottom: '20px' }}>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} >
<span className={pageStyle.detailtitle}>授课课时：</span>
<InputNumber value={expend} size="middle" className={pageStyle.hourInput} onChange={this.changeExpand} />
</Col>
......@@ -674,12 +674,12 @@ class CallStudentsForm extends React.Component {
</Row>
</div>}
<Row>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 12 }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 12 }}>
{canAddStudent &&
<Row>
<Button style={{ marginRight: '15px' }} type="primary" ghost onClick={this.studentAllIn}>全部到课</Button>
<Button style={{ marginRight: '15px' }} onClick={this.addLinShiStudent}>添加临时学员</Button>
<Button onClick={this.addbukeStudent}>添加补课学员</Button>
<Button className={pageStyle.mTop15} onClick={this.addbukeStudent}>添加补课学员</Button>
</Row>
}
{callType == 2 &&
......@@ -695,13 +695,14 @@ class CallStudentsForm extends React.Component {
</Row>
}
</Col>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 12 }} style={{ marginBottom: '24px' }}>
<Row type="flex" align="center" justify="end">
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 12 }} style={{ marginBottom: '24px' }}>
<Row type="flex" align="left">
<Input
suffix={
<Icon type="search" style={{ color: 'rgba(0,0,0,.45)' }} />
}
style={{ width: '214px', marginRight: '20px' }}
className={pageStyle.resetstudentsearch}
placeholder="搜索学员"
value={searchCallStudentValue}
onChange={e => this.searchCallStudent(e)}
......@@ -713,7 +714,7 @@ class CallStudentsForm extends React.Component {
<Table
dataSource={callStudentOperateList}
columns={studentcolumns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
loading={callStudentListLoading}
pagination={false}
footer={() => <div className="tablefooterbox" style={fontSize14}>共有{callStudentTotal}个学生</div>}
......@@ -747,7 +748,7 @@ class CallStudentsForm extends React.Component {
<Table
dataSource={linshiStudentList}
columns={addstudentColumns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
pagination={false}
footer={() => (
<div className="tablefooterbox">
......@@ -797,7 +798,7 @@ class CallStudentsForm extends React.Component {
<Table
dataSource={bukeStudentList}
columns={bukestudentColumns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
pagination={false}
footer={() => (
<div className="tablefooterbox">
......
src/components/CallStudents.less
View file @ 7e293eb4
......@@ -9,6 +9,16 @@
background-color: red;
color: #fff;
}
.endsearchcol {
.resetsearchendsearchcol {
margin-bottom: 24px;
}
\ No newline at end of file
}
@media (max-width: 990px) {
.resetstudentsearch {
margin-top: 15px;
}
}
@media (max-width: 510px) {
.mTop15 {
margin-top: 15px;
}
}
src/components/qrcodeShow.less
View file @ 7e293eb4
......@@ -26,7 +26,6 @@
background-color: rgba(0,0,0,0.5);
}
.qrcodeBox {
width: 520px;
height: 320px;
border-radius: 10px;
background-color: #fff;
......@@ -34,6 +33,8 @@
z-index: 2;
animation: qrCodefadeIn 0.1s linear 1 forwards;
// overflow: hidden;
max-width: 520px;
width: calc(100% - 10px);
}
.boxHeader {
height: 150px;
......@@ -70,4 +71,4 @@
height: 160px;
display: block;
margin: -10px auto 0;
}
\ No newline at end of file
}
src/pages/classdetail/index.js
View file @ 7e293eb4
......@@ -1463,7 +1463,7 @@ class ClassDetailForm extends React.Component {
}}
dataSource={coursePlansList}
columns={courseplancolumns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
pagination={false}
footer={() => (
<div className="tablefooterbox">
......@@ -1484,12 +1484,12 @@ class ClassDetailForm extends React.Component {
</TabPane>
<TabPane tab="班级学员" key="2">
<Row type="flex" align="middle" justify="space-between" className={pageStyle.courseoperate}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 12 }}>
<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>}
{hasBtnPower('sjd/classdetail', 'removeClass') && <Button className={pageStyle.courseoperatebtn} onClick={this.removeClassStudent}>移出本班</Button>}
</Col>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 12 }} className={pageStyle.searchcol}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 12 }} className={pageStyle.searchcol}>
<Input
style={{ width: '214px', marginRight: '21px' }}
placeholder="搜索学员"
......@@ -1540,14 +1540,14 @@ class ClassDetailForm extends React.Component {
<Button icon="left" style={{ marginRight: '15px' }} onClick={() => this.searchSchedule('pre')}>上周</Button>
<Button style={{ marginRight: '15px' }} onClick={() => this.searchSchedule('current')}>本周</Button>
<Button icon="right" style={{ marginRight: '40px' }} onClick={() => this.searchSchedule('next')}>下周</Button>
{hasBtnPower('sjd/classdetail', 'noPlanCallStudent') && <Button type="primary" onClick={this.toQuickCallStudents}>未排课直接点名</Button>}
{hasBtnPower('sjd/classdetail', 'noPlanCallStudent') && <Button className={pageStyle.resetcourse} type="primary" onClick={this.toQuickCallStudents}>未排课直接点名</Button>}
</Col>
</Row>
<div className={pageStyle.studenttablebox}>
<Table
dataSource={scheduleList}
columns={coursecolumns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
pagination={false}
/>
</div>
......@@ -1588,7 +1588,7 @@ class ClassDetailForm extends React.Component {
<Table
dataSource={classList}
columns={exchangeClassColumns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
pagination={false}
footer={() => (
<div className="tablefooterbox">
......@@ -1628,7 +1628,7 @@ class ClassDetailForm extends React.Component {
<Table
dataSource={toAddStudentList}
columns={addstudentColumns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
pagination={false}
footer={() => (
<div className="tablefooterbox">
......@@ -1669,6 +1669,7 @@ class ClassDetailForm extends React.Component {
dataSource={studentChangeScheduleList}
columns={studentChangeScheduleColumns}
loading={studentChangeScheduleListLoading}
scroll={{ x: 'max-content' }}
pagination={false}
footer={() => (
<div className="tablefooterbox">
......@@ -1684,7 +1685,6 @@ class ClassDetailForm extends React.Component {
/>
</div>
)}
scroll={{ x: 700 }}
/>
</Row>
</Modal>
......
src/pages/classdetail/index.less
View file @ 7e293eb4
@import '../../less/variables.less';
.container {
// background-color: #fff;
}
.classDetail {
background-color: #fff;
......@@ -19,7 +19,7 @@
line-height: 55px;
color: #000;
font-size: 16px;
font-weight: 600;
font-weight: 600;
}
.classDetailbox {
padding: 32px 16px 27px 32px;
......@@ -117,4 +117,14 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
\ No newline at end of file
}
@media (max-width: 768px) {
.searchcol {
text-align: left;
}
}
@media (max-width: 510px) {
.resetcourse {
margin-top: 15px;
}
}
src/pages/classmgt/ClassStatusChangeModal.js
View file @ 7e293eb4
......@@ -145,7 +145,7 @@ class ClassStatusChangeModal extends React.Component {
<Table
dataSource={statusChangeClassList}
columns={endclasscolumns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
pagination={false}
footer={() => (
<div className="tablefooterbox">
......
src/pages/classmgt/ClassStatusChangeModal.less
View file @ 7e293eb4
......@@ -23,4 +23,7 @@
}
.selectclasscount {
line-height: 32px;
}
\ No newline at end of file
}
.endsearchcol {
margin-bottom: 15px;
}
src/pages/classmgt/EditClassModal.js
View file @ 7e293eb4
......@@ -179,7 +179,7 @@ class EditClassModal extends React.Component {
},
},
],
})(<InputNumber placeholder="请输入班级容量" style={{ width: '100%' }} />)}
})(<InputNumber min={0} placeholder="请输入班级容量" style={{ width: '100%' }} />)}
</Form.Item>
<Form.Item
label={<span>&nbsp;&nbsp;&nbsp;上课次数</span>}
......@@ -203,7 +203,7 @@ class EditClassModal extends React.Component {
},
// { required: true, message: '上课次数不能为空' },
],
})(<InputNumber placeholder="请输入上课次数" style={{ width: '100%' }} />)}
})(<InputNumber min={0} placeholder="请输入上课次数" style={{ width: '100%' }} />)}
</Col>
</Row>
</Form.Item>
......
src/pages/classmgt/index.js
View file @ 7e293eb4
......@@ -562,7 +562,7 @@ class ClassMgtForm extends React.Component {
<Table
dataSource={classList}
columns={columns}
scroll={{ x: 700 }}
scroll={{ x: 'max-content' }}
pagination={false}
footer={() => (
<div className="tablefooterbox">
......
src/pages/student/StudentAdd.js
View file @ 7e293eb4
......@@ -455,7 +455,7 @@ class StudentAddForm extends React.Component {
},
],
})(
<InputNumber style={{ width: 200 }} placeholder="请输入购买课时" />,
<InputNumber min="0" style={{ width: 200 }} placeholder="请输入购买课时" />,
)}
</Form.Item>
</Col>
......@@ -483,7 +483,7 @@ class StudentAddForm extends React.Component {
},
],
})(
<InputNumber style={{ width: 200 }} placeholder="请输入赠送课时" />,
<InputNumber min="0" style={{ width: 200 }} placeholder="请输入赠送课时" />,
)}
</Form.Item>
</Col>
......
src/pages/student/index.js
View file @ 7e293eb4
......@@ -640,14 +640,14 @@ class StudentMgt extends React.Component {
{hasBtnPower('sjd/student', 'addStudent') && <Button icon="plus" className={pageStyle.headerbtn} type="primary" onClick={() => this.setModal1Visible(true)}>添加</Button>}
{/* <Button className={pageStyle.headerbtn}>批量操作</Button> */}
{hasBtnPower('sjd/student', 'enrolCode') && <Button className={pageStyle.headerbtn} onClick={this.toSetSelfJoin}>自助报名二维码</Button>}
{hasBtnPower('sjd/student', 'bundlingCode') && <Button className={pageStyle.headerbtn} onClick={this.bindQrcodeShow}>自助绑定二维码</Button>}
{hasBtnPower('sjd/student', 'bundlingCode') && <Button id={pageStyle.headerself} className={pageStyle.headerbtn} onClick={this.bindQrcodeShow}>自助绑定二维码</Button>}
</div>
<div className={pageStyle.search}>
<div className={pageStyle.title}>学员搜索</div>
<div className={pageStyle.searchbox}>
<Row
gutter={{
sm: 24, xs: 24, md: 24, lg: 64,
sm: 24, xs: 24, md: 24, lg: 24,
}}
className={pageStyle.searchrow}
>
......@@ -680,7 +680,7 @@ class StudentMgt extends React.Component {
</Row>
<Row
gutter={{
sm: 24, xs: 24, md: 24, lg: 64,
sm: 24, xs: 24, md: 24, lg: 24,
}}
className={pageStyle.searchrow}
>
......@@ -718,9 +718,9 @@ class StudentMgt extends React.Component {
<Option value={2}>否</Option>
</Select>
</Col>
<Col className={pageStyle.formitem} xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 3 }}>
<Col className={pageStyle.formitem} xs={{ span: 12 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 3 }}>
<div className={pageStyle.formitemlabel} >学员年龄</div>
<InputNumber style={{ width: 38 }} value={searchstudentListQueryParams.age_start} min="0" onChange={e => this.searchParamsChange(e, 'Select', 'age_start')} /> ~ <InputNumber style={{ width: 38 }} min="0" value={searchstudentListQueryParams.age_end} onChange={e => this.searchParamsChange(e, 'Select', 'age_end')} />
<InputNumber style={{ width: 50 }} value={searchstudentListQueryParams.age_start} min="0" onChange={e => this.searchParamsChange(e, 'Select', 'age_start')} /> ~ <InputNumber style={{ width: 50 }} min="0" value={searchstudentListQueryParams.age_end} onChange={e => this.searchParamsChange(e, 'Select', 'age_end')} />
</Col>
<Col className={pageStyle.searchbtnbox} xs={{ span: 12 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<Button className={pageStyle.resetbtn} onClick={this.reset}>重置</Button>
......@@ -737,6 +737,7 @@ class StudentMgt extends React.Component {
dataSource={studentsinfo}
columns={columns}
pagination={false}
scroll={{ x: 'max-content' }}
footer={() => (
<div className="tablefooterbox">
<span className="tablefooterstatic">共{studentListTotal}条数据</span>
......
src/pages/student/index.less
View file @ 7e293eb4
......@@ -60,8 +60,8 @@
}
.tableoperatebox {
min-width: 160px;
line-height: 30px;
}
line-height: 30px;
}
.formitemlabel {
color: #000000;
font-size: 14px;
......@@ -118,7 +118,7 @@
}
}
.changeCourse,.addCourse {
padding-left: 25px;
padding-left: 25px;
}
.CourseText{
font-size:14px;
......@@ -149,7 +149,7 @@
.name{
// margin: 10px 0;
span{
}
}
......@@ -158,8 +158,21 @@
}
.resetbtn {
margin-right: 15px;
}
.downloadbtn{
margin-left: 15px;
}
\ No newline at end of file
}
@media (max-width: 988px) {
.searchbtnbox {
float: left;
}
}
@media (max-width: 510px) {
#headerself {
margin-top: 15px;
}
.searchbtnbox {
float: left;
}
}
src/pages/studentclass/index.js
View file @ 7e293eb4
......@@ -289,12 +289,12 @@ class classChange extends React.Component {
<Button className={pageStyle.headerbtn} onClick={this.resetStudent}>重置</Button>
</div>
<Row gutter={15}>
<Col span={16}>
<Col sm={12} md={12} lg={16} xl={16}>
<div className={pageStyle.tablebox}>
<Table columns={columns} dataSource={studentCourseAndClassInfo} bordered pagination={false} />
</div>
</Col>
<Col span={8}>
<Col sm={12} md={12} lg={8} xl={8}>
<div className={pageStyle.tabletitle}>
<div className={pageStyle.title}>班级列表</div>
<div className={pageStyle.tablebtn}>
......
src/pages/studentclass/index.less
View file @ 7e293eb4
@import '../../less/variables.less';
.container {
// background-color: #fff;
}
.headerbox {
padding: 19px 0 19px 16px;
......@@ -53,7 +53,7 @@
font-weight:500;
color:rgba(0,0,0,0.85);
line-height:55px;
}
}
.tablesearch{
......@@ -129,4 +129,10 @@
}
}
}
}
\ No newline at end of file
}
@media (max-width: 560px) {
.tabletitle {
margin-top: 15px;
}
}
src/pages/studentinfo/index.js
View file @ 7e293eb4
......@@ -670,10 +670,12 @@ class StudentMgt extends React.Component {
</div>
<div className={pageStyle.searchbox}>
<Row className={pageStyle.settingcontent}>
<Col xs={{ span: 12 }} sm={{ span: 5 }} lg={{ span: 5 }} xl={{ span: 3 }} xxl={{ span: 2 }} className={pageStyle.avatarbox}>
<img className={pageStyle.avatar} src={imagify(studentsdetail.avatar) || `${__IMGCDN__}defaultavatar.png`} alt="" />
{studentsdetail.gender && studentsdetail.gender == 1 ? <img className={pageStyle.sexflag} src={`${__IMGCDN__}boy.png`} alt="" /> : ''}
{studentsdetail.gender && studentsdetail.gender == 2 ? <img className={pageStyle.sexflag} src={`${__IMGCDN__}girl.png`} alt="" /> : ''}
<Col xs={{ span: 12 }} sm={{ span: 5 }} lg={{ span: 5 }} xl={{ span: 3 }} xxl={{ span: 2 }} >
<div className={pageStyle.avatarbox}>
<img className={pageStyle.avatar} src={imagify(studentsdetail.avatar) || `${__IMGCDN__}defaultavatar.png`} alt="" />
{studentsdetail.gender && studentsdetail.gender == 1 ? <img className={pageStyle.sexflag} src={`${__IMGCDN__}boy.png`} alt="" /> : ''}
{studentsdetail.gender && studentsdetail.gender == 2 ? <img className={pageStyle.sexflag} src={`${__IMGCDN__}girl.png`} alt="" /> : ''}
</div>
</Col>
<Col xs={{ span: 12 }} sm={{ span: 19 }} lg={{ span: 19 }} xl={{ span: 16 }} xxl={{ span: 12 }}>
<Descriptions>
......@@ -708,6 +710,7 @@ class StudentMgt extends React.Component {
dataSource={studentCurrentCourses}
columns={columns}
pagination={false}
scroll={{ x: 'max-content' }}
footer={() => (
<div className="tablefooterbox">
<span className="tablefooterstatic">共{studentCurrentCoursesTotal}条数据</span>
......@@ -736,6 +739,7 @@ class StudentMgt extends React.Component {
<div className={pageStyle.tablebox}>
<Table
pagination={false}
scroll={{ x: 'max-content' }}
footer={() => (
<div className="tablefooterbox">
<span className="tablefooterstatic">共{classRecordsTotal}条数据</span>
......@@ -758,7 +762,7 @@ class StudentMgt extends React.Component {
<TabPane tab="操作日志" key="3">
<Row>
<div className={pageStyle.tabselect}>选择课程：</div>
<Col span={15}>
<Col span={20}>
<Select placeholder="课程列表" style={{ width: 233 }} onChange={this.OperationLog} value={logCourseId}>
<Option value="">全部课程</Option>
{this.renderOption()}
......
src/pages/studentinfo/index.less
View file @ 7e293eb4
......@@ -66,8 +66,8 @@
}
.tableoperatebox {
min-width: 160px;
line-height: 30px;
}
line-height: 30px;
}
.formitemlabel {
color: #000000;
font-size: 14px;
......@@ -96,7 +96,7 @@
.name{
//margin: 10px 0;
span{
}
}
.name{
......@@ -115,7 +115,7 @@
}
.resetbtn {
margin-right: 15px;
}
.courseinfo{
padding: 20px 0 0 17px;
......@@ -145,7 +145,7 @@
}
}
.changeCourse,.addCourse {
padding-left: 25px;
padding-left: 25px;
}
.CourseText{
font-size:14px;
......@@ -165,13 +165,15 @@
}
.avatarbox{
position: relative;
width: 100px;
height: 100px;
}
.sexflag{
width: 20px;
height: 20px;
position: absolute;
right: 45px;
bottom: 0px;
right: 5px;
bottom: 15px;
}
.logTeacherName {
font-weight: 700;
......@@ -179,4 +181,4 @@
.logAction {
color: #108EE9;
font-weight: 700;
}
\ No newline at end of file
}
src/pages/teacher/index.js
View file @ 7e293eb4
......@@ -321,6 +321,7 @@ class ClassMgt extends React.Component {
dataSource={teachersinfo}
columns={columns}
pagination={false}
scroll={{ x: 'max-content' }}
footer={() => (
<div className="tablefooterbox">
<span className="tablefooterstatic">共{teacherListTotal}条数据</span>
......
src/pages/teacherinfo/index.js
View file @ 7e293eb4
......@@ -864,10 +864,10 @@ class teachersForm extends React.Component {
className={pageStyle.searchrow}
gutter="24"
>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 6 }}>
<div className={pageStyle.formitemlabel}>上课时间：<RangePicker style={{ width: '100%', maxWidth: 233 }} onChange={e => this.searchParamsChange(e, 'time')} /></div>
</Col>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 6 }}>
<div className={pageStyle.formitemlabel}>
授课班级：
<Select style={{ width: '100%', maxWidth: 233 }} placeholder="班级列表" value={copyTeachersScheduleListQueryParams.class_id} onChange={e => this.searchParamsChange(e, 'classId')}>
......@@ -876,7 +876,7 @@ class teachersForm extends React.Component {
</Select>
</div>
</Col>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 6 }}>
<div className={pageStyle.formitemlabel}>点名状态：
<Select style={{ width: '100%', maxWidth: 233 }} placeholder="全部" value={copyTeachersScheduleListQueryParams.status} onChange={e => this.searchParamsChange(e, 'status')}>
<Option value="">全部状态</Option>
......@@ -887,7 +887,7 @@ class teachersForm extends React.Component {
</Col>
</Row>
<Row gutter="24" tyle="flex" align="center">
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<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>
......@@ -895,7 +895,7 @@ class teachersForm extends React.Component {
</Select>
</div>
</Col>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 6 }}>
<div className={pageStyle.formitemlabel}>
<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')}>
......@@ -904,9 +904,11 @@ class teachersForm extends React.Component {
</Select>
</div>
</Col>
<Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ display: 'flex', alignItems: 'end' }}>
<Button style={{ marginRight: '15px' }} onClick={this.resetTeachersSchedule}>重置</Button>
<Button type="primary" onClick={this.searchTeachersSchedule}>搜索</Button>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ display: 'flex', alignItems: 'end' }}>
<div className={pageStyle.mbottom15}>
<Button style={{ marginRight: '15px' }} onClick={this.resetTeachersSchedule}>重置</Button>
<Button type="primary" onClick={this.searchTeachersSchedule}>搜索</Button>
</div>
</Col>
</Row>
</div>
......@@ -916,6 +918,7 @@ class teachersForm extends React.Component {
dataSource={teachersschedulelist}
columns={RecordColumns}
pagination={false}
scroll={{ x: 'max-content' }}
footer={() => (
<div className="tablefooterbox">
<span className="tablefooterstatic">共{teachersscheduleTotal}条数据</span>
......@@ -947,7 +950,7 @@ class teachersForm extends React.Component {
</Row>
</div>
<div className={pageStyle.tablebox}>
<Table dataSource={scheduleList} columns={columns} />
<Table scroll={{ x: 'max-content' }} dataSource={scheduleList} columns={columns} />
</div>
</TabPane>
</Tabs>
......
src/pages/teacherinfo/index.less
View file @ 7e293eb4
......@@ -68,8 +68,8 @@
}
.tableoperatebox {
min-width: 160px;
line-height: 30px;
}
line-height: 30px;
}
.formitemlabel {
color: #000000;
font-size: 14px;
......@@ -95,7 +95,7 @@
.name{
//margin: 10px 0;
span{
}
}
.avatar {
......@@ -115,7 +115,7 @@
}
.resetbtn {
margin-right: 15px;
}
.name{
}
......@@ -147,7 +147,7 @@
}
}
.changeCourse,.addCourse {
padding-left: 25px;
padding-left: 25px;
}
.CourseText{
font-size:14px;
......@@ -189,4 +189,10 @@
}
}
}
}
\ No newline at end of file
}
@media (max-width: 990px) {
.mbottom15 {
margin-bottom: 15px;
}
}
src/pages/thememgt/index.js
View file @ 7e293eb4
......@@ -319,6 +319,7 @@ class ThemeMgt extends React.Component {
rowClassName="activetablerow"
className="activetable"
pagination={false}
scroll={{ x: 'max-content' }}
footer={() => (
<div className="tablefooterbox">
<span className="tablefooterstatic">共{themeTotal}条数据</span>
......
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