Skip to content

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

优化

parent 27484d0a
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 28 deletions
index.html
View file @ 24e3717f
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script src="dist/main.js?1576036639318" charset="utf-8"></script> <script src="dist/main.js?1576059303826" charset="utf-8"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/components/CallStudents.js
View file @ 24e3717f
...@@ -873,13 +873,13 @@ class CallStudentsForm extends React.Component { ...@@ -873,13 +873,13 @@ class CallStudentsForm extends React.Component {
<span className={pageStyle.detailtitle}><img src={`${__IMGCDN__}callstudent/icon_3.png`} alt="" />总课时：</span> <span className={pageStyle.detailtitle}><img src={`${__IMGCDN__}callstudent/icon_3.png`} alt="" />总课时：</span>
<span className={pageStyle.detaildesc}>{classDetail.total}</span> <span className={pageStyle.detaildesc}>{classDetail.total}</span>
</Col> </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: 12 }} style={{ marginBottom: '20px' }}>
<span className={pageStyle.detailtitle}><img src={`${__IMGCDN__}callstudent/icon_1.png`} alt="" />备注：</span> <span className={pageStyle.detailtitle}><img src={`${__IMGCDN__}callstudent/icon_1.png`} alt="" />备注：</span>
<span className={pageStyle.detaildesc}>{classDetail.remark}</span> <span className={pageStyle.detaildesc}>{classDetail.remark}</span>
</Col> </Col>
</Row> </Row>
</div>} </div>}
<Row> <Row style={{ marginTop: 12 }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 18 }}> <Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 18 }}>
{canAddStudent && {canAddStudent &&
<Row type="flex"> <Row type="flex">
......
src/components/LeaveDetailModal.js
View file @ 24e3717f
...@@ -100,7 +100,7 @@ class LeaveDetailModal extends React.Component { ...@@ -100,7 +100,7 @@ class LeaveDetailModal extends React.Component {
</div> </div>
<div className={pageStyle.right}> <div className={pageStyle.right}>
<div className={pageStyle.rightNum}>{detail.student.leave_count}</div> <div className={pageStyle.rightNum}>{detail.student.leave_count}</div>
<div className={pageStyle.rightTip}>历史请假（次）</div> <div className={pageStyle.rightTip}>历史请假(次)</div>
</div> </div>
</div> </div>
<div className={pageStyle.modalBody}> <div className={pageStyle.modalBody}>
......
src/components/LeaveDetailModal.less
View file @ 24e3717f
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
font-size: 20px; font-size: 20px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: rgba(255, 255, 255, 1); color: #929292;
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 0; bottom: 0;
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
overflow: hidden; overflow: hidden;
font-size: 0; font-size: 0;
line-height: 0; line-height: 0;
border-color: transparent #FFAD1F transparent transparent; border-color: transparent #EBEBEB transparent transparent;
border-style: solid solid dashed dashed; border-style: solid solid dashed dashed;
border-width: 100px 100px 0 0; border-width: 100px 100px 0 0;
bottom: -20px; bottom: -20px;
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
overflow: hidden; overflow: hidden;
font-size: 0; font-size: 0;
line-height: 0; line-height: 0;
border-color:transparent #35BAFD transparent transparent; border-color:transparent #2DBD5B transparent transparent;
border-style:solid solid dashed dashed; border-style:solid solid dashed dashed;
border-width:100px 100px 0 0 ; border-width:100px 100px 0 0 ;
bottom: -20px; bottom: -20px;
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
font-size:20px; font-size:20px;
font-family:PingFang SC; font-family:PingFang SC;
font-weight:bold; font-weight:bold;
color:#929292; color:#fff;
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 0; bottom: 0;
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
overflow: hidden; overflow: hidden;
font-size: 0; font-size: 0;
line-height: 0; line-height: 0;
border-color:transparent #EBEBEB transparent transparent; border-color:transparent #FF3A3A transparent transparent;
border-style:solid solid dashed dashed; border-style:solid solid dashed dashed;
border-width:100px 100px 0 0 ; border-width:100px 100px 0 0 ;
bottom: -20px; bottom: -20px;
......
src/models/callstudents.js
View file @ 24e3717f
...@@ -636,6 +636,13 @@ export default { ...@@ -636,6 +636,13 @@ export default {
callBack(callStudentSchedule.id); callBack(callStudentSchedule.id);
} }
} else { } else {
yield put({
type: 'queryLeaveList',
payload: {
params: {
},
},
});
yield put({ yield put({
type: 'webapp/errorrequestresolve', type: 'webapp/errorrequestresolve',
payload: { payload: {
...@@ -669,6 +676,7 @@ export default { ...@@ -669,6 +676,7 @@ export default {
payload: { payload: {
leaveList: data.data.list, leaveList: data.data.list,
leaveTotal: newTotal, leaveTotal: newTotal,
leaveParams: { ...newParams },
}, },
}); });
} else { } else {
......
src/models/classdetail.js
View file @ 24e3717f
...@@ -443,14 +443,14 @@ export default { ...@@ -443,14 +443,14 @@ export default {
loading = message.loading('课表加载中...', 0); loading = message.loading('课表加载中...', 0);
} }
let newScheduleListTotal = scheduleListTotal; let newScheduleListTotal = scheduleListTotal;
const newScheduleListQueryParams = Object.assign(scheduleListQueryParams, params, { const newScheduleListQueryParams = Object.assign(scheduleListQueryParams, {
school_id: sid, school_id: sid,
course_id: classDetail.course_id, course_id: classDetail.course_id,
class_id: classId, class_id: classId,
start_time: showWeekDayObj.weekFirstDay, start_time: showWeekDayObj.weekFirstDay,
end_time: showWeekDayObj.weekLastDay, end_time: showWeekDayObj.weekLastDay,
sort_type: 1, sort_type: 1,
}); }, params);
const queryScheduleListData = yield call(schedulemgtAjax.scheduleList, newScheduleListQueryParams); const queryScheduleListData = yield call(schedulemgtAjax.scheduleList, newScheduleListQueryParams);
if (action != 'init') { if (action != 'init') {
setTimeout(loading); setTimeout(loading);
...@@ -841,7 +841,6 @@ export default { ...@@ -841,7 +841,6 @@ export default {
}, },
* tabChange({ payload }, { call, put, select }) { * tabChange({ payload }, { call, put, select }) {
const { tab } = payload; const { tab } = payload;
console.log(tab, 'tabtabtabtabtab');
yield put({ yield put({
type: 'updateState', type: 'updateState',
payload: { payload: {
......
src/pages/classdetail/index.js
View file @ 24e3717f
import { connect } from 'dva'; import { connect } from 'dva';
import React from 'react'; import React from 'react';
import { message, Icon, Button, Row, Col, Input, Select, Table, Tabs, Form, Modal, Radio, Pagination, Tooltip } from 'antd'; import { message, Icon, Button, Row, Col, Input, Select, Table, Tabs, Form, Modal, Radio, Pagination, Tooltip, DatePicker } from 'antd';
import moment from 'moment';
import EditClassModal from '../classmgt/EditClassModal'; import EditClassModal from '../classmgt/EditClassModal';
import ClassRoomMgt from '../classmgt/classRoomMgt'; import ClassRoomMgt from '../classmgt/classRoomMgt';
import AddCourseTime from './AddCourseTime'; import AddCourseTime from './AddCourseTime';
...@@ -19,6 +20,7 @@ const { Option } = Select; ...@@ -19,6 +20,7 @@ const { Option } = Select;
const { TextArea } = Input; const { TextArea } = Input;
const FormItem = Form.Item; const FormItem = Form.Item;
const { Group } = Radio; const { Group } = Radio;
const { RangePicker } = DatePicker;
class ClassDetailForm extends React.Component { class ClassDetailForm extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
...@@ -980,6 +982,18 @@ class ClassDetailForm extends React.Component { ...@@ -980,6 +982,18 @@ class ClassDetailForm extends React.Component {
}, },
}); });
} }
onRangePickerChange = (dates, dateStrings) => {
const { dispatch } = this.props;
dispatch({
type: 'classdetail/queryScheduleList',
payload: {
params: {
start_time: dateStrings[0],
end_time: dateStrings[1],
},
},
});
}
render() { render() {
const { getFieldDecorator } = this.props.form; const { getFieldDecorator } = this.props.form;
const { const {
...@@ -1666,6 +1680,17 @@ class ClassDetailForm extends React.Component { ...@@ -1666,6 +1680,17 @@ class ClassDetailForm extends React.Component {
<Button icon="left" style={{ marginRight: '15px' }} onClick={() => this.searchSchedule('pre')}>上周</Button> <Button icon="left" style={{ marginRight: '15px' }} onClick={() => this.searchSchedule('pre')}>上周</Button>
<Button style={{ marginRight: '15px' }} onClick={() => this.searchSchedule('current')}>本周</Button> <Button style={{ marginRight: '15px' }} onClick={() => this.searchSchedule('current')}>本周</Button>
<Button icon="right" style={{ marginRight: '40px' }} onClick={() => this.searchSchedule('next')}>下周</Button> <Button icon="right" style={{ marginRight: '40px' }} onClick={() => this.searchSchedule('next')}>下周</Button>
<span>自定义：</span>
<RangePicker
format="YYYY-MM-DD"
ranges={{
' 最近7天': [moment().subtract(6, 'days'), moment()],
' 最近三十天 ': [moment().subtract(29, 'days'), moment()],
}}
onChange={this.onRangePickerChange}
style={{ width: 280, marginRight: 15 }}
value={[moment(scheduleListQueryParams.start_time, 'YYYY-MM-DD'), moment(scheduleListQueryParams.end_time, 'YYYY-MM-DD')]}
/>
{hasBtnPower('sjd/classdetail', 'noPlanCallStudent') && <Button className={pageStyle.resetcourse} type="primary" onClick={this.toQuickCallStudents}>未排课直接点名</Button>} {hasBtnPower('sjd/classdetail', 'noPlanCallStudent') && <Button className={pageStyle.resetcourse} type="primary" onClick={this.toQuickCallStudents}>未排课直接点名</Button>}
</Col> </Col>
</Row> </Row>
......
src/pages/classmgt/index.less
View file @ 24e3717f
@import '../../less/variables.less'; @import '../../less/variables.less';
.container { .container {
background-color: #fff; background-color: #fff;
border-radius: 6px;
} }
.headerbox { .headerbox {
padding: 19px 0 34px 16px; padding: 19px 0 34px 16px;
......
src/pages/course/index.less
View file @ 24e3717f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.container { .container {
background-color: #fff; background-color: #fff;
padding-bottom: 30px; padding-bottom: 30px;
border-radius: 6px;
} }
.headerbox { .headerbox {
padding: 30px 0 0 34px; padding: 30px 0 0 34px;
......
src/pages/index/StudentLeaveModal.js
View file @ 24e3717f
...@@ -151,7 +151,7 @@ class StudentLeaveModal extends React.Component { ...@@ -151,7 +151,7 @@ class StudentLeaveModal extends React.Component {
render: (text, record) => { render: (text, record) => {
return ( return (
<div> <div>
<span>{text}</span> <br /> <span>{record.schedule && record.schedule.class.title}</span> <br />
<span> <span>
{ {
record.schedule ? record.schedule ?
......
src/pages/index/StudentLeaveModal.less
View file @ 24e3717f
.tableBox { .tableBox {
margin-top: 35px; margin-top: 24px;
} }
.typeColor { .typeColor {
.typeColor1,.typeColor2,.typeColor3,.typeColor4 { .typeColor1,.typeColor2,.typeColor3,.typeColor4 {
...@@ -12,18 +12,18 @@ ...@@ -12,18 +12,18 @@
} }
} }
.typeColor1 { .typeColor1 {
color: #FF3B3B; color: #00ADFC;
background:rgba(255,59,59,0.1); background:rgba(0,173,252,0.1);
} }
.typeColor2 { .typeColor2 {
color: #2194FF; color: #2DBD5B;
background:rgba(33,148,255,0.1); background:rgba(45,189,91,0.1);
} }
.typeColor3 { .typeColor3 {
color: #929292; color: #FF3B3B;
background:rgba(233,233,233,0.9); background:rgba(255,59,59,0.1);
} }
.typeColor4 { .typeColor4 {
color: #FFAD1F; color: #929292;
background:rgba(255,209,68,0.1); background:rgba(233,233,233,0.9);
} }
src/pages/institutions/index.less
View file @ 24e3717f
.container{ .container{
background: #fff; background: #fff;
border-radius: 6px;
} }
.title{ .title{
font-size:16px; font-size:16px;
...@@ -55,4 +56,4 @@ ...@@ -55,4 +56,4 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
} }
\ No newline at end of file
src/pages/integralmanage/index.less
View file @ 24e3717f
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
padding: 12px 20px 24px 20px; padding: 12px 20px 24px 20px;
position: relative; position: relative;
overflow-y: hidden; overflow-y: hidden;
border-radius: 6px;
} }
src/pages/officialweb/index.less
View file @ 24e3717f
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
display: flex; display: flex;
position: relative; position: relative;
overflow-y: hidden; overflow-y: hidden;
border-radius: 6px;
} }
.mobilecontainer { .mobilecontainer {
width: 375px; width: 375px;
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
// cursor: move; // cursor: move;
cursor: pointer; cursor: pointer;
border: 1px dashed transparent; border: 1px dashed transparent;
} }
.ContentBox.moduleSelect { .ContentBox.moduleSelect {
border:1px solid rgba(25,181,254,1); border:1px solid rgba(25,181,254,1);
...@@ -137,4 +138,4 @@ ...@@ -137,4 +138,4 @@
left: 0; left: 0;
z-index: 2; z-index: 2;
cursor: pointer; cursor: pointer;
} }
\ No newline at end of file
src/pages/studentinfo/index.js
View file @ 24e3717f
...@@ -258,7 +258,6 @@ class StudentMgt extends React.Component { ...@@ -258,7 +258,6 @@ class StudentMgt extends React.Component {
} }
renewCourse = (values) => { renewCourse = (values) => {
const { dispatch } = this.props; const { dispatch } = this.props;
console.log(values, 'values');
dispatch({ dispatch({
type: 'studentsinfo/studentModelCoursesBuyOrRenew', type: 'studentsinfo/studentModelCoursesBuyOrRenew',
payload: { payload: {
......
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