Skip to content

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

优化

parent b5bf2d9e
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 13 deletions
index.html
View file @ a4040ecd
......@@ -17,6 +17,6 @@
</head>
<body>
<div id="root"></div>
<script src="dist/main.js?1576059303826" charset="utf-8"></script>
<script src="dist/main.js?1576311500361" charset="utf-8"></script>
</body>
</html>
\ No newline at end of file
src/components/PlanCourse.js
View file @ a4040ecd
......@@ -346,7 +346,7 @@ class classRoomMgt extends React.Component {
<Col span={13}>
{getFieldDecorator('times', {
rules: [{ required: true, message: '上课时间不能为空' }],
initialValue: datePlanDetail.times.length > 0 ? datePlanDetail.times : ['10:00-11:00'],
initialValue: rulePlanDetail.times,
})(
<Select mode="multiple" placeholder="请选择上课时间">
{timeArr.map(ele => <Option key={ele.id} value={`${ele.start_time}-${ele.end_time}`}>{`${ele.start_time}-${ele.end_time}`}</Option>)}
......
src/models/callstudents.js
View file @ a4040ecd
......@@ -469,19 +469,20 @@ export default {
* studentCallTypeChange({ payload }, { call, put, select }) {
const {
callStudentOperateList, rule_leave, rule_absent, expend, classDetail,
copyExpend,
} = yield select(state => state.callstudents);
console.log(expend, 'expend');
console.log(copyExpend, 'copyExpend');
const { value, index } = payload;
if (value == 1 || value == 2) {
callStudentOperateList[index].expend = expend;
}
if (rule_leave == 1 && value == 3) { // 选中请假 并且请假扣课时
callStudentOperateList[index].expend = expend;
callStudentOperateList[index].expend = copyExpend;
} else if (rule_leave == 2 && value == 3) {
callStudentOperateList[index].expend = 0;
}
if (rule_absent == 1 && value == 4) { // 选中旷课 并且旷课扣课时
callStudentOperateList[index].expend = expend;
callStudentOperateList[index].expend = copyExpend;
} else if (rule_leave == 2 && value == 3) {
callStudentOperateList[index].expend = 0;
}
......
src/models/createtheme.js
View file @ a4040ecd
......@@ -373,7 +373,6 @@ export default {
if (callBack && (typeof callBack == 'function')) {
callBack();
}
console.log(data, 'daddddd');
if ((newParams.id != undefined) && newParams.id !== 0) {
yield delay(500);
yield put(routerRedux.goBack());
......
src/models/plancourse.js
View file @ a4040ecd
......@@ -25,7 +25,7 @@ export default {
rulePlanDetail: {
class_id: '',
class_room_id: '',
times: [],
times: ['10:00-11:00'],
content: '',
type: 1,
start_date: '',
......@@ -385,7 +385,7 @@ export default {
rulePlanDetail: {
class_id: '',
class_room_id: '',
times: [],
times: ['10:00-11:00'],
content: '',
type: 1,
start_date: '',
......
src/models/thememgt.js
View file @ a4040ecd
......@@ -96,7 +96,6 @@ export default {
},
* getCode({ payload }, { call, put, select }) {
const { record } = payload;
console.log(record, 'record');
const loading = message.loading('小程序码生成中,请稍等...', 0);
let params;
switch (record.subject_type) {
......
src/pages/classmgt/WxPushTimeModal.js
View file @ a4040ecd
......@@ -200,8 +200,12 @@ class WxPushTimeModal extends React.Component {
message: '请输入正整数',
pattern: new RegExp(/^[1-9]\d*$/, 'g'),
},
{
max: 2,
message: '课时数不能超过99',
},
],
})(<InputNumber disabled={!getFieldValue('renew_remind')} min={0} max={99} />)}
})(<Input style={{ width: 90, marginRight: 5 }} disabled={!getFieldValue('renew_remind')} min={0} />)}
<span className="ant-form-text">时(天)，推送续费通知</span>
</FormItem>
<FormItem className={pageStyle.firstItem} {...formItemModalLineLayout} extra="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;设置后将同步首页续费提醒课时数 ">
......@@ -214,8 +218,12 @@ class WxPushTimeModal extends React.Component {
message: '请输入正整数',
pattern: new RegExp(/^[1-9]\d*$/, 'g'),
},
{
max: 2,
message: '课时数不能超过99',
},
],
})(<InputNumber disabled={!getFieldValue('renew_remind')} min={0} max={99} />)}
})(<Input style={{ width: 90, marginRight: 5 }} disabled={!getFieldValue('renew_remind')} min={0} max={99} />)}
<span className="ant-form-text">时(天)，推送续费通知</span>
</FormItem>
</Form>
......
src/pages/index/index.js
View file @ a4040ecd
......@@ -961,7 +961,7 @@ class StaticCenter extends React.Component {
/>
<div className={pageStyle.topbox}>
<Row gutter={24}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} lg={{ span: 16 }} md={{ span: 24 }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} lg={{ span: 24 }} xl={{ span: 16 }} md={{ span: 24 }}>
<div className={pageStyle.staticcard}>
<div className={pageStyle.cardtitle}>
<span>机构数据</span>
......@@ -1005,7 +1005,7 @@ class StaticCenter extends React.Component {
</div>
</div>
</Col>
<Col xs={{ span: 24 }} sm={{ span: 24 }} lg={{ span: 8 }} md={{ span: 24 }} style={{ paddingLeft: 2 }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} lg={{ span: 24 }} xl={{ span: 8 }} md={{ span: 24 }}>
<div className={pageStyle.makebox}>
<div className={pageStyle.cardtitle}>
<span>工作台</span>
......
src/pages/index/index.less
View file @ a4040ecd
......@@ -391,3 +391,13 @@
}
}
}
@media screen and (min-width: 1200px) and (max-width: 1920px) {
.topbox {
:global {
.ant-col-xl-8 {
padding-left: 2px !important;
}
}
}
}
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