dev_forum
杨树明 5 years ago
parent 8bc80f741b
commit 8ff9699c80

@ -825,7 +825,7 @@ class Coursesleftnav extends Component{
{ is_teacher===true? { is_teacher===true?
course_modules===undefined?"":course_modules.map((item,key)=>{ course_modules===undefined?"":course_modules.map((item,key)=>{
return( return(
<div key={key} > <div key={key} title={item.name.length<6?"":item.name}>
<a> <a>
<li onClick={(e)=>this.showsandians(e,key,item.category_url,1)} className={this.props.mainurl===item.category_url&&key===this.props.indexs?"liactive":"clearfix active"} onMouseLeave={(e)=>this.hidesandian(e,key)} onMouseEnter={(e)=>this.showsandian(e,key)}> <li onClick={(e)=>this.showsandians(e,key,item.category_url,1)} className={this.props.mainurl===item.category_url&&key===this.props.indexs?"liactive":"clearfix active"} onMouseLeave={(e)=>this.hidesandian(e,key)} onMouseEnter={(e)=>this.showsandian(e,key)}>
<a onClick={(e)=>this.showsandians(e,key,item.category_url,1)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}> <a onClick={(e)=>this.showsandians(e,key,item.category_url,1)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
@ -844,7 +844,6 @@ class Coursesleftnav extends Component{
{/*||this.props.location.pathname===this.state.url&&key===this.state.indexs*/} {/*||this.props.location.pathname===this.state.url&&key===this.state.indexs*/}
<span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"} <span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"}
title={item.name.length<6?"":item.name}
onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)} onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}
>{item.name}</span> >{item.name}</span>
@ -901,6 +900,7 @@ class Coursesleftnav extends Component{
ref={provided.innerRef} ref={provided.innerRef}
{...provided.draggableProps} {...provided.draggableProps}
{...provided.dragHandleProps} {...provided.dragHandleProps}
title={iem.category_name.length<6?"":iem.category_name}
> >
<a className="fl pl46 pd0 Draggablelichild"> <a className="fl pl46 pd0 Draggablelichild">
@ -940,6 +940,7 @@ class Coursesleftnav extends Component{
<a > <a >
<li className={this.props.mainurl===item.category_url&&key===this.props.indexs?"liactive":"clearfix active"} <li className={this.props.mainurl===item.category_url&&key===this.props.indexs?"liactive":"clearfix active"}
onClick={(e)=>this.setnavid(e,key,item.id,item.type,item.category_url)} onMouseEnter={(e)=>this.showsandian(e,key)} onClick={(e)=>this.setnavid(e,key,item.id,item.type,item.category_url)} onMouseEnter={(e)=>this.showsandian(e,key)}
title={item.name.length<6?"":item.name}
> >
<a className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}> <a className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
{ {
@ -977,7 +978,7 @@ class Coursesleftnav extends Component{
} }
return( return(
<a > <a >
<li className="clearfix Draggableli" key={index} style={{ width: '244px'}}> <li className="clearfix Draggableli" key={index} style={{ width: '244px'}} title={iem.category_name.length<6?"":iem.category_name}>
<a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} > <a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} >
{/*<span className="fl ml38 maxwidth155 task-hide">{iem.category_name}</span>*/} {/*<span className="fl ml38 maxwidth155 task-hide">{iem.category_name}</span>*/}

@ -1,75 +1,75 @@
.slider-img-wrapper img { .slider-img-wrapper img {
width: 100%; width: 100%;
border-radius: 15px; /*border-radius: 15px;*/
height: 350px; height: 350px;
} }
.next-slick-list{ .next-slick-list{
width: 100%; width: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
border-radius: 10px; border-radius: 10px;
} }
.user_navlist{ .user_navlist{
margin-left: 40px; margin-left: 40px;
} }
.next-slick-list{ .next-slick-list{
margin-left: 12px; margin-left: 12px;
} }
.black_nav_span{ .black_nav_span{
display: block; display: block;
margin: 0px 20px; margin: 0px 20px;
border-bottom: 1px solid #4B4B4B; border-bottom: 1px solid #4B4B4B;
padding-left: 8px; padding-left: 8px;
color: #FAFAFA; color: #FAFAFA;
} }
.user_navlist_white{ .user_navlist_white{
z-index: 100 !important; z-index: 100 !important;
} }
.next-slick.next-slick-horizontal.next-slick-outer{ .next-slick.next-slick-horizontal.next-slick-outer{
height: 350px; height: 350px;
} }
.black_nav_list li span a{ .black_nav_list li span a{
color:#fff; color:#fff;
} }
.black_nav_list li span a:hover{ .black_nav_list li span a:hover{
color:#000; color:#000;
} }
.black_nav_list li:hover span a{ .black_nav_list li:hover span a{
color:#000; color:#000;
} }
.little-titles{ .little-titles{
height: 22px !important; height: 22px !important;
} }
.user_navlist_white a{ .user_navlist_white a{
color: #989898 !important; color: #989898 !important;
} }
.user_navlist_white .navlistpanel-line .little-titles a{ .user_navlist_white .navlistpanel-line .little-titles a{
color: #000 !important; color: #000 !important;
} }
.newnext-loading{ .newnext-loading{
display:block; display:block;
} }
.educontentSlider{ .educontentSlider{
width: 1282px !important; width: 1282px !important;
} }
.user_navlist_white{ .user_navlist_white{
max-height:350px !important; max-height:350px !important;
overflow-y: auto; overflow-y: auto;
} }
.iconfontzhangjie{ .iconfontzhangjie{
font-size: 10px !important; font-size: 10px !important;
line-height: 23px; line-height: 23px;
} }
.iconfontshixundaibeijing{ .iconfontshixundaibeijing{
font-size: 18px !important; font-size: 18px !important;
line-height: 24px; line-height: 24px;
} }

@ -1,382 +1,382 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
import Loading from '../../Loading'; import Loading from '../../Loading';
import Loadable from 'react-loadable'; import Loadable from 'react-loadable';
import { TPMIndexHOC } from './TPMIndexHOC'; import { TPMIndexHOC } from './TPMIndexHOC';
import { SnackbarHOC } from 'educoder'; import { SnackbarHOC } from 'educoder';
import TPMBanner from './TPMBanner'; import TPMBanner from './TPMBanner';
import axios from 'axios'; import axios from 'axios';
import TPMShixunDiscussContainer from './TPMShixunDiscussContainer'; import TPMShixunDiscussContainer from './TPMShixunDiscussContainer';
import TPMRepositoryComponent from './TPMRepositoryComponent'; import TPMRepositoryComponent from './TPMRepositoryComponent';
import TPMRepositoryCommits from './shixunchild/Repository/TPMRepositoryCommits'; import TPMRepositoryCommits from './shixunchild/Repository/TPMRepositoryCommits';
import TPMsettings from './TPMsettings/TPMsettings'; import TPMsettings from './TPMsettings/TPMsettings';
import TPMChallengeComponent from './TPMChallengeContainer' import TPMChallengeComponent from './TPMChallengeContainer'
import TPMPropaedeuticsComponent from './TPMPropaedeuticsComponent' import TPMPropaedeuticsComponent from './TPMPropaedeuticsComponent'
import TPMRanking_listComponent from './TPMRanking_listContainer' import TPMRanking_listComponent from './TPMRanking_listContainer'
import TPMCollaboratorsComponent from './TPMCollaboratorsContainer' import TPMCollaboratorsComponent from './TPMCollaboratorsContainer'
import '../page/tpiPage.css' import '../page/tpiPage.css'
//任务 //任务
// const TPMChallengeComponent = Loadable({ // const TPMChallengeComponent = Loadable({
// loader: () => import('./TPMChallengeContainer'), // loader: () => import('./TPMChallengeContainer'),
// loading: Loading, // loading: Loading,
// }) // })
//背景知识 //背景知识
// const TPMPropaedeuticsComponent = Loadable({ // const TPMPropaedeuticsComponent = Loadable({
// loader: () => import('./TPMPropaedeuticsComponent'), // loader: () => import('./TPMPropaedeuticsComponent'),
// loading: Loading, // loading: Loading,
// }) // })
//版本库 //版本库
// const TPMRepositoryComponent = Loadable({ // const TPMRepositoryComponent = Loadable({
// loader: () => import('./TPMRepositoryComponent'), // loader: () => import('./TPMRepositoryComponent'),
// loading: Loading, // loading: Loading,
// }) // })
// const TPMRepositoryComponent = Loadable({ // const TPMRepositoryComponent = Loadable({
// loader: () => import('./TPMRepositoryComponent'), // loader: () => import('./TPMRepositoryComponent'),
// loading: Loading, // loading: Loading,
// }) // })
//合作 //合作
// const TPMCollaboratorsComponent = Loadable({ // const TPMCollaboratorsComponent = Loadable({
// loader: () => import('./TPMCollaboratorsContainer'), // loader: () => import('./TPMCollaboratorsContainer'),
// loading: Loading, // loading: Loading,
// }) // })
//评论 //评论
// const TPMShixunDiscussComponent = Loadable({ // const TPMShixunDiscussComponent = Loadable({
// loader: () => import('./TPMShixunDiscussContainer'), // loader: () => import('./TPMShixunDiscussContainer'),
// loading: Loading, // loading: Loading,
// }) // })
//排行版 //排行版
// const TPMRanking_listComponent = Loadable({ // const TPMRanking_listComponent = Loadable({
// loader: () => import('./TPMRanking_listContainer'), // loader: () => import('./TPMRanking_listContainer'),
// loading: Loading, // loading: Loading,
// }) // })
// //编辑实训 // //编辑实训
// const TPMModifysettings = Loadable({ // const TPMModifysettings = Loadable({
// loader: () =>import('./modules/tpm/TPMsettings/TPMsettings'), // loader: () =>import('./modules/tpm/TPMsettings/TPMsettings'),
// loading: Loading, // loading: Loading,
// }) // })
//新建实训 //新建实训
const TPMchallengesnew = Loadable({ const TPMchallengesnew = Loadable({
loader: () => import('./challengesnew/TPMchallengesnew'), loader: () => import('./challengesnew/TPMchallengesnew'),
loading: Loading, loading: Loading,
}) })
//新建tab2 //新建tab2
const TPMevaluation = Loadable({ const TPMevaluation = Loadable({
loader: () => import('./challengesnew/TPMevaluation'), loader: () => import('./challengesnew/TPMevaluation'),
loading: Loading, loading: Loading,
}) })
//新建tab3答案 //新建tab3答案
// const TPManswer = Loadable({ // const TPManswer = Loadable({
// loader: () => import('./challengesnew/TPManswer'), // loader: () => import('./challengesnew/TPManswer'),
// loading: Loading, // loading: Loading,
// }) // })
const TPManswer = Loadable({ const TPManswer = Loadable({
loader: () => import('./challengesnew/TPManswer2'), loader: () => import('./challengesnew/TPManswer2'),
loading: Loading, loading: Loading,
}) })
//选择题 //选择题
const TPMquestion = Loadable({ const TPMquestion = Loadable({
loader: () => import('./challengesnew/TPMquestion'), loader: () => import('./challengesnew/TPMquestion'),
loading: Loading, loading: Loading,
}) })
//fork列表 //fork列表
const TPMFork_listComponent = Loadable({ const TPMFork_listComponent = Loadable({
loader: () => import('./TPMFork/TPMForklist'), loader: () => import('./TPMFork/TPMForklist'),
loading: Loading, loading: Loading,
}) })
//背景知识修改 //背景知识修改
const TPMUpdatepropaede = Loadable({ const TPMUpdatepropaede = Loadable({
loader: () => import('./TPMUpdatepropaede/TPMUpdatepropaede'), loader: () => import('./TPMUpdatepropaede/TPMUpdatepropaede'),
loading: Loading, loading: Loading,
}) })
const interceptorUrlArray = ['repository.json', 'commits.json', 'propaedeutics.json' const interceptorUrlArray = ['repository.json', 'commits.json', 'propaedeutics.json'
, 'challenges.json', 'discusses.json', 'ranking_list.json', 'collaborators.json'] , 'challenges.json', 'discusses.json', 'ranking_list.json', 'collaborators.json']
const cacheInterceptorUrlMap = {} const cacheInterceptorUrlMap = {}
class TPMIndex extends Component { class TPMIndex extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
loadingContent: false, loadingContent: false,
power: false, power: false,
shixunsDetails: {}, shixunsDetails: {},
shixunId: undefined, shixunId: undefined,
star_info: [0, 0, 0, 0, 0, 0], star_info: [0, 0, 0, 0, 0, 0],
star_infos: [0, 0, 0, 0, 0, 0], star_infos: [0, 0, 0, 0, 0, 0],
identity:undefined, identity:undefined,
TPMRightSectionData:undefined, TPMRightSectionData:undefined,
PropaedeuticsList: undefined, PropaedeuticsList: undefined,
} }
} }
componentDidMount = () => { componentDidMount = () => {
let id = this.props.match.params.shixunId; let id = this.props.match.params.shixunId;
// let collaborators = `/shixuns/` + id + `/propaedeutics.json`; // let collaborators = `/shixuns/` + id + `/propaedeutics.json`;
// //
// axios.get(collaborators).then((response) => { // axios.get(collaborators).then((response) => {
// if (response.status === 200) { // if (response.status === 200) {
// if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { // if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
// //
// }else{ // }else{
// this.setState({ // this.setState({
// PropaedeuticsList: response.data, // PropaedeuticsList: response.data,
// shixunId: id // shixunId: id
// }); // });
// } // }
// //
// } // }
// }).catch((error) => { // }).catch((error) => {
// console.log(error) // console.log(error)
// }); // });
let Url = `/shixuns/` + id + `.json`; let Url = `/shixuns/` + id + `.json`;
axios.get(Url).then((response) => { axios.get(Url).then((response) => {
if (response.status === 200) { if (response.status === 200) {
document.title=response.data.name; document.title=response.data.name;
let newstar_info = []; let newstar_info = [];
// let start1= // let start1=
for (var i = 0; i < response.data.score_info.length; i++) { for (var i = 0; i < response.data.score_info.length; i++) {
if (i === 0) { if (i === 0) {
newstar_info.push(response.data.score_info[i]) newstar_info.push(response.data.score_info[i])
} else { } else {
newstar_info.push((response.data.score_info[i] / 100) * 5) newstar_info.push((response.data.score_info[i] / 100) * 5)
} }
} }
let newstar_infos = response.data.score_info; let newstar_infos = response.data.score_info;
this.setState({ this.setState({
shixunsDetails: response.data, shixunsDetails: response.data,
shixunId: id, shixunId: id,
star_info: newstar_info, star_info: newstar_info,
star_infos: newstar_infos, star_infos: newstar_infos,
power: response.data.power, power: response.data.power,
identity: response.data.identity, identity: response.data.identity,
propaedeutics:response.data.propaedeutics, propaedeutics:response.data.propaedeutics,
status: response.data.status, status: response.data.status,
}); });
} }
}).catch((error) => { }).catch((error) => {
this.setState({ this.setState({
shixunsDetails: undefined, shixunsDetails: undefined,
shixunId: undefined, shixunId: undefined,
star_info: undefined, star_info: undefined,
star_infos: undefined, star_infos: undefined,
power: undefined, power: undefined,
identity: undefined, identity: undefined,
status: undefined, status: undefined,
propaedeutics:undefined propaedeutics:undefined
}); });
}); });
this.tpmContentRequestInterceptor = axios.interceptors.request.use((config) => { this.tpmContentRequestInterceptor = axios.interceptors.request.use((config) => {
let url = config.url; let url = config.url;
// console.log('tpmContentRequestInterceptor:', url) // console.log('tpmContentRequestInterceptor:', url)
for ( let i = 0; i < interceptorUrlArray.length; i++ ) { for ( let i = 0; i < interceptorUrlArray.length; i++ ) {
if (url.indexOf(interceptorUrlArray[i]) != -1) { if (url.indexOf(interceptorUrlArray[i]) != -1) {
url = url.split('?')[0] url = url.split('?')[0]
console.log('loadingContent, url:', url) console.log('loadingContent, url:', url)
this.setState({ loadingContent: true }) this.setState({ loadingContent: true })
cacheInterceptorUrlMap[url] = true cacheInterceptorUrlMap[url] = true
} }
} }
return config; return config;
}, function (error) { }, function (error) {
return Promise.reject(error); return Promise.reject(error);
}); });
// Add a response interceptor // Add a response interceptor
this.tpmContentResponseInterceptor = axios.interceptors.response.use((response) => { this.tpmContentResponseInterceptor = axios.interceptors.response.use((response) => {
// console.log('loadingContent finished, url:', response.config.url) // console.log('loadingContent finished, url:', response.config.url)
// TODO 依赖了api这个前缀 // TODO 依赖了api这个前缀
let url = response.config.url.split('api')[1]; let url = response.config.url.split('api')[1];
url = url.split('?')[0] url = url.split('?')[0]
if (cacheInterceptorUrlMap[url]) { if (cacheInterceptorUrlMap[url]) {
this.setState({ loadingContent: false }) this.setState({ loadingContent: false })
delete cacheInterceptorUrlMap[response.url] delete cacheInterceptorUrlMap[response.url]
} }
return response; return response;
}, function (error) { }, function (error) {
// Do something with response error // Do something with response error
return Promise.reject(error); return Promise.reject(error);
}); });
//右侧数据 //右侧数据
let shixunsDetailsURL=`/shixuns/`+id+`/show_right.json`; let shixunsDetailsURL=`/shixuns/`+id+`/show_right.json`;
axios.get(shixunsDetailsURL).then((response)=> { axios.get(shixunsDetailsURL).then((response)=> {
this.setState({ this.setState({
TPMRightSectionData: response.data TPMRightSectionData: response.data
}); });
}) })
} }
componentWillUnmount = () => { componentWillUnmount = () => {
axios.interceptors.request.eject(this.tpmContentRequestInterceptor); axios.interceptors.request.eject(this.tpmContentRequestInterceptor);
this.tpmContentRequestInterceptor = null; this.tpmContentRequestInterceptor = null;
axios.interceptors.request.eject(this.tpmContentResponseInterceptor); axios.interceptors.request.eject(this.tpmContentResponseInterceptor);
this.tpmContentResponseInterceptor = null; this.tpmContentResponseInterceptor = null;
} }
setLoadingContent = (isLoadingContent) => { setLoadingContent = (isLoadingContent) => {
this.setState({ loadingContent: isLoadingContent }) this.setState({ loadingContent: isLoadingContent })
} }
// TpmTPMBannertype(type){ // TpmTPMBannertype(type){
// //
// } // }
render() { render() {
return ( return (
<div className="newMain clearfix"> <div className="newMain clearfix">
<TPMBanner <TPMBanner
{...this.props} {...this.props}
{...this.state} {...this.state}
></TPMBanner> ></TPMBanner>
<Switch {...this.props}> <Switch {...this.props}>
<Route path="/shixuns/:shixunId/repository/:repoId/commits" render={ <Route path="/shixuns/:shixunId/repository/:repoId/commits" render={
(props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props}
/>) />)
}></Route> }></Route>
<Route exact path="/shixuns/:shixunId/challenges" render={ <Route exact path="/shixuns/:shixunId/challenges" render={
(props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props} (props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props}
/>) />)
}></Route> }></Route>
<Route path="/shixuns/:shixunId/repository" render={ <Route path="/shixuns/:shixunId/repository" render={
(props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props}
/>) />)
}></Route> }></Route>
{/* <Route exact path="/shixuns/:shixunId/propaedeutics" component={TPMPropaedeuticsComponent}></Route> */} {/* <Route exact path="/shixuns/:shixunId/propaedeutics" component={TPMPropaedeuticsComponent}></Route> */}
<Route exact path="/shixuns/:shixunId/propaedeutics" render={ <Route exact path="/shixuns/:shixunId/propaedeutics" render={
(props) => (<TPMPropaedeuticsComponent {...this.props} {...this.state} {...props} (props) => (<TPMPropaedeuticsComponent {...this.props} {...this.state} {...props}
/>) />)
}></Route> }></Route>
<Route exact path="/shixuns/:shixunId/collaborators" render={ <Route exact path="/shixuns/:shixunId/collaborators" render={
(props) => (<TPMCollaboratorsComponent {...this.props} {...this.state} {...props} (props) => (<TPMCollaboratorsComponent {...this.props} {...this.state} {...props}
/>) />)
}></Route> }></Route>
{/* <Route exact path="/shixuns/:shixunId/repository/:shixunId/" component={TPMRepositoryComponent}></Route> */} {/* <Route exact path="/shixuns/:shixunId/repository/:shixunId/" component={TPMRepositoryComponent}></Route> */}
<Route path="/shixuns/:shixunId/shixun_discuss" render={ <Route path="/shixuns/:shixunId/shixun_discuss" render={
(props) => (<TPMShixunDiscussContainer {...this.props} {...this.state} {...props} (props) => (<TPMShixunDiscussContainer {...this.props} {...this.state} {...props}
initForumState={(data)=>this.initForumState(data)} initForumState={(data)=>this.initForumState(data)}
setSearchValue={this.setSearchValue} setSearchValue={this.setSearchValue}
setHotLabelIndex={this.setHotLabelIndex} setHotLabelIndex={this.setHotLabelIndex}
/>) />)
}></Route> }></Route>
<Route path="/shixuns/:shixunId/settings" render={ <Route path="/shixuns/:shixunId/settings" render={
(props) => (<TPMsettings {...this.props} {...this.state} {...props} />) (props) => (<TPMsettings {...this.props} {...this.state} {...props} />)
}></Route> }></Route>
<Route exact path="/shixuns/:shixunId/ranking_list" render={ <Route exact path="/shixuns/:shixunId/ranking_list" render={
(props) => (<TPMRanking_listComponent {...this.props} {...this.state} {...props} (props) => (<TPMRanking_listComponent {...this.props} {...this.state} {...props}
/>) />)
}></Route> }></Route>
<Route exact path="/shixuns/:shixunId/fork_list" render={ <Route exact path="/shixuns/:shixunId/fork_list" render={
(props) => (<TPMFork_listComponent {...this.props} {...props} (props) => (<TPMFork_listComponent {...this.props} {...props}
/>) />)
}></Route> }></Route>
<Route exact path="/shixuns/:shixunId/update_propaedeutics" render={ <Route exact path="/shixuns/:shixunId/update_propaedeutics" render={
(props) => (<TPMUpdatepropaede {...this.props} {...props} (props) => (<TPMUpdatepropaede {...this.props} {...props}
/>) />)
}></Route> }></Route>
{/*评测设置*/} {/*评测设置*/}
<Route path="/shixuns/:shixunId/challenges/:checkpointId/tab=2" render={ <Route path="/shixuns/:shixunId/challenges/:checkpointId/tab=2" render={
(props) => (<TPMevaluation {...this.props} {...props} {...this.state}/>) (props) => (<TPMevaluation {...this.props} {...props} {...this.state}/>)
}></Route> }></Route>
{/*参考答案*/} {/*参考答案*/}
<Route path="/shixuns/:shixunId/challenges/:checkpointId/tab=3" render={ <Route path="/shixuns/:shixunId/challenges/:checkpointId/tab=3" render={
(props) => (<TPManswer {...this.props} {...props} {...this.state}/>) (props) => (<TPManswer {...this.props} {...props} {...this.state}/>)
}></Route> }></Route>
{/*新建关卡*/} {/*新建关卡*/}
<Route path="/shixuns/:shixunId/challenges/new" render={ <Route path="/shixuns/:shixunId/challenges/new" render={
(props) => (<TPMchallengesnew {...this.props} {...props} {...this.state}/>) (props) => (<TPMchallengesnew {...this.props} {...props} {...this.state}/>)
}></Route> }></Route>
{/*编辑关卡*/} {/*编辑关卡*/}
<Route path="/shixuns/:shixunId/challenges/:checkpointId/editcheckpoint" render={ <Route path="/shixuns/:shixunId/challenges/:checkpointId/editcheckpoint" render={
(props) => (<TPMchallengesnew {...this.props} {...props} {...this.state} />) (props) => (<TPMchallengesnew {...this.props} {...props} {...this.state} />)
}></Route> }></Route>
{/*新建选择题*/} {/*新建选择题*/}
<Route path="/shixuns/:shixunId/challenges/newquestion" render={ <Route path="/shixuns/:shixunId/challenges/newquestion" render={
(props) => (<TPMquestion {...this.props} {...props} {...this.state} />) (props) => (<TPMquestion {...this.props} {...props} {...this.state} />)
}></Route> }></Route>
{/*修改选择题*/} {/*修改选择题*/}
<Route path="/shixuns/:shixunId/challenges/:checkpointId/editquestion/:choose_id" render={ <Route path="/shixuns/:shixunId/challenges/:checkpointId/editquestion/:choose_id" render={
(props) => (<TPMquestion {...this.props} {...props} {...this.state}/>) (props) => (<TPMquestion {...this.props} {...props} {...this.state}/>)
}></Route> }></Route>
{/*修改选择题*/} {/*修改选择题*/}
<Route path="/shixuns/:shixunId/challenges/:checkpointId/editquestion" render={ <Route path="/shixuns/:shixunId/challenges/:checkpointId/editquestion" render={
(props) => (<TPMquestion {...this.props} {...props} {...this.state}/>) (props) => (<TPMquestion {...this.props} {...props} {...this.state}/>)
}></Route> }></Route>
<Route exact path="/shixuns/:shixunId" render={ <Route exact path="/shixuns/:shixunId" render={
(props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props} (props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props}
/>) />)
}></Route> }></Route>
{/*<Route exact path="/shixuns/:shixunId" component={TPMChallengeComponent}></Route>*/} {/*<Route exact path="/shixuns/:shixunId" component={TPMChallengeComponent}></Route>*/}
</Switch> </Switch>
</div> </div>
); );
} }
} }
export default SnackbarHOC() (TPMIndexHOC ( TPMIndex )); export default SnackbarHOC() (TPMIndexHOC ( TPMIndex ));

