Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/config/webpack.config.prod.js

@@ -62,7 +62,7 @@ module.exports = {
   // We generate sourcemaps in production. This is slow but gives good results.
   // You can exclude the *.map files from the build during deployment.
   //  devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
-	devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
+	devtool: shouldUseSourceMap ? 'source-map' : 'source-map',//测试版
   // In production, we only want to load the polyfills and the app code.
   entry: [require.resolve('./polyfills'), paths.appIndexJs],
   output: {

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: '人数不能为空'

public/react/src/modules/courses/common/ModalWrapper.js

@@ -53,7 +53,7 @@ class ModalWrapper extends Component{
               {this.props.checkBoxValuestype===true?<div className={"mt10 color-red"}>
                       请先选择课堂
               </div>:""}
-              <div className="mt30 marginauto clearfix edu-txt-center">
+              <div className="mt20 marginauto clearfix edu-txt-center">
                 <a onClick={this.onCancel} className="pop_close task-btn mr30">{ cancelText || '取消' }</a>
                 <a onClick={this.onOk} className="task-btn task-btn-orange" id="submit_send_shixun">{ okText || "确定" }</a>
               </div>

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(
 			<React.Fragment  >
 				<div >
@@ -239,10 +241,13 @@ class Bullsubdirectory extends Component{
 																<div>
 																	<span className="fr yslbianji" style={{marginRight:"17px"}}>
 																	{
-																		this.props.isClassManagement() === true ?
+																		this.props.isAdmin() === true ?
 																			(this.props.yslbool===false?
-
+																				<Tooltip  placement="bottom" title={<div>
+																					编辑
+																				</div>}>
 																					<i className="iconfont icon-bianji1 newbianji1" onClick={()=>this.bianji(true)}></i>
+																				</Tooltip>
 																					:
 																					""
 																			)
@@ -251,10 +256,13 @@ class Bullsubdirectory extends Component{
 																</span>
 																	<span className="fr yslbianji" style={{marginRight:"22px"}}>
 																	{
-																		this.props.isClassManagement() === true ?
+																		this.props.isAdmin() === true ?
 																			(this.props.yslbool===false?
-
+																				<Tooltip  placement="bottom" title={<div>
+																					删除
+																				</div>}>
 																					<i className="iconfont icon-shanchu newbianji1" style={{ color: "#4CACFF"}} onClick={()=>this.setModeltrue(true)}></i>
+																				</Tooltip>
 																					:
 																					""
 																			)

public/react/src/modules/courses/groupjobbank/GroupPackage2.js

@@ -82,11 +82,16 @@ class GroupPackage extends Component {
 								</p>
 					}
 					{
-						datas&&datas.group_info&&datas.group_info.base_on_project?
+						datas&&datas.group_info&&datas.group_info.base_on_project===1?
 							<p>
 								<span className="ysltextcolor66">基于项目实施</span>
 								<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
 							</p>
+							:datas&&datas.group_info&&datas.group_info.base_on_project===0?
+							<p>
+								<span className="ysltextcolor66">不基于项目</span>
+								<span className="ysltextcolor05">（无需在平台创建项目，任意小组成员均可以提交作品）</span>
+							</p>
 							:""
 					}
 				</div>

public/react/src/modules/courses/members/CourseGroupChooser.js

@@ -89,7 +89,7 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde
             <p className="drop_down_btn">
                 <a href="javascript:void(0)" className="color-grey-6"
                     onClick={() => trigger('groupAdd')}
-                >添加分班...</a>
+                >添加分班</a>
             </p>
         </ul>
     )

public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js

@@ -65,16 +65,22 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
             className="courseGroupChooserModal"
         >   
             <style>{`
+                .courseGroupChooserModal .ant-modal-body{
+                    padding:20px 30px;
+                }
                 .courseGroupChooserModal .description {
                     font-size: 16px;
                     text-align: center;
                     margin-bottom: 20px;
                 }
+                .courseGroupChooserModal .marginauto{
+                    margin-top:10px!important;
+                }
                 .courseGroupChooserModal .drop_down_menu  {
                     position: relative;
                     top: auto;
                     box-shadow: none;
-                    padding-top: 12px;
+                    padding:0px;
                 }
                 .courseGroupChooserModal .drop_down_menu .mainGroup{
                     background: #f2f9ff;
@@ -95,9 +101,15 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
                     padding: 0px;
                 }
                 .courseGroupChooserModal .drop_down_menu .drop_down_btn {
+                    height: 26px;
+                    line-height: 26px;
                     padding: 0px 20px;
                     margin: 0;
                 }
+                .mainGroup .drop_down_menu .drop_down_btn{
+                    height: 26px;
+                    line-height: 26px;
+                }
             `}</style>
             {/* <React.Fragment>
             <React.Fragment> */}

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -251,16 +251,19 @@ class Listofworksstudentone extends Component {
 								textAlign: "center"
 							}
 						}>
-							{record.cost_time === null? "--":record.cost_time === undefined?"--":
+							{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
-								<a style={
+								<Tooltip  placement="bottom" title={<div>
-									{
+									学员在EduCoder做实训花费的时间
-										color: '#747A7F',
+								</div>}>
-										textAlign: "center"
+									<span style={
+										{
+											color: '#747A7F',
+											textAlign: "center"
+										}
 									}
-								}
+									>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
-									 title={"学员在EduCoder做实训花费的时间"}
+									</span>
-								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+								</Tooltip>
-								</a>
 							}
 						</span>
 					)
@@ -524,16 +527,19 @@ class Listofworksstudentone extends Component {
 								textAlign: "center"
 							}
 						}>
-							{record.cost_time === null? "--":record.cost_time === undefined?"--":
+							{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
+								<Tooltip  placement="bottom" title={<div>
+									学员在EduCoder做实训花费的时间
+								</div>}>
 								<a style={
 									{
 										color: '#747A7F',
 										textAlign: "center"
 									}
 								}
-									 title={"学员在EduCoder做实训花费的时间"}
 								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
 								</a>
+								</Tooltip>
 							}
 						</span>
 				// 		<a style={
@@ -847,16 +853,19 @@ class Listofworksstudentone extends Component {
 								textAlign: "center"
 							}
 						}>
-							{record.cost_time === null ? "--":record.cost_time === undefined ?"--":
+							{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time === "--" ?"--":
+								<Tooltip  placement="bottom" title={<div>
+									学员在EduCoder做实训花费的时间
+								</div>}>
 								<a style={
 									{
 										color: '#747A7F',
 										textAlign: "center"
 									}
 								}
-									 title={"学员在EduCoder做实训花费的时间"}
 								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
 								</a>
+								</Tooltip>
 							}
 						</span>
 					)

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -227,10 +227,6 @@
   left:0px;
   background: #4CACFF;
 }
-.square-Item{
-  height: 295px;
-}
-
 /* 题库相关 */
 .breadcrumb{
   height: 18px;