diff --git a/public/react/src/modules/courses/busyWork/NewWorkForm.js b/public/react/src/modules/courses/busyWork/NewWorkForm.js
index 6083252bc..1626c5c6a 100644
--- a/public/react/src/modules/courses/busyWork/NewWorkForm.js
+++ b/public/react/src/modules/courses/busyWork/NewWorkForm.js
@@ -450,6 +450,7 @@ class NewWorkForm extends Component{
className="AboutInputForm groupSetting"
>
{getFieldDecorator('personNum', {
+ validateTrigger: 'onNone',
rules: [{
// required: true,
// message: '人数不能为空'
diff --git a/public/react/src/modules/courses/common/ModalWrapper.js b/public/react/src/modules/courses/common/ModalWrapper.js
index 44495d336..e92a508d6 100644
--- a/public/react/src/modules/courses/common/ModalWrapper.js
+++ b/public/react/src/modules/courses/common/ModalWrapper.js
@@ -53,7 +53,7 @@ class ModalWrapper extends Component{
{this.props.checkBoxValuestype===true?
请先选择课堂
:""}
-
+
diff --git a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
index 3e7522e31..ae77b0cf3 100644
--- a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
+++ b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
@@ -216,7 +216,9 @@ class Bullsubdirectory extends Component{
let{description,whethertoeditysl,addonAfter,eduintits,informs,isSpinysl} =this.state;
let{myname,mydescription,id}=this.props;
const {getFieldDecorator} = this.props.form;
-
+ console.log("Bullsubdirectory");
+ console.log(this.props.isAdmin());
+ console.log(this.props.yslbool);
return(
@@ -239,10 +241,13 @@ class Bullsubdirectory extends Component{
{
- this.props.isClassManagement() === true ?
+ this.props.isAdmin() === true ?
(this.props.yslbool===false?
-
+
+ 编辑
+
}>
this.bianji(true)}>
+
:
""
)
@@ -251,10 +256,13 @@ class Bullsubdirectory extends Component{
{
- this.props.isClassManagement() === true ?
+ this.props.isAdmin() === true ?
(this.props.yslbool===false?
-
+
+ 删除
+ }>
this.setModeltrue(true)}>
+
:
""
)
diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
index f6fa8361a..7f593c353 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
@@ -89,7 +89,7 @@ class GroupPackage extends Component {
:datas&&datas.group_info&&datas.group_info.base_on_project===0?
- 基于项目实施
+ 不基于项目
(无需在平台创建项目,任意小组成员均可以提交作品)
:""
diff --git a/public/react/src/modules/courses/members/CourseGroupChooser.js b/public/react/src/modules/courses/members/CourseGroupChooser.js
index f57874872..125f10b51 100644
--- a/public/react/src/modules/courses/members/CourseGroupChooser.js
+++ b/public/react/src/modules/courses/members/CourseGroupChooser.js
@@ -89,7 +89,7 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde
trigger('groupAdd')}
- >添加分班...
+ >添加分班
)
diff --git a/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js b/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
index 59883c77b..c0c11addc 100644
--- a/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
+++ b/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
@@ -65,16 +65,22 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
className="courseGroupChooserModal"
>
{/*
*/}
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 2a72fcfd1..a0cd3ba21 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -227,10 +227,6 @@
left:0px;
background: #4CACFF;
}
-.square-Item{
- height: 295px;
-}
-
/* 题库相关 */
.breadcrumb{
height: 18px;