wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:2cb35e7480247b50587b1175a4fc32f49c4f3967
Branches Tags
wyw:master
..
compare: wyw:b097f45409eb6e5e61ad315d2c14ec83cf8ec828
Branches Tags
wyw:master

No commits in common. "2cb35e7480247b50587b1175a4fc32f49c4f3967" and "b097f45409eb6e5e61ad315d2c14ec83cf8ec828" have entirely different histories.
2cb35e7480 ... b097f45409

1 changed files with 3 additions and 4 deletions
Show Stats Expand all files Collapse all files

7
src/components/CustomPages/SE/SESafeSurveyTest.js
View File

@ -71,15 +71,14 @@ 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: usr != null ? usr.ID : ret[0].ID SelUsrID: 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
@ -129,7 +128,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',