m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整

Browse Source
dev_forum
杨树林 5 years ago
parent 01f19b9bcf
commit 41fd8013cb
7 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File

26
public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
Unescape View File

@ -206,18 +206,14 @@ class Testpapersettinghomepage extends Component{
Loadtype:false Loadtype:false
}) })
} }
// DownloadType=()=>{ gotohome=()=>{
// this.setState({ let courseId=this.props.match.params.coursesId;
// DownloadType:false, if(courseId===undefined){
// DownloadMessageval:undefined this.props.history.push("/courses");
// }) }else{
// } this.props.history.push(this.props.current_user.first_category_url);
// Downloadcal=()=>{ }
// this.setState({ }
// DownloadType:false,
// DownloadMessageval:undefined
// })
// }
render(){ render(){
let {tab,visible,Commonheadofthetestpaper}=this.state; let {tab,visible,Commonheadofthetestpaper}=this.state;
const isAdmin =this.props.isAdmin(); const isAdmin =this.props.isAdmin();
@ -251,7 +247,7 @@ class Testpapersettinghomepage extends Component{
<div className="educontent mb20" style={{width:"1200px"}}> <div className="educontent mb20" style={{width:"1200px"}}>
<p className="clearfix mb20 mt10"> <p className="clearfix mb20 mt10">
<ActionBtn className=" btn colorgrey fl hovercolorblue " to={`/courses/${this.props.match.params.coursesId}/students}`}>{this.props.coursedata.name}</ActionBtn> <ActionBtn className=" btn colorgrey fl hovercolorblue " onClick={()=>this.gotohome()}>{this.props.coursedata.name}</ActionBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<ActionBtn className=" btn colorgrey fl hovercolorblue " to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`} >试卷</ActionBtn> <ActionBtn className=" btn colorgrey fl hovercolorblue " to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`} >试卷</ActionBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@ -274,9 +270,7 @@ class Testpapersettinghomepage extends Component{
<CoursesListType <CoursesListType
typelist={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]} typelist={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}
/> />
<a className="color-grey-6 fr font-16 summaryname mr30" <a className="color-grey-6 fr font-16 summaryname mr30" onClick={()=>this.gotohome()}>返回</a>
href={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`}>返回</a>
<p className="color-grey-6 fr font-16"> </p> <p className="color-grey-6 fr font-16"> </p>
</div> </div>

15
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -111,7 +111,14 @@ class ShixunHomeworkPage extends Component {
bindRef = ref => { this.child = ref } bindRef = ref => { this.child = ref }
///////////////教师截止 ///////////////教师截止
gotohome=()=>{
let courseId=this.props.match.params.coursesId;
if(courseId===undefined){
this.props.history.push("/courses");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
}
render() { render() {
let {tab, teacherdatapage, jobsettingsdatapage} = this.state; let {tab, teacherdatapage, jobsettingsdatapage} = this.state;
@ -125,8 +132,7 @@ class ShixunHomeworkPage extends Component {
<div className="educontent mb20"> <div className="educontent mb20">
<p className="clearfix mb20 mt10"> <p className="clearfix mb20 mt10">
<ActionBtn className=" btn colorgrey fl hovercolorblue " <ActionBtn className=" btn colorgrey fl hovercolorblue " onClick{()=>this.gotohome()}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</ActionBtn>
to={`/courses/${this.props.match.params.coursesId}/students`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</ActionBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<ActionBtn <ActionBtn
className=" btn colorgrey fl hovercolorblue " className=" btn colorgrey fl hovercolorblue "
@ -142,8 +148,7 @@ class ShixunHomeworkPage extends Component {
<CoursesListType <CoursesListType
typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status} typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
/> />
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" <a className="color-grey-9 fr font-16 summaryname ml20 mr20" onClick{()=>this.gotohome()}>返回</a>
href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>返回</a>
<a className="color-grey-9 fr font-16 mr20" <a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`} href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a> target={"_blank"}>实训详情</a>

5
public/react/src/modules/login/EducoderLogin.js
Unescape View File

@ -120,6 +120,9 @@ class EducoderLogin extends Component {
}) })
} }
gohome=()=>{
window.location.href="/"
}
Setshowbool = (e,name,pass) => { Setshowbool = (e,name,pass) => {
if (e===1) { if (e===1) {
this.setState({ this.setState({
@ -146,7 +149,7 @@ class EducoderLogin extends Component {
"width": "100%" "width": "100%"
}}> }}>
<div > <div >
<img src={educodernet}/> <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
</div> </div>

2
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -708,7 +708,7 @@ submittojoinclass=(value)=>{
onInput={()=>this.onKeywordSearchKeyDowns()} onInput={()=>this.onKeywordSearchKeyDowns()}
onSearch={(value) => this.onKeywordSearchKeyDown(value)} onSearch={(value) => this.onKeywordSearchKeyDown(value)}
// onPressEnter={this.onKeywordSearchKeyDown} // onPressEnter={this.onKeywordSearchKeyDown}
style={{ width: 300 }} style={{ width: 300,height:32}}
autoFocus={true} autoFocus={true}
/> />
</div>:""} </div>:""}

9
public/react/src/modules/user/FindPasswordComponent.js
Unescape View File

@ -12,6 +12,7 @@ import ReadPassword from './ReadPassword';
import axios from 'axios'; import axios from 'axios';
import './common.css' import './common.css'
import './commontwo.css'
const TabPane = Tabs.TabPane const TabPane = Tabs.TabPane
const loginInputsyl = { const loginInputsyl = {
@ -27,7 +28,7 @@ class LoginRegisterComponent extends Component {
login: "", login: "",
password: "", password: "",
passwords: "", passwords: "",
seconds: 35, seconds: 60,
codes: "", codes: "",
getverificationcodes: true, getverificationcodes: true,
Phonenumberisnotcobool: false, Phonenumberisnotcobool: false,
@ -126,7 +127,7 @@ class LoginRegisterComponent extends Component {
clearInterval(timer); clearInterval(timer);
this.setState({ this.setState({
getverificationcodes: false, getverificationcodes: false,
seconds: 35, seconds: 60,
}) })
} }
}); });
@ -144,7 +145,7 @@ class LoginRegisterComponent extends Component {
clearInterval(timer); clearInterval(timer);
this.setState({ this.setState({
getverificationcodes: false, getverificationcodes: false,
seconds: 35, seconds: 60,
}) })
} }
@ -600,6 +601,7 @@ class LoginRegisterComponent extends Component {
height={38} successGreenColor="#29bd8b" height={38} successGreenColor="#29bd8b"
style={{height: "38px", width: "100%"}} style={{height: "38px", width: "100%"}}
dragOkCallback={()=>this.dragOkCallback()} dragOkCallback={()=>this.dragOkCallback()}
className="ysllw100"
></DragValidator> ></DragValidator>
: :
"" ""
@ -611,6 +613,7 @@ class LoginRegisterComponent extends Component {
height={38} successGreenColor="#29bd8b" height={38} successGreenColor="#29bd8b"
style={{height: "38px", width: "100%"}} style={{height: "38px", width: "100%"}}
dragOkCallback={()=>this.dragOkCallback()} dragOkCallback={()=>this.dragOkCallback()}
className="ysllw100"
></DragValidatortwo> ></DragValidatortwo>
: :
"" ""

19
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -9,6 +9,7 @@ import passoff from '../../../src/images/login/passoff.png';
import axios from 'axios'; import axios from 'axios';
import DragValidatortwo from '../../../src/common/components/DragValidatortwo' import DragValidatortwo from '../../../src/common/components/DragValidatortwo'
import './common.css' import './common.css'
import './commontwo.css'
const { TabPane } = Tabs; const { TabPane } = Tabs;
const loginInputsyl = { const loginInputsyl = {
"width":"434px", "width":"434px",
@ -36,7 +37,7 @@ class LoginRegisterComponent extends Component {
classpass: "text", classpass: "text",
// 登录 // 登录
passopens: passoff, passopens: passoff,
seconds: 35, seconds: 60,
discodeBtn: false, discodeBtn: false,
clearInterval: false, clearInterval: false,
autoLogin: true, autoLogin: true,
@ -71,7 +72,7 @@ class LoginRegisterComponent extends Component {
classpass: "text", classpass: "text",
// 登录 // 登录
passopens: passoff, passopens: passoff,
seconds: 35, seconds: 60,
discodeBtn: false, discodeBtn: false,
clearInterval: false, clearInterval: false,
autoLogin: true, autoLogin: true,
@ -528,7 +529,7 @@ class LoginRegisterComponent extends Component {
clearInterval(timer); clearInterval(timer);
this.setState({ this.setState({
getverificationcodes: false, getverificationcodes: false,
seconds: 35, seconds: 60,
}) })
} }
}); });
@ -546,7 +547,7 @@ class LoginRegisterComponent extends Component {
clearInterval(timer); clearInterval(timer);
this.setState({ this.setState({
getverificationcodes: false, getverificationcodes: false,
seconds: 35, seconds: 60,
}) })
} }
@ -718,7 +719,7 @@ class LoginRegisterComponent extends Component {
console.log(classpass); console.log(classpass);
return ( return (
<div className="login_register_content login_register_contents" style={ parseInt(tab[0])==0?{height: "346px"} :{height: "490px"}}> <div className="login_register_content login_register_contents" style={ parseInt(tab[0])==0?{height: "366px"} :{height: "510px"}}>
<style> <style>
{ {
` `
@ -731,7 +732,7 @@ class LoginRegisterComponent extends Component {
</style> </style>
<div> <div>
<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}> <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
<Menu.Item key="0" className={tab===0?"active font-18":"font-18"} > 登录</Menu.Item> <Menu.Item key="0" className={tab===0?"active font-18":"font-18"} > 登录</Menu.Item>
<Menu.Item key="1" className={tab===1?"active font-18":"font-18"} >注册</Menu.Item> <Menu.Item key="1" className={tab===1?"active font-18":"font-18"} >注册</Menu.Item>
</Menu> </Menu>
@ -839,8 +840,9 @@ class LoginRegisterComponent extends Component {
Whethertoverify===false&&pciphone===true? Whethertoverify===false&&pciphone===true?
<DragValidator <DragValidator
height={38} successGreenColor="#29bd8b" height={38} successGreenColor="#29bd8b"
style={{ height: '38px'}} style={{ height: '38px',width: "100%"}}
dragOkCallback={this.dragOkCallback} dragOkCallback={this.dragOkCallback}
className="ysllw100"
></DragValidator> ></DragValidator>
: :
"" ""
@ -850,8 +852,9 @@ class LoginRegisterComponent extends Component {
Whethertoverify===true&&pciphone===true? Whethertoverify===true&&pciphone===true?
<DragValidatortwo <DragValidatortwo
height={38} successGreenColor="#29bd8b" height={38} successGreenColor="#29bd8b"
style={{ height: '38px'}} style={{ height: '38px',width: "100%"}}
dragOkCallback={this.dragOkCallback} dragOkCallback={this.dragOkCallback}
className="ysllw100"
></DragValidatortwo> ></DragValidatortwo>
: :
"" ""

3
public/react/src/modules/user/commontwo.css
Unescape View File

@ -271,3 +271,6 @@
width: 100px; width: 100px;
margin: 0 auto; margin: 0 auto;
} }
.ysllw100{
width: 100%;
}
Write Preview
Loading…
Cancel
Save