diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 222bfad5..a73ee8f0 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -55,7 +55,8 @@ const OrderupdateMilepost = Loadable({
})
const OrderupdateDetail = Loadable({
- loader: () => import('../Order/UpdateDetail'),
+ // loader: () => import('../Order/UpdateDetail'),
+ loader: () => import('../Order/order_form'),
loading: Loading,
})
@@ -213,6 +214,10 @@ class Detail extends Component {
}
}
+ componentWillUnmount() {
+ this.timerChannel && clearTimeout(this.timerChannel);
+ }
+
getProject = (num) => {
const { projectsId, owner } = this.props.match.params;
const url = `/${owner}/${projectsId}/simple.json`;
@@ -275,7 +280,9 @@ class Detail extends Component {
connected: () => {
console.log("###### channel connected! ######");
},
- disconnected: () => { },
+ disconnected: () => {
+ console.log("###### cannot connected! ######");
+ },
received: data => {
console.log(`###### ---received data--- ######`);
console.log(data);
@@ -296,10 +303,22 @@ class Detail extends Component {
});
cable.subscriptions.consumer.disconnect();
}
+ },
+ onerror:()=>{
+ console.log("###### cannot connected! ######");
}
- })
+ });
+
+ this.timerChannel = setTimeout(this.reloadDetail,5000);
}
+ reloadDetail=()=>{
+ if(this.state.firstSync||this.state.secondSync){
+ window.location.reload();
+ }
+ }
+
+
deleteProjectBack = () => {
const { history } = this.props;
const { projectsId, owner } = this.props.match.params;
@@ -700,16 +719,16 @@ class Detail extends Component {
(props) => (
大规模实训课程体系
谢绝纸上谈兵,精心打造教学、标注、练平一体化的实战环境
集成化班级协同空间
支持实验、作业、视频、考试、毕设等十余种线上线下管理工具
@@ -177,6 +179,7 @@ function Teaching(){ {/* 多联盟共建开源竞赛 */}多联盟共建开源竞赛
聚焦开源定期开展有奖大型竞赛,让您的作品伴随您成长
diff --git a/src/forge/TeachingPractice/Teaching.scss b/src/forge/TeachingPractice/Teaching.scss index e57ff50e..71eff505 100644 --- a/src/forge/TeachingPractice/Teaching.scss +++ b/src/forge/TeachingPractice/Teaching.scss @@ -26,9 +26,17 @@ &:hover{opacity: 0.8; } } } - & .tea_part1 .vertical:hover, .tea_part2 .vertical:hover, .tea_part3 .content:hover, .practice div{ + & .tea_part1 .vertical:hover, .tea_part2 .vertical:hover, .tea_part3 .content:hover, .practice div, .tea_head>div div, .tea_head>img{ cursor: pointer; } + & .tea_part1>span{ + position: relative; + top: -100px; + } + & .tea_part2_bg>span, .tea_part3_bg>span{ + position: relative; + top: -50px; + } } .tea_head{ display: flex; diff --git a/src/forge/claims/claims.js b/src/forge/claims/claims.js index 329bddb6..22ab0cf0 100644 --- a/src/forge/claims/claims.js +++ b/src/forge/claims/claims.js @@ -251,7 +251,7 @@ class claims extends React.Component { { - claimerdata.length>0?( + claimerdata&&claimerdata.length>0?(