Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

courseware
杨树明 5 years ago
commit c0c6556a68

@ -361,10 +361,11 @@ class VideoIndex extends Component {
{ {
videoId ? videoId ?
"" ""
: :videos&&videos.length>0?
<WordsBtn style="blue" className="ml30 font-16 tongjis" <WordsBtn style="blue" className="ml30 font-16 tongjis"
onClick={() => this.statisticsy(true)} onClick={() => this.statisticsy(true)}
><i className="iconfont icon-tongji1 mr5 font-14"></i></WordsBtn> ><i className="iconfont icon-tongji1 mr5 font-14"></i></WordsBtn>
:""
} }
</span> </span>

@ -336,11 +336,11 @@ class Signedinlist extends Component {
<Row type="flex" justify="end"> <Row type="flex" justify="end">
{this.props.defaultActiveKey==="2"?<Col className={"Signedintextright "}> {this.props.defaultActiveKey==="2"?<Col className={"Signedintextright mr5"}>
<span className={"color26C7C9 mr20"}>正常签到{data&&data.normal_count}</span> <span className={"color26C7C9 mr20"}>正常签到{data&&data.normal_count}</span>
<span className={"colorEAAE4E mr20"}>请假{data&&data.leave_count}</span> <span className={"colorEAAE4E mr20"}>请假{data&&data.leave_count}</span>
<span className={"colorFF835C"}>旷课{data&&data.absence_count}</span> <span className={"colorFF835C"}>旷课{data&&data.absence_count}</span>
</Col>:<Col className={"Signedintextright "}> </Col>:<Col className={"Signedintextright mr5"}>
<span className={"mr20"}>已签到<span className={"color1890FF"}>{this.state.course_members_count}</span></span> <span className={"mr20"}>已签到<span className={"color1890FF"}>{this.state.course_members_count}</span></span>
<span>应签到<span className={"color1890FF"}>{this.state.attendance_count}</span></span> <span>应签到<span className={"color1890FF"}>{this.state.attendance_count}</span></span>
</Col>} </Col>}

Loading…
Cancel
Save