@ -652,15 +652,15 @@ export default class TPMsettings extends Component {
return return
} }
} }
if (exec_time === "") { // if (exec_time === "") {
this.setState({ // this.setState({
exec_timetype: true // exec_timetype: true
}) // })
$('html').animate({ // $('html').animate({
scrollTop: 1500 // scrollTop: 1500
}, 1000); // }, 1000);
return // return
} // }
// if (!pod_exist_time) { // if (!pod_exist_time) {
// this.setState({ // this.setState({
@ -1468,21 +1468,21 @@ export default class TPMsettings extends Component {
</div> </div>
</div> </div>
<div className="edu-back-white mb10 padding40-20 clearfix"> {/*<div className="edu-back-white mb10 padding40-20 clearfix">*/}
<span className="color-orange fl mr20">*</span> {/*<span className="color-orange fl mr20">*</span>*/}
<p className="color-grey-6 font-16 mb30">程序最大执行时间</p> {/*<p className="color-grey-6 font-16 mb30">程序最大执行时间</p>*/}
<Input className="mr10 fl" placeholder="请输入程序最大执行时间" maxLength="60" style={{width: '20%'}} {/*<Input className="mr10 fl" placeholder="请输入程序最大执行时间" maxLength="60" style={{width: '20%'}}*/}
onInput={this.Timevalue} value={exec_time === undefined ? "" : exec_time}/> <span {/*onInput={this.Timevalue} value={exec_time === undefined ? "" : exec_time}/> <span*/}
className="fl mr10 ml20"></span> {/*className="fl mr10 ml20">秒</span>*/}
<div style={{width: ' 57px '}} className="fl"> {/*<div style={{width: ' 57px '}} className="fl">*/}
<span className={exec_timetype === true ? "color-orange mt8" : "color-orange mt8 none"} {/*<span className={exec_timetype === true ? "color-orange mt8" : "color-orange mt8 none"}*/}
id="shixun_name_notice"><i {/*id="shixun_name_notice"><i*/}
className="fa fa-exclamation-circle mr3"></i></span> {/*className="fa fa-exclamation-circle mr3"></i>必填项</span>*/}
</div> {/*</div>*/}
</div> {/*</div>*/}
{/* <div className="edu-back-white mb10 padding40-20 clearfix" id="pod_exist_time"> {/* <div className="edu-back-white mb10 padding40-20 clearfix" id="pod_exist_time">
<span className="color-orange fl mr20">*</span> <span className="color-orange fl mr20">*</span>

@ -360,9 +360,7 @@ class ShixunsIndex extends Component {
return ( return (
<div className="newMain clearfix backFAFAFA"> <div className="newMain clearfix backFAFAFA">
<Spin spinning={typepvisible} size="large" style={{marginTop:'15%'}}> {/*<Spin spinning={typepvisible} size="large" style={{marginTop:'15%'}}>*/}
{/*懒加载*/}
<ShixunSearchBar <ShixunSearchBar
Updatasearchlist={this.Updatasearchlist.bind(this)} Updatasearchlist={this.Updatasearchlist.bind(this)}
allUpdatashixunlist={this.allUpdatashixunlist} allUpdatashixunlist={this.allUpdatashixunlist}
@ -391,8 +389,7 @@ class ShixunsIndex extends Component {
pages={pages} pages={pages}
shixunsPage={this.shixunsPage.bind(this)} shixunsPage={this.shixunsPage.bind(this)}
/> />
{/*</Spin>*/}
</Spin>
</div> </div>
); );
} }

Loading…
Cancel
Save