Skip to content

X
xiaomai-cloud-class-web
Commit b5f05144 by chenshu
Options

fix:修复

parent 3460f93f
Showing with 18 additions and 6 deletions
src/modules/course-manage/offline-course/AddOfflineCourse.jsx
...@@ -860,6 +860,7 @@ class AddOfflineCourse extends React.Component { ...@@ -860,6 +860,7 @@ class AddOfflineCourse extends React.Component {
showSearch showSearch
allowClear allowClear
filterOption={(input, option) => option} filterOption={(input, option) => option}
dropdownClassName="offline-dropdown-box"
onPopupScroll={this.handleScrollTeacherList} onPopupScroll={this.handleScrollTeacherList}
suffixIcon={<span className="icon iconfont" style={{fontSize:'12px',color:'#BFBFBF'}}>&#xe835;</span>} suffixIcon={<span className="icon iconfont" style={{fontSize:'12px',color:'#BFBFBF'}}>&#xe835;</span>}
onChange={(value,option) => { onChange={(value,option) => {
......
src/modules/course-manage/offline-course/AddOfflineCourse.less
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
.course-catalog { .course-catalog {
margin-bottom:16px; margin-bottom:16px;
margin-top:16px; margin-top:16px;
display: flex;
.switch-box { .switch-box {
.switch-item { .switch-item {
display: flex; display: flex;
...@@ -227,4 +228,12 @@ ...@@ -227,4 +228,12 @@
margin-left: 10px; margin-left: 10px;
} }
} }
}
.offline-dropdown-box {
.rc-virtual-list-scrollbar {
display: none;
position: absolute;
left: 20000px;
}
} }
\ No newline at end of file
src/modules/course-manage/offline-course/modal/PreviewOfflineModal.jsx
...@@ -87,17 +87,18 @@ class PreviewOfflineModal extends React.Component { ...@@ -87,17 +87,18 @@ class PreviewOfflineModal extends React.Component {
signOutEndTimeUnit, signOutEndTimeUnit,
} = this.state; } = this.state;
const unit = (signInTimeUnit || '').toLocaleLowerCase() + 's'; const unit = (signInTimeUnit || '').toLocaleLowerCase() + 's';
const time = moment(signInType == 'START_AGO' ? startTime : endTime).subtract(signInTimeNum, unit); const time = (signInType == 'START_AGO' ? startTime : endTime) && moment(signInType == 'START_AGO' ? startTime : endTime).subtract(signInTimeNum, unit);
const signInTime = `${moment(time).format('HH:mm')} ~ ${moment(signInType == 'START_AGO' ? startTime : endTime).format('HH:mm')}`; const signInTime = (time && signInTimeNum) && `${moment(time).format('HH:mm')} ~ ${moment(signInType == 'START_AGO' ? startTime : endTime).format('HH:mm')}`;
const endUnit = (signOutEndTimeUnit || '').toLocaleLowerCase() + 's'; const endUnit = (signOutEndTimeUnit || '').toLocaleLowerCase() + 's';
const end = moment(endTime).add(signOutEndTimeNum, endUnit); const end = (endTime && signOutEndTimeNum) && moment(endTime).add(signOutEndTimeNum, endUnit);
let startUnit = ''; let startUnit = '';
let start = ''; let start = '';
if (signOutType === 'START_LATER') { if (signOutType === 'START_LATER') {
startUnit = (signOutStartTimeUnit || '').toLocaleLowerCase() + 's'; startUnit = (signOutStartTimeUnit || '').toLocaleLowerCase() + 's';
start = moment(startTime).add(signOutStartTimeNum, startUnit); start = (startTime && signOutStartTimeNum) && moment(startTime).add(signOutStartTimeNum, startUnit);
} }
const signOutTime = signOutType === 'START_LATER' ? `${moment(start).format('HH:mm')} ~ ${moment(end).format('HH:mm')}` : `${moment(endTime).format('HH:mm')} ~ ${moment(end).format('HH:mm')}`; console.log(start, end, startTime, endTime, 666666)
const signOutTime = (start || end) && (signOutType === 'START_LATER' ? `${moment(start).format('HH:mm')} ~ ${moment(end).format('HH:mm')}` : `${moment(endTime).format('HH:mm')} ~ ${moment(end).format('HH:mm')}`);
return ( return (
<Modal <Modal
title="预览" title="预览"
...@@ -138,7 +139,7 @@ class PreviewOfflineModal extends React.Component { ...@@ -138,7 +139,7 @@ class PreviewOfflineModal extends React.Component {
<div className="container__introduction__list editor-box"> <div className="container__introduction__list editor-box">
{whetherSetApply === 'YES' && <div className="course-time"> {whetherSetApply === 'YES' && <div className="course-time">
<div className="time-title">报名时间</div> <div className="time-title">报名时间</div>
<div className="time-text">{moment(startTimeApply).format('MM-DD HH:mm')} ~ {moment(endTimeApply).format('MM-DD HH:mm')}</div> <div className="time-text">{startTimeApply && moment(startTimeApply).format('MM-DD HH:mm')} ~ {endTimeApply && moment(endTimeApply).format('MM-DD HH:mm')}</div>
</div>} </div>}
{(whetherSetSignIn === 'YES' || whetherSetSignOut === 'YES') && <div className="course-time"> {(whetherSetSignIn === 'YES' || whetherSetSignOut === 'YES') && <div className="course-time">
<div className="time-title">考勤时间</div> <div className="time-title">考勤时间</div>
......
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