From 358880bfd283a6fe95e04f2ec3112b17bf20f1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Mon, 13 Dec 2021 15:01:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/Detail.js | 11 ++++++----- src/forge/Order/Detail.js | 2 +- src/forge/Order/OrderItem.js | 2 +- src/forge/Order/UpdateDetail.js | 1 + src/forge/Order/order_form.js | 10 ++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 222bfad5..6d0a09fe 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, }) @@ -700,16 +701,16 @@ class Detail extends Component { (props) => () } > - {/* 修改详情 updatedetail*/} - () + (props) => () } > {/* 复制详情 copyetail*/} () + (props) => () } > diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index b0c82acd..09a5958e 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -273,7 +273,7 @@ class Detail extends Component { 编辑 diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index 55126e3a..6e661d69 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -94,7 +94,7 @@ class OrderItem extends Component { user_admin_or_member ?
- +
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js index 0bf4f0f1..06fae4d1 100644 --- a/src/forge/Order/UpdateDetail.js +++ b/src/forge/Order/UpdateDetail.js @@ -4,6 +4,7 @@ import OrderForm from './order_form' function CopyDetail(props){ const operateName = props.match.params.operateName; + console.log('operateName:'+operateName); return( ) diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 8aa94cbc..ef79eea8 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -169,11 +169,12 @@ class order_form extends Component { // 创建 handleSubmit = () => { - this.setState({ - isSpin: true, - }); + this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { + this.setState({ + isSpin: true, + }); const { form_type } = this.props; const { projectsId , orderId , owner } = this.props.match.params; @@ -247,9 +248,6 @@ class order_form extends Component { }); } } - this.setState({ - isSpin: false, - }); }); }; From fcc53f52782bad548209ad2e2770d7a521242426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Mon, 13 Dec 2021 15:48:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0websocket=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/Detail.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 6d0a09fe..a73ee8f0 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -214,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`; @@ -276,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); @@ -297,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; From bc5ec6103eb538cc88c2f5eb2c952649b2f7eee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Mon, 13 Dec 2021 16:04:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=89=B9=E5=AE=9A?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/claims/claims.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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?(
声明要关注/解决此易修的用户{claimerdata.length}
this.setVisibleFunc(false)}> From eb254de9fde8110887b29380d5a13db96b2a16a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Tue, 14 Dec 2021 13:52:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B6=E9=83=A8=E5=A2=9E=E5=8A=A0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/TeachingPractice/Teaching.jsx | 11 +++++++---- src/forge/TeachingPractice/Teaching.scss | 10 +++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/forge/TeachingPractice/Teaching.jsx b/src/forge/TeachingPractice/Teaching.jsx index 168aa7bc..774d99e2 100644 --- a/src/forge/TeachingPractice/Teaching.jsx +++ b/src/forge/TeachingPractice/Teaching.jsx @@ -24,15 +24,16 @@ function Teaching(){
-
大规模实训课程体系
-
集成化班级协同空间
-
多联盟共建开源竞赛
+
大规模实训课程体系
 +
集成化班级协同空间
 +
多联盟共建开源竞赛
- + window.open('https://www.educoder.net', '_blank')}/>
{/* 大规模实训课程体系 */}
+

大规模实训课程体系

谢绝纸上谈兵，精心打造教学、标注、练平一体化的实战环境

@@ -95,6 +96,7 @@ function Teaching(){ {/* 集成化班级协同空间 */}
+

集成化班级协同空间

支持实验、作业、视频、考试、毕设等十余种线上线下管理工具

@@ -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;