Commit ff106f3e by chenshu

fix:修复管理端部分问题

parent a452512d
......@@ -1090,7 +1090,11 @@ class AddOfflineCourse extends React.Component {
style={{ width: 72, marginRight: 4 }}
value={signInTimeUnit}
onChange={(value) => {
this.setState({ signInTimeUnit: value });
const data = { signInTimeUnit: value }
if (value === 'HOUR' && signInTimeNum > 24) {
data.signInTimeNum = 24;
}
this.setState(data);
}}
>
{unitList.map(item => (
......@@ -1153,7 +1157,11 @@ class AddOfflineCourse extends React.Component {
style={{ width: 72, marginRight: 4 }}
value={signOutStartTimeUnit}
onChange={(value) => {
this.setState({ signOutStartTimeUnit: value });
const data = { signOutStartTimeUnit: value }
if (value === 'HOUR' && signOutStartTimeNum > 24) {
data.signOutStartTimeNum = 24;
}
this.setState(data);
}}
>
{unitList.map(item => (
......@@ -1174,7 +1182,11 @@ class AddOfflineCourse extends React.Component {
style={{ width: 72, marginRight: 4 }}
value={signOutEndTimeUnit}
onChange={(value) => {
this.setState({ signOutEndTimeUnit: value });
const data = { signOutEndTimeUnit: value }
if (value === 'HOUR' && signOutEndTimeNum > 24) {
data.signOutEndTimeNum = 24;
}
this.setState(data);
}}
>
{unitList.map(item => (
......
......@@ -57,6 +57,9 @@ export default class OfflineCourseData extends React.Component {
totalJoin: result.totalJoin || 0,
calendarTime,
currentDate,
offlineCourseType: result.offlineCourseType,
whetherSetSignInOut: result.whetherSetSignInOut,
whetherSetApply: result.whetherSetApply,
}, () => this.getDateDetail());
}
})
......@@ -157,6 +160,9 @@ export default class OfflineCourseData extends React.Component {
joinInNum,
joinNum,
joinOutNum,
offlineCourseType,
whetherSetApply,
whetherSetSignInOut,
} = this.state;
const calendarLength = calendarTime.length;
const dateList = (calendarTime[currentIndex] || {}).value || [];
......@@ -170,10 +176,10 @@ export default class OfflineCourseData extends React.Component {
/>
<div className="box">
<div className="offline-name">课程名称:{courseName}</div>
<div className="offline-application">报名总人数:{totalJoin}</div>
<div className="offline-application">
{whetherSetApply === 'YES' && <div className="offline-application">报名总人数:{totalJoin}</div>}
{whetherSetSignInOut === 'YES' && <div className="offline-application">
完成考勤总人数<Tooltip title="根据上课日期,在规定时间内完成签到和签退的用户数"><span className="icon iconfont">&#xe7c4;</span></Tooltip>{fullJoin}
</div>
</div>}
</div>
<div className="box data-box">
<div className="left-box">
......@@ -184,7 +190,7 @@ export default class OfflineCourseData extends React.Component {
onClick={() => {
const index = currentIndex - 1;
if (index >= 0 && index < calendarLength) {
this.setState({ currentIndex: index, currentDate: calendarTime[index][0] }, () => {
this.setState({ currentIndex: index, currentDate: calendarTime[index].value[0] }, () => {
this.getDateDetail();
});
}
......@@ -198,7 +204,7 @@ export default class OfflineCourseData extends React.Component {
onClick={() => {
const index = currentIndex + 1;
if (index >= 0 && index < calendarLength) {
this.setState({ currentIndex: index, currentDate: calendarTime[index][0] }, () => {
this.setState({ currentIndex: index, currentDate: calendarTime[index].value[0] }, () => {
this.getDateDetail();
});
}
......@@ -222,10 +228,10 @@ export default class OfflineCourseData extends React.Component {
</div>
</div>
<div className="right-box">
<div className="selected-date">5月1日</div>
<div className="selected-date">{moment(currentDate).format('MM-DD')}</div>
<div className="detail-data">
<span className="icon iconfont">&#xe89f;</span>
<span className="data-text">报名人数:{joinNum}</span>
{offlineCourseType !== 'ALL_DAY_OFFLINE' && <span className="icon iconfont">&#xe89f;</span>}
{offlineCourseType !== 'ALL_DAY_OFFLINE' && whetherSetApply === 'YES' && <span className="data-text">报名人数:{joinNum}</span>}
<span className="icon iconfont">&#xe89e;</span>
<span className="data-text">完成考勤数<Tooltip title="当日在规定时间内完成签到和签退的用户数"><span className="icon iconfont">&#xe7c4;</span></Tooltip>{fullJoinNum}</span>
<span className="icon iconfont">&#xe8a0;</span>
......
......@@ -72,7 +72,7 @@ class OfflineCourseList extends React.Component {
return (
<div className="record__item">
<img className="course-cover" src={coverUrl || defaultCoverUrl} />
<div>
<div style={{ width: 200 }}>
<Tooltip title={courseName}>
<div className="course-name">{courseName}</div>
</Tooltip>
......
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