From 75560a90c601c7502022f0245ff17ae895e24c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 9 Jan 2020 11:44:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 9 +++---- .../courses/coursesPublic/NewShixunModel.js | 24 ++++++++----------- public/stylesheets/educoder/edu-all.css | 9 +++---- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 306913b1f..1c3e635db 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -3474,10 +3474,7 @@ a.singlepublishtwo{ margin-bottom: 0 !important; } -/*.ant-notification{*/ - /*width: auto !important;*/ - /*max-width: 600px !important;*/ -/*}*/ + .markdown-body { @@ -3502,3 +3499,7 @@ a.singlepublishtwo{ text-shadow: none !important; box-shadow: none !important; } + +.ant-notification{ + z-index: 10001 !important; +} \ No newline at end of file diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js index 6ca6cc438..226c6c7c7 100644 --- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js +++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js @@ -234,16 +234,7 @@ class NewShixunModel extends Component{ this.getdatalist(1,undefined,'all',value,'desc',0,20) } - showNotification = (description, message = "提示", icon) => { - const data = { - message, - description - } - if (icon) { - data.icon = icon; - } - notification.open(data); - } + savecouseShixunModal=()=>{ this.setState({ @@ -252,19 +243,24 @@ class NewShixunModel extends Component{ let {coursesId}=this.props; let{Grouplist}=this.state; if(Grouplist.length===0){ + this.setState({ hometypepvisible:false }) - this.showNotification(this.props.type==='shixuns'?"请先选择实训":"请先选择课程") + + this.props.showNotification(this.props.type==='shixuns'?"请先选择实训":"请先选择课程") + return } if (this.props.chooseShixun) { + if(Grouplist.length>1){ + this.setState({ hometypepvisible:false }) - this.showNotification("试卷选择的实训数不能大于1") + this.props.showNotification("试卷选择的实训数不能大于1") return } this.props.chooseShixun(Grouplist) @@ -293,7 +289,7 @@ class NewShixunModel extends Component{ }else{ // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids) - this.showNotification("操作成功") + this.props.showNotification("操作成功") this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order); this.props.hideNewShixunModelType() this.props.updataleftNavfun() @@ -321,7 +317,7 @@ class NewShixunModel extends Component{ }else{ // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids) - this.showNotification("操作成功") + this.props.showNotification("操作成功") this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order); this.props.hideNewShixunModelType() this.props.updataleftNavfun() diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index d620d16d8..529ab871e 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3784,10 +3784,7 @@ a.singlepublishtwo{ .has-error .ant-input:focus{ border-color: #ff4d4f !important; } -/*.ant-notification{*/ - /*width: auto !important;*/ - /*max-width: 600px !important;*/ -/*}*/ + .fontweight400{ font-weight: 400 !important; } @@ -3800,6 +3797,10 @@ a.singlepublishtwo{ z-index: 10000 !important; } +.ant-notification{ + z-index: 10001 !important; +} + .markdown-body { text-align: justify; word-break: break-all; From aa719044e0d0734f671d94437ee03eb38c090613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 9 Jan 2020 11:50:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/common/comments/CCommentItem.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js index ea98747cc..c440e0424 100644 --- a/public/react/src/modules/courses/common/comments/CCommentItem.js +++ b/public/react/src/modules/courses/common/comments/CCommentItem.js @@ -227,11 +227,11 @@ class CCommentItem extends Component{ } {/* } */} - {item.is_appeal_info && isAdmin && item.appeal_status == 1 && + {item.is_appeal_info && isAdmin && item.appeal_status == 1 && this.props.isAdmin()===true&& this.on_deal_appeal_score(REFUSE, item)} className="fr ml6">拒绝申诉 this.on_deal_appeal_score(ACCEPT, item)} className="fr">接受申诉 } - {item.appeal_status == 1 && this.props.is_author == true && + {item.appeal_status == 1 && this.props.is_author == true && this.props.isStudent()===true && this.cancelMyAppeal()}>撤销申诉}