Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/context/EvaluateSuccessEffectDisplay.js

@@ -51,16 +51,16 @@ class EvaluateSuccessEffectDisplay extends Component {
                     </div>
                     <div className="clearfix" id="picture-content">
                         <div className="fl with33 mr03precent pt10 mb50">
-                            <img alt="Icon" 
-                                src={orignal_picture[0].pic_url}/>
+                            {orignal_picture[0] && <img alt="Icon" 
+                                src={ orignal_picture[0].pic_url}/>}
                         </div>
                         <div className="fl with33 mr03precent pt10 mb50">
-                            <img alt="Icon" 
-                                src={user_picture[0].pic_url}/>
+                            {user_picture[0] && <img alt="Icon" 
+                                src={ user_picture[0].pic_url }/>}
                         </div>
                         <div className="fl with33 mr03precent pt10 mb50">
-                            <img alt="Icon" 
-                                src={answer_picture[0].pic_url}/>
+                            { answer_picture[0] && <img alt="Icon" 
+                                src={ answer_picture[0].pic_url}/> }
                         </div>
                     </div>
                 </div> 

public/react/src/context/TPIContextProvider.js

@@ -896,7 +896,7 @@ pop_box_new(htmlvalue, 480, 182);
 						  {/* mb20 加了有样式问题 */}
 			          	<DialogActions className={""} id="dialog-actions">
 										{ this.isSingleButton ? <div className="task-popup-submit clearfix"
-														style={{ textAlign: 'center' }}>
+														style={{ textAlign: 'center', 'margin-bottom': '14px'}}>
 													<a  className="task-btn task-btn-orange"
 														onClick={this.handleGdialogClose}
 													>知道啦</a>

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -58,8 +58,9 @@ function buildColumns(that, student_works) {
   const isAdminOrStudent = that.props.isAdminOrStudent()
   const isStudent = that.props.isStudent()
   const isNiPing = homework_status && homework_status.indexOf('匿评中') != -1
+  const isAppeal = homework_status && homework_status.indexOf('申诉中') != -1
   // https://www.trustie.net/issues/21450   分组作业作品列表 学时视角，匿评阶段的列表显示信息不正确
-  const niPingAndIsStudent = isStudent && isNiPing
+  const niPingAndIsStudent = isStudent && (isNiPing || isAppeal)
 
   let columns = [{
     width: 60,

public/react/src/modules/courses/busyWork/CommonWorkSetting.js

@@ -1149,7 +1149,8 @@ class CommonWorkSetting extends Component{
                 
                 <div className={" mb10 ml30"}>
                   <span>结束时间：</span>
-                  <ConditionToolTip condition={moment(init_late_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
+                  {/* <ConditionToolTip condition={moment(init_late_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
+                   </ConditionToolTip> */}
                   <span>
                   <DatePicker
                       showToday={false}
@@ -1163,7 +1164,8 @@ class CommonWorkSetting extends Component{
                     value={!late_time ? undefined :moment(late_time, dateFormat)}
                     onChange={this.onChangeTimelatetime}
                     disabledTime={disabledDateTime}
-                    disabled={!allow_late || noAuth || moment(init_late_time) < moment()}
+                    // || moment(init_late_time) < moment()
+                    disabled={!allow_late || noAuth }
                     // disabledDate={ (late_time) => 
                     //   { 
                     //     const end_time = this.state.end_time
@@ -1172,7 +1174,7 @@ class CommonWorkSetting extends Component{
                     //   }
                   />
                   </span>
-                  </ConditionToolTip>
+                 
                   <span className={"font-14 color-grey-9 ml10"}>（学生“延时”提交作品的时间截点）</span>
                   {<div className={"latetimetype color-red "}>{latetimetype}</div>}
                 </div>

public/react/src/modules/courses/busyWork/NewWork.js

@@ -38,7 +38,8 @@ class NewWork extends Component{
     }
   }
   fetchCourseData = (courseId) => {
-    const url = `/courses/${courseId}/homework_commons/new.json?type=1`
+    const isGroup = this.props.isGroup()
+    const url = `/courses/${courseId}/homework_commons/new.json?type=${isGroup ? 3 : 1}`
     axios.get(url, {
     })
     .then((response) => {
@@ -369,7 +370,8 @@ class NewWork extends Component{
           </p> */}
           <CBreadcrumb items={[
             { to: `/courses/${courseId}`, name: this.state.course_name},
-            { to: `/courses/${courseId}/${moduleEngName}/${category && category.category_id ? category.category_id : ''}`, name: moduleName },
+            { to: `/courses/${courseId}/${moduleEngName}/${category && category.category_id ? category.category_id : ''}`
+              , name: category && category.category_name },
             { name: `${ this.isEdit ? '编辑' : '新建'}` }
           ]}></CBreadcrumb>