Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web
This commit is contained in:
commit
5b0b309aab
@ -71,14 +71,15 @@ class SESafeSurveyTest extends React.Component {
|
|||||||
this.setState({
|
this.setState({
|
||||||
UserList: ret
|
UserList: ret
|
||||||
})
|
})
|
||||||
|
let usr = ret.find(it => it.ID === this.props.login.user.ID);
|
||||||
if (this.state.viewAll) {
|
if (this.state.viewAll) {
|
||||||
|
//如果有自己 先看自己
|
||||||
this.setState({
|
this.setState({
|
||||||
SelUsrID: ret[0].ID
|
SelUsrID: usr != null ? usr.ID : ret[0].ID
|
||||||
}, () => {
|
}, () => {
|
||||||
this.getPapers();
|
this.getPapers();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
let usr = ret.find(it => it.ID === this.props.login.user.ID);
|
|
||||||
if (usr) {
|
if (usr) {
|
||||||
this.setState({
|
this.setState({
|
||||||
SelUsrID: usr.ID
|
SelUsrID: usr.ID
|
||||||
@ -128,7 +129,7 @@ class SESafeSurveyTest extends React.Component {
|
|||||||
NAME = ret.Nav_Papers[0].Nav_Safe.NAME;
|
NAME = ret.Nav_Papers[0].Nav_Safe.NAME;
|
||||||
END_TIME = ret.Nav_Papers[0].Nav_Safe.END_TIME;
|
END_TIME = ret.Nav_Papers[0].Nav_Safe.END_TIME;
|
||||||
}
|
}
|
||||||
if (moment().format("YYYY-MM-DD HH:mm:ss") > END_TIME&&this.props.data.tableKey != undefined) {
|
if (moment().format("YYYY-MM-DD HH:mm:ss") > END_TIME && this.props.data.tableKey != undefined) {
|
||||||
message.error('已过答题截止时间!');
|
message.error('已过答题截止时间!');
|
||||||
this.props.dispatch({
|
this.props.dispatch({
|
||||||
type: 'app/getDataByPost',
|
type: 'app/getDataByPost',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user