diff --git a/public/react/package.json b/public/react/package.json index 5bc10f627..e43132877 100644 --- a/public/react/package.json +++ b/public/react/package.json @@ -77,6 +77,7 @@ "react-redux": "5.0.7", "react-router": "^4.2.0", "react-router-dom": "^4.2.2", + "react-split-pane": "^0.1.87", "react-url-query": "^1.4.0", "redux": "^4.0.0", "redux-thunk": "2.3.0", diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js index a379f2607..218e8497f 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js @@ -17,7 +17,14 @@ class CompetitionContentspdf extends Component{ componentDidMount(){ window.document.title = '竞赛'; - + let query=this.props.location&&this.props.location.search; + const types = query.split('user_id=') + if(types[1]===undefined){ + }else{ + this.setState({ + Tabskey:"2" + }) + } } Competitioncallback=(key)=>{ @@ -54,4 +61,4 @@ class CompetitionContentspdf extends Component{ ) } } -export default CompetitionContentspdf; \ No newline at end of file +export default CompetitionContentspdf; diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index aa550c0c5..8640b115c 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -340,7 +340,11 @@ class CompetitionContentspdfpeopledata extends Component { render() { - const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state + const admins=this.props.user.admin; + if(admins===undefined||admins===null) { + admins === false; + } + const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state return (
{this.state.certification === 1 ? @@ -528,7 +532,19 @@ class CompetitionContentspdfpeopledata extends Component { }
- : "" + : +
+ { + admins===true? + this.hideUpdating(i)} + getdata={() => this.getdata()} + GetawardinformationAPI={() => this.GetawardinformationAPI()} + bank_account={this.state.bank_account} + > + :"" + } +
} diff --git a/public/react/src/modules/page/main/CodeRepositoryView.js b/public/react/src/modules/page/main/CodeRepositoryView.js index bae058dcd..cd44940d9 100644 --- a/public/react/src/modules/page/main/CodeRepositoryView.js +++ b/public/react/src/modules/page/main/CodeRepositoryView.js @@ -222,8 +222,10 @@ class CodeRepositoryView extends Component { const { game_id, host, password, port, username, webssh_url} = response.data // js_min_all.js有同样的计算逻辑,用来拖拽时计算ssh高宽 // TODO 结合new Terminal 时的fontSize参数来定高度 - var h = $("#games_repository_contents").height() - 50; - var w = $("#games_repository_contents").width(); + const gameCtx = $("#games_repository_contents"); + gameCtx.css({'padding-bottom': '50px', 'background': '#000'}); + var h = gameCtx.height() - 50; + var w = gameCtx.width(); var line_h = (navigator.userAgent.indexOf('Chrome') >= 0 ? 18 : 19); var rows = Math.round(h / line_h); var cols = parseInt(w / 9.9); @@ -233,14 +235,13 @@ class CodeRepositoryView extends Component { response.data.line_h = line_h; response.data.rows = rows; response.data.cols = cols; - // https://stackoverflow.com/questions/5645485/detect-mousemove-when-over-an-iframe // this.loadSshInIframe( response.data, tabIndex ) this.loadSshNormal(response.data, tabIndex, isReInit) } - console.log(response) + // console.log(response) }).catch((error) => { console.log(error) }) @@ -542,13 +543,13 @@ class CodeRepositoryView extends Component { {/* { tabIndex === STABLE_SSH_TAB_ID && this.state.sshData && } */}
+ style={ { color: '#fff', display: tabIndex === 82 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '50px' } }>
+ style={ { color: '#fff', display: tabIndex === 83 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '50px'} }>
+ style={ { color: '#fff', display: tabIndex === 84 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '50px'} }>