diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 61ab83126..6c4a20fa9 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -31,7 +31,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
         proxy = "https://testeduplus2.educoder.net"
-        //proxy="http://47.96.87.25:48080"
+        proxy="http://47.96.87.25:48080"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index 97d9436a6..718b6de42 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -316,7 +316,7 @@ class BoardsNew extends Component{
                       max: 60, message: '最大限制为60个字符',
                     }],
                   })(
-                    <Input placeholder="请输入帖子标题，最大限制60个字符" />
+                    <Input placeholder="请输入帖子标题，最大限制60个字符" className="searchViewAfter"/>
                   )}
                 </Form.Item>
 
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 246c9d544..25ddaa146 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -371,6 +371,8 @@ class CommonWorkSetting extends Component{
   componentDidMount() {
     this.fetchList()
     on('commonwork_fetch_all', this.fetchAllListener)
+    $("html").animate({ scrollTop: $('html').scrollTop() - 100 })
+
   }
   componentWillUnmount() {
     off('commonwork_fetch_all', this.fetchAllListener)  
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index eefbc1f0b..a6fc93c92 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -417,12 +417,25 @@ class NewWork extends Component{
                   height: 40px;
                   line-height: 40px;
                 }
+
+                .workContent.AboutInputForm.ant-form-item {
+                  border-bottom: none;
+                  padding-bottom: 0px !important;
+                }
+                .newWorkUpload {
+                  padding: 0px 30px 30px 30px!important;
+                  background: #fff;
+                  width: 100%;
+                  display: inline-block;
+                  border-bottom: 1px solid #EDEDED;
+                }
+                
               `}</style>
 
 
               {  <Form.Item
                 label="内容"
-                className="AboutInputForm"
+                className="AboutInputForm workContent mdInForm"
               > 
                 {getFieldDecorator('description', {
                   rules: [{
@@ -432,14 +445,13 @@ class NewWork extends Component{
                   <TPMMDEditor ref={this.contentMdRef} placeholder="请在此输入作业内容和要求,最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500} 
                     watch={false}  className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
                 )}
-
-                <Upload {...uploadProps} className="upload_1">
-                  <Button className="uploadBtn">
-                    <Icon type="upload" /> 上传附件
-                  </Button>
-                  (单个文件150M以内)
-                </Upload>
               </Form.Item> }
+              <Upload {...uploadProps} className="upload_1 newWorkUpload">
+                <Button className="uploadBtn">
+                  <Icon type="upload" /> 上传附件
+                </Button>
+                (单个文件150M以内)
+              </Upload>
               
 
               { isGroup && 
diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index acd583e43..9c57001c8 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -15,7 +15,8 @@ class AccessoryModal extends Component{
       Modalstopval:"",
       ModalCancel:"",
       ModalSave:"",
-      loadtype:false
+      loadtype:false,
+			updatas:false
     }
   }
 
@@ -114,9 +115,12 @@ class AccessoryModal extends Component{
         for(var list of fileList){
           newfileList.push(list.response.id)
         }
-
+debugger
         if (newfileList.length == 0) {
-          this.props.showNotification('请先上传附件')
+          // this.props.showNotification('请先上传附件')
+					this.setState({
+						updatas:true
+					})
           return;
         }
 
@@ -243,7 +247,7 @@ class AccessoryModal extends Component{
               border:'1px solid rgba(234,234,234,1)',
               padding: '10px'
             }}></textarea>
-
+						{this.state.updatas===true?<span className={"color-red"}>请上传附件</span>:""}
             <div className="clearfix mt30 edu-txt-center mb10">
               <a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
               <a className="task-btn task-btn-orange" onClick={()=>this.Saves()}>{this.props.Savesname || '确认'}</a>
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 8720dd860..6dd7984d1 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -842,8 +842,8 @@ a.white-btn.use_scope-btn:hover{
 /*列表状态*/
 .typestyle{
     min-width: 68px;
-    height: 24px;
-    line-height: 24px;
+    height: 24px !important;
+    line-height: 24px !important;
     color: #fff !important;
 }
 .edu-filter-btn-028d01{
@@ -916,7 +916,7 @@ a.white-btn.use_scope-btn:hover{
 .ml22{
     margin-left:22px;
 }
-
+/* FORM START */
 .ant-form label{
     /* 为了覆盖antd的样式，这里使用了important，TODO */
     font-size: 16px !important;
@@ -930,6 +930,12 @@ a.white-btn.use_scope-btn:hover{
 .ant-form label.font-12 {
     font-size: 12px !important;
 }
+/* md编辑器在form中时，使用这个样式，可以把错误信息绝对定位 */
+.mdInForm .has-error .ant-form-explain {
+    position: absolute;
+    margin-top: -2px;
+    margin-left: -7px;
+}
 
 
 /*新建课堂*/
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index 419f26315..519850271 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -6,6 +6,8 @@ import {Link} from 'react-router-dom';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 import Associationmodel from '../../coursesPublic/Associationmodel';
+import AccessoryModal from "../../coursesPublic/AccessoryModal";
+
 
 class GraduateTaskItem extends Component{
   constructor(props){
@@ -111,12 +113,26 @@ class GraduateTaskItem extends Component{
 
   }
 
+	addAccessory=()=>{
+		this.setState({
+			visibles:true
+		})
+	}
+
   Cancel=()=>{
     this.setState({
       visible:false
     })
   }
-
+	Cancelvisible=()=>{
+		this.setState({
+			visibles:false
+		})
+	}
+
+	setupdate=()=>{
+		this.props.funlist
+	}
   render(){
     let {
         Modalstype,
@@ -161,6 +177,15 @@ class GraduateTaskItem extends Component{
              taskid={taskid}
              funlist={this.props.funlist}
            />:""}
+					{this.state.visibles===true?<AccessoryModal
+						modalname={"补交附件"}
+						visible={this.state.visibles}
+						Cancelname={"取消"}
+						Savesname={"确认"}
+						Cancel={this.Cancelvisible}
+						categoryid={discussMessage.work_id}
+						setupdate={this.setupdate}
+					/>:""}
           <style>{`
             
             .graduateTopicList .ant-checkbox-input {
@@ -325,8 +350,9 @@ class GraduateTaskItem extends Component{
 
                         {item==="补交附件"?
 
-                          <WordsBtn className="colorblue font-16 mr20 fr mt12">
-                            <a className="btn colorblue " href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}>补交附件</a>
+                          <WordsBtn className="colorblue font-16 mr20 fr mt12" onClick={this.addAccessory}>
+														补交附件
+                            {/*<a className="btn colorblue " href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}></a>*/}
                           </WordsBtn>
 
                           :""}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 229a8399a..da74baff6 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -12,6 +12,7 @@ import CoursesListType from '../../coursesPublic/CoursesListType';
 import ModulationModal from "../../coursesPublic/ModulationModal";
 import AllocationModal from "../../coursesPublic/AllocationModal";
 import Associationmodel from '../../coursesPublic/Associationmodel';
+import AccessoryModal from "../../coursesPublic/AccessoryModal";
 
 const CheckboxGroup = Checkbox.Group;
 const Search = Input.Search;
@@ -436,12 +437,25 @@ class GraduationTaskssettinglist extends Component{
 
 
 	handaccessory=()=>{
-	  let {taskslistdata}=this.state;
-		let courseId=this.props.match.params.coursesId;
+	  // let {taskslistdata}=this.state;
+		// let courseId=this.props.match.params.coursesId;
+		//
+		// let url="/courses/"+courseId+"/graduation_tasks/"+taskslistdata.work_id+"/appraise"
+		//
+		// window.location.href=url;
+		this.setState({
+			avisible:true
+		})
+	}
 
-		let url="/courses/"+courseId+"/graduation_tasks/"+taskslistdata.work_id+"/appraise"
+	Cancelvisible=()=>{
+		this.setState({
+			avisible:false
+		})
+	}
 
-		window.location.href=url;
+	setupdate=()=>{
+	  this.searchValue()
 	}
 
 	showModulationtype=(id)=>{
@@ -1355,7 +1369,15 @@ class GraduationTaskssettinglist extends Component{
 					  />
 					:""}
 
-					{taskslistdata&&taskslistdata?
+					{this.state.avisible===true?<AccessoryModal
+						modalname={"补交附件"}
+						visible={this.state.avisible}
+						Cancelname={"取消"}
+						Savesname={"确认"}
+						Cancel={this.Cancelvisible}
+						categoryid={taskslistdata.work_id}
+						setupdate={this.setupdate}
+					/>:""}					{taskslistdata&&taskslistdata?
 						// 教师列表
 						this.props.isAdmin()?<div className="newMain clearfix">
 								<div className={"educontent mb20"}>
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index cd97c6cfa..d997592ef 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -550,7 +550,7 @@ class studentsList extends Component{
 
 
         {
-          total_count > 0 ?
+          total_count > 0 || this.state.isSpin == true ?
           <div className="mt20 edu-back-white padding20">
             <div className="clearfix stu_head" style={{paddingLeft: '15px'}}>
               {isAdmin && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox>}
diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
index d8d84608c..3e12e2bb6 100644
--- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js
+++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
@@ -26,17 +26,11 @@ class CommitSummary extends Component{
           data:undefined,
           cancels:false,
       }
-      //   console.log("CommitSummary");
-      // console.log(this.props);
+
     }
     componentDidMount() {
 
      this.Getsubmissionsummaryinterface();
-     //    this.props.form.setFieldsValue({
-     //        description:"result.data.selected_data.tea_id",
-     //
-     //    });
-      this.getTrainingjobsetting();
       let query = this.props.location.pathname;
       const type = query.split('/');
       this.setState({
@@ -44,36 +38,6 @@ class CommitSummary extends Component{
       })
     }
 
-    // saveFormData = () => {
-    //     form.validateFields((err, values) => {
-    //         if (err) {
-    //             return;
-    //         }
-    //         var  worksid=this.state.data.homeworkid;
-    //         // console.log(values);
-    //         // console.log(homeworkid);
-    //         console.log(worksid);
-    //         // 在这里执行保存到服务器的操作使用axios
-    //         // message.success('保存成功！')
-    //         var  url = `/student_works/${worksid}/update_des.json`;
-    //         axios.post(url,{
-    //             description:values,
-    //         }).then((result) => {
-    //             if (result.status === 200) {
-    //                 // console.log(url)
-    //                 // console.log("提交总结接口")
-    //                 // console.log(JSON.stringify(result))
-    //                 // message.success(result.data.message);
-    //             }
-    //             if(result.status === 403){
-    //
-    //             }
-    //         }).catch((error) => {
-    //             console.log(error)
-    //         })
-    //     });
-    // }
-
 
     //获取提交总结接口
     Getsubmissionsummaryinterface=()=>{
@@ -183,20 +147,6 @@ class CommitSummary extends Component{
                             <span className="color-red mt20">*</span>
                             内容</span>
                                   </div>
-                                  {/*<Form.Item*/}
-                                  {/*>*/}
-                                  {/*    {getFieldDecorator('description', {*/}
-                                  {/*        rules: [{*/}
-                                  {/*            required: true, message: '请输入帖子内容',*/}
-                                  {/*        }, {*/}
-                                  {/*            max: 5000, message: '最大限制为5000个字符',*/}
-                                  {/*        }],*/}
-                                  {/*    })(*/}
-                                  {/*        <TPMMDEditor ref={this.mdRef} placeholder={'请在此输入帖子详情，最大限制为5000个字符'}*/}
-                                  {/*                     mdID={'courseMessageMD'} initValue={this.editTopic ? this.editTopic.content : ''} className="courseMessageMD"></TPMMDEditor>*/}
-                                  {/*    )}*/}
-                                  {/*</Form.Item>*/}
-                                  {/*<SeoCreateForm  homeworkid={this.props.match.params.homeworkid} description={this.state.description} data={this.state.data=== undefined?undefined:this.state.data}/>*/}
                                   <div className="new-wrap">
                                       <Form labelCol={{span: 5}}layout='vertical' onSubmit={this.handleSubmit}  wrapperCol={{span: 12}}>
                                           <Form.Item
@@ -231,16 +181,6 @@ class CommitSummary extends Component{
 
                       </div>
 
-                        {/*<Form.Item wrapperCol={{span: 12, offset: 5}}>*/}
-                        {/*    <div className="clearfix mt30 mb30">*/}
-                        {/*        <Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20">*/}
-                        {/*            提交*/}
-                        {/*        </Button>*/}
-                        {/*        /!*<a className="defalutSubmitbtn fl mr20">提交</a>*!/*/}
-                        {/*        <a className="defalutCancelbtn fl" onClick={this.goback}>取消</a>*/}
-                        {/*    </div>*/}
-                        {/*</Form.Item>*/}
-
                     </div>
                 {/*</Form>*/}
                 </div>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 2200c8e77..6d19b13ef 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -92,6 +92,7 @@ class Listofworks extends Component {
 			unlimitedtwo: 1,
 			code_review: false,
 			boolgalist:true,
+			challenges_count:0,
 			columns: [
 				{
 					title: '序号',
@@ -179,7 +180,13 @@ class Listofworks extends Component {
 					align: 'center',
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+
+										<Tooltip  placement="bottom" title={<div>
+											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										</div>}>
+											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+										</Tooltip>
+
         </span>
 					)
 				},
@@ -210,16 +217,43 @@ class Listofworks extends Component {
 					align: 'center',
 					render: (text, record) => (
 						<span>
-            <a style={parseInt(record.efficiencyscore) <= 60 ? {
-							"color": '#747A7F',
-							"text-align": "center"
-						} : parseInt(record.efficiencyscore) < 90 ? {
-							"color": '#FF6800',
-							"text-align": "center"
-						} : parseInt(record.efficiencyscore) >= 90 ? {
-							"color": '#DD1717',
-							"text-align": "center"
-						} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
+            {
+							record.efficiencyscore&& record.efficiencyscore=== "--"?(
+									record.submitstate==="按时提交"?
+										<Tooltip placement="bottom" title={<div>
+											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
+										</div>}>
+											<a style={{color:"#9A9A9A"}}>
+												--
+											</a>
+										</Tooltip>
+										:
+										record.submitstate==="延时提交"?
+											<Tooltip placement="bottom" title={<div>
+												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
+											</div>}>
+												<a style={{color:"#9A9A9A"}}>
+													--
+												</a>
+											</Tooltip>
+											:
+											<a style={{color:"#9A9A9A"}}>
+												--
+											</a>
+								)
+								:
+								<a style={parseInt(record.efficiencyscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) < 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) >= 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
+						}
+
         </span>
 					)
 				},
@@ -230,17 +264,63 @@ class Listofworks extends Component {
 					align: 'center',
 					render: (text, record) => (
 						<span>
-           <a style={parseInt(record.finalscore) <= 60 ? {
-						 "color": '#747A7F',
-						 "text-align": "center"
-					 } : parseInt(record.finalscore) < 90 ? {
-						 "color": '#FF6800',
-						 "text-align": "center"
-					 } : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-						 "color": '#747A7F',
-						 "text-align": "center"
-					 }}>{record.finalscore}</a>
-        </span>
+									{
+										record.ultimate_score=== true?
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<a style=
+																 {{
+																	 "color": '#9A9A9A',
+																	 "text-align": "center"
+																 }}>{record.finalscore}</a>
+														:
+														<a style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</a>
+												}
+											</Tooltip>
+											:
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+												record.finalscore&&record.finalscore==="--"?
+												<a style=
+														 {{
+															 "color": '#9A9A9A',
+															 "text-align": "center"
+														 }}>{record.finalscore}</a>
+												:
+												<a style={parseInt(record.finalscore) <= 60 ? {
+													"color": '#747A7F',
+													"text-align": "center"
+												} : parseInt(record.finalscore) < 90 ? {
+													"color": '#FF6800',
+													"text-align": "center"
+												} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+													"color": '#747A7F',
+													"text-align": "center"
+												}}>{record.finalscore}</a>
+												}
+											</Tooltip>
+
+									}
+               </span>
 					)
 				},
 				{
@@ -251,10 +331,15 @@ class Listofworks extends Component {
 					align: 'center',
 					width:'93px',
 					render: (text, record) => (
-						record.submitstate === "未提交" ? "--" :
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
 							<span>
+								<Tooltip placement="bottom" title={<div>
+									<div>直接调整最终成绩的分数</div>
+							   	<div>其它评分全部作废</div>
+							</div>}>
                         <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
 													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+								</Tooltip>
                        <a style={{"text-align": "center"}} className="color-blue"
 													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
         </span>
@@ -320,7 +405,8 @@ class Listofworks extends Component {
 					publish_immediately: result.data.publish_immediately,
 					work_efficiency: result.data.work_efficiency,
 					end_immediately: result.data.end_immediately,
-					code_review: result.data.code_review
+					code_review: result.data.code_review,
+					challenges_count:result.data.challenges_count,
 				})
 				this.seacthdata();
 			}
@@ -371,6 +457,7 @@ class Listofworks extends Component {
 					task_status: result.data.task_status,
 					course_group_info: result.data.course_group_info,
 					loadingstate: false,
+					challenges_count:result.data.challenges_count,
 				})
 
 				this.seacthdata();
@@ -420,11 +507,15 @@ class Listofworks extends Component {
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
-					completion: this.state.teacherdata.student_works[i].complete_count === 4 ? "4/4" : this.state.teacherdata.student_works[i].complete_count === 3 ? "3/4" : this.state.teacherdata.student_works[i].complete_count === 2 ? "2/4" : this.state.teacherdata.student_works[i].complete_count === 1 ? "1/4" : this.state.teacherdata.student_works[i].complete_count === 0 ? "0/0" :this.state.teacherdata.student_works[i].complete_count == null ? "0/0" :this.state.teacherdata.student_works[i].complete_count == undefined ? "0/0": 0,
+					completion:  this.state.teacherdata.student_works[i].complete_count === null ? "0" :this.state.teacherdata.student_works[i].complete_count === undefined ? "0": this.state.teacherdata.student_works[i].complete_count,
 					levelscore: this.state.teacherdata.student_works[i].final_score,
 					efficiencyscore: this.state.teacherdata.student_works[i].eff_score,
 					finalscore: this.state.teacherdata.student_works[i].work_score,
 					operating: "查看",
+					late_penalty: this.state.teacherdata.student_works[i].late_penalty=== null?"0":this.state.teacherdata.student_works[i].late_penalty === undefined?"0":this.state.teacherdata.student_works[i].late_penalty,
+					ultimate_score:this.state.teacherdata.student_works[i].ultimate_score,
+					user_name: this.state.teacherdata.student_works[i].user_name,
+					user_login: this.state.teacherdata.student_works[i].user_login,
 				})
 
 			}
@@ -435,64 +526,54 @@ class Listofworks extends Component {
 				current: this.state.page,
 			}
 			if (this.state.work_efficiency === false) {
-				columns = [
-					{
-						title: '序号',
-						dataIndex: 'number',
-						key: 'number',
-						align: 'center',
-						width:'96px',
-						render: (text, record) => (
-							<span>
+				if(JSON.stringify(this.state.course_group_info) === "[]" ? "" : this.state.course_group_info === undefined ? "" :this.state.course_group_info === null){
+					columns = [
+						{
+							title: '序号',
+							dataIndex: 'number',
+							key: 'number',
+							align: 'center',
+							width:'96px',
+							render: (text, record) => (
+								<span>
              <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
         </span>
-						)
-					},
-					{
-						title: '姓名',
-						dataIndex: 'name',
-						key: 'name',
-						align: 'center',
-						width:'147px',
-						render: (text, record) => (
-							<span>
+							)
+						},
+						{
+							title: '姓名',
+							dataIndex: 'name',
+							key: 'name',
+							align: 'center',
+							width:'147px',
+							render: (text, record) => (
+								<span>
              <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
         </span>
-						)
-					},
-					{
-						title: '学号',
-						dataIndex: 'stduynumber',
-						key: 'stduynumber',
-						align: 'center',
-						width:'200px',
-						render: (text, record) => (
-							<span>
+							)
+						},
+						{
+							title: '学号',
+							dataIndex: 'stduynumber',
+							key: 'stduynumber',
+							align: 'center',
+							width:'200px',
+							render: (text, record) => (
+								<span>
              <a style={{
 							 "color": '#9A9A9A',
 							 "text-align": "center"
 						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
         </span>
-						),
-					},
-					{
-						title: '分班',
-						key: 'classroom',
-						dataIndex: 'classroom',
-						align: 'center',
-						render: (text, record) => (
-							<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
-        </span>
-						)
-					},
-					{
-						title: '提交状态',
-						dataIndex: 'submitstate',
-						key: 'submitstate',
-						align: 'center',
-						render: (text, record) => (
-							<span>
+							),
+						},
+						{
+							title: '提交状态',
+							dataIndex: 'submitstate',
+							key: 'submitstate',
+							align: 'center',
+							render: (text, record) => (
+								<span>
              <a style={record.submitstate === "延时提交" ? {
 							 "color": '#DD1717',
 							 "text-align": "center"
@@ -501,71 +582,569 @@ class Listofworks extends Component {
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
-						)
+							)
 
-					},
-					{
-						title: '更新时间',
-						dataIndex: 'updatetime',
-						key: 'updatetime',
-						align: 'center',
-						render: (text, record) => (
-							<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+						},
+						{
+							title: '更新时间',
+							dataIndex: 'updatetime',
+							key: 'updatetime',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+										<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
         </span>
-						),
-					},
-					{
-						title: '完成情况',
-						dataIndex: 'completion',
-						key: 'completion',
-						align: 'center',
+							),
+						},
+						{
+							title: '完成情况',
+							dataIndex: 'completion',
+							key: 'completion',
+							align: 'center',
+
+							render: (text, record) => (
+								<span>
+
+										<Tooltip placement="bottom" title={<div>
+											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										</div>}>
+											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+										</Tooltip>
 
-						render: (text, record) => (
-							<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
         </span>
-						)
-					},
-					{
-						title: '最终成绩',
-						dataIndex: 'finalscore',
-						key: 'finalscore',
-						align: 'center',
-						render: (text, record) => (
-							<span>
-             <a style={parseInt(record.finalscore) <= 60 ? {
-							 "color": '#747A7F',
+							)
+						},
+						{
+							title: '最终成绩',
+							dataIndex: 'finalscore',
+							key: 'finalscore',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+									{
+										record.ultimate_score=== true?
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<a style=
+																 {{
+																	 "color": '#9A9A9A',
+																	 "text-align": "center"
+																 }}>{record.finalscore}</a>
+														:
+														<a style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</a>
+												}
+											</Tooltip>
+											:
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<a style=
+																 {{
+																	 "color": '#9A9A9A',
+																	 "text-align": "center"
+																 }}>{record.finalscore}</a>
+														:
+														<a style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</a>
+												}
+											</Tooltip>
+
+									}
+               </span>
+							)
+						},
+						{
+							title: '操作',
+							dataIndex: 'operating',
+							key: 'operating',
+							display: 'block',
+							align: 'center',
+							width:'96px',
+							render: (text, record) => (
+								record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
+									<span>
+										<Tooltip placement="bottom" title={<div>
+											<div>直接调整最终成绩的分数</div>
+											<div>其它评分全部作废</div>
+										</div>}>
+                        <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+										</Tooltip>
+                        <a style={{"display": "block", "text-align": "center"}} className="color-blue"
+													 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+                </span>
+							)
+						},
+					]
+
+				}else{
+					columns = [
+						{
+							title: '序号',
+							dataIndex: 'number',
+							key: 'number',
+							align: 'center',
+							width:'96px',
+							render: (text, record) => (
+								<span>
+             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+        </span>
+							)
+						},
+						{
+							title: '姓名',
+							dataIndex: 'name',
+							key: 'name',
+							align: 'center',
+							width:'147px',
+							render: (text, record) => (
+								<span>
+             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+        </span>
+							)
+						},
+						{
+							title: '学号',
+							dataIndex: 'stduynumber',
+							key: 'stduynumber',
+							align: 'center',
+							width:'200px',
+							render: (text, record) => (
+								<span>
+             <a style={{
+							 "color": '#9A9A9A',
 							 "text-align": "center"
-						 } : parseInt(record.finalscore) < 90 ? {
-							 "color": '#FF6800',
+						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+        </span>
+							),
+						},
+						{
+							title: '分班',
+							key: 'classroom',
+							dataIndex: 'classroom',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+								{
+									record.classroom&&record.classroom==="--"?
+										<a style={{"color": '#9A9A9A', "text-align": "center"}}></a>
+										:
+										<a style={{"color": '#07111B', "text-align": "center"}}></a>
+								}
+        </span>
+							)
+						},
+						{
+							title: '提交状态',
+							dataIndex: 'submitstate',
+							key: 'submitstate',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+             <a style={record.submitstate === "延时提交" ? {
+							 "color": '#DD1717',
 							 "text-align": "center"
-						 } : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+						 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 							 "color": '#747A7F',
 							 "text-align": "center"
-						 }}>{record.finalscore}</a>
+						 }}>{record.submitstate}</a>
+        </span>
+							)
+
+						},
+						{
+							title: '更新时间',
+							dataIndex: 'updatetime',
+							key: 'updatetime',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+										<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+        </span>
+							),
+						},
+						{
+							title: '完成情况',
+							dataIndex: 'completion',
+							key: 'completion',
+							align: 'center',
+
+							render: (text, record) => (
+								<span>
+
+										<Tooltip  placement="bottom" title={<div>
+											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										</div>}>
+											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+										</Tooltip>
 
         </span>
-						)
-					},
-					{
-						title: '操作',
-						dataIndex: 'operating',
-						key: 'operating',
-						display: 'block',
-						align: 'center',
-						width:'96px',
-						render: (text, record) => (
-							record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
+							)
+						},
+						{
+							title: '最终成绩',
+							dataIndex: 'finalscore',
+							key: 'finalscore',
+							align: 'center',
+							render: (text, record) => (
 								<span>
+									{
+										record.ultimate_score=== true?
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<a style=
+																 {{
+																	 "color": '#9A9A9A',
+																	 "text-align": "center"
+																 }}>{record.finalscore}</a>
+														:
+														<a style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</a>
+												}
+											</Tooltip>
+											:
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<a style=
+																 {{
+																	 "color": '#9A9A9A',
+																	 "text-align": "center"
+																 }}>{record.finalscore}</a>
+														:
+														<a style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</a>
+												}
+											</Tooltip>
+
+									}
+               </span>
+							)
+						},
+						{
+							title: '操作',
+							dataIndex: 'operating',
+							key: 'operating',
+							display: 'block',
+							align: 'center',
+							width:'96px',
+							render: (text, record) => (
+								record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
+									<span>
+										<Tooltip placement="bottom" title={<div>
+											<div>直接调整最终成绩的分数</div>
+											<div>其它评分全部作废</div>
+										</div>}>
                         <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
 													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+										</Tooltip>
                         <a style={{"display": "block", "text-align": "center"}} className="color-blue"
 													 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+                </span>
+							)
+						},
+					]
+
+				}
+			}else {
+				if(JSON.stringify(this.state.course_group_info) === "[]" ? "" : this.state.course_group_info === undefined ? "" : this.state.course_group_info === null){
+					columns=[
+						{
+							title: '序号',
+							dataIndex: 'number',
+							key: 'number',
+							align: 'center',
+							width:'96px',
+							render: (text, record) => (
+								<span>
+             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+        </span>
+							)
+						},
+						{
+							title: '姓名',
+							dataIndex: 'name',
+							key: 'name',
+							align: 'center',
+							Width:'147px',
+							render: (text, record) => (
+								<span>
+             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
         </span>
-						)
-					},
-				]
+							)
+						},
+						{
+							title: '学号',
+							dataIndex: 'stduynumber',
+							key: 'stduynumber',
+							align: 'center',
+							width:'200px',
+							render: (text, record) => (
+								<span>
+             <a style={{
+							 "color": '#9A9A9A',
+							 "text-align": "center"
+						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+        </span>
+							),
+						},
+						{
+							title: '提交状态',
+							dataIndex: 'submitstate',
+							key: 'submitstate',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+             <a style={record.submitstate === "延时提交" ? {
+							 "color": '#DD1717',
+							 "text-align": "center"
+						 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+							 "color": '#747A7F',
+							 "text-align": "center"
+						 }}>{record.submitstate}</a>
+        </span>
+							)
+
+						},
+						{
+							title: '更新时间',
+							dataIndex: 'updatetime',
+							key: 'updatetime',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+        </span>
+							),
+						},
+						{
+							title: '完成情况',
+							dataIndex: 'completion',
+							key: 'completion',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+
+										<Tooltip placement="bottom" title={<div>
+											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										</div>}>
+											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+										</Tooltip>
+
+        </span>
+							)
+						},
+						{
+							title: '关卡得分',
+							dataIndex: 'levelscore',
+							key: 'levelscore',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+       <a style={parseInt(record.levelscore) <= 60 ? {
+				 "color": '#747A7F',
+				 "text-align": "center"
+			 } : parseInt(record.levelscore) < 90 ? {
+				 "color": '#FF6800',
+				 "text-align": "center"
+			 } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				 "color": '#747A7F',
+				 "text-align": "center"
+			 }}>{record.levelscore}</a>
+        </span>
+							)
+						},
+						{
+							title: '效率分',
+							dataIndex: 'efficiencyscore',
+							key: 'efficiencyscore',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+									{
+										record.efficiencyscore&& record.efficiencyscore=== "--"?(
+											record.submitstate==="按时提交"?
+												<Tooltip placement="bottom" title={<div>
+													<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
+												</div>}>
+													<a style={{color:"#9A9A9A"}}>
+														--
+													</a>
+												</Tooltip>
+												:
+												record.submitstate==="延时提交"?
+												<Tooltip placement="bottom" title={<div>
+													<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
+												</div>}>
+													<a style={{color:"#9A9A9A"}}>
+														--
+													</a>
+												</Tooltip>
+													:
+														<a style={{color:"#9A9A9A"}}>
+															--
+														</a>
+											)
+											:
+											<a style={parseInt(record.efficiencyscore) <= 60 ? {
+												"color": '#747A7F',
+												"text-align": "center"
+											} : parseInt(record.efficiencyscore) < 90 ? {
+												"color": '#FF6800',
+												"text-align": "center"
+											} : parseInt(record.efficiencyscore) >= 90 ? {
+												"color": '#DD1717',
+												"text-align": "center"
+											} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
+									}
+
+        </span>
+
+							)
+						},
+						{
+							title: '最终成绩',
+							dataIndex: 'finalscore',
+							key: 'finalscore',
+							align: 'center',
+							render: (text, record) => (
+								<span>
+									{
+										record.ultimate_score=== true?
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<a style=
+																 {{
+																	 "color": '#9A9A9A',
+																	 "text-align": "center"
+																 }}>{record.finalscore}</a>
+														:
+														<a style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</a>
+												}
+											</Tooltip>
+											:
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<a style=
+																 {{
+																	 "color": '#9A9A9A',
+																	 "text-align": "center"
+																 }}>{record.finalscore}</a>
+														:
+														<a style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</a>
+												}
+											</Tooltip>
+
+									}
+               </span>
+							)
+						},
+						{
+							title: '操作',
+							dataIndex: 'operating',
+							key: 'operating',
+							display: 'block',
+							align: 'center',
+							width:'93px',
+							render: (text, record) => (
+								record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+									<span>
+										<Tooltip placement="bottom" title={<div>
+											<div>直接调整最终成绩的分数</div>
+											<div>其它评分全部作废</div>
+										</div>}>
+                        <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+										</Tooltip>
+                       <a style={{"text-align": "center"}} className="color-blue"
+													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+        </span>
+							)
+						},
+					]
+				}
 			}
 
 		} else {
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index af698386f..d5dbaf06d 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -91,8 +91,8 @@ class Listofworksstudentone extends Component {
 			search: "",
 			order: "",
 			b_order: "asc",
-			page:1,
-			limit:20,
+			page: 1,
+			limit: 20,
 			work_status: "",
 			course_group: "",
 		}
@@ -165,7 +165,7 @@ class Listofworksstudentone extends Component {
 		}).catch((error) => {
 			console.log(error)
 			this.setState({
-				loadingstate:false
+				loadingstate: false
 			})
 		})
 	}
@@ -450,7 +450,7 @@ class Listofworksstudentone extends Component {
 
 		}
 		axios.post(urll, data).then((result) => {
-			if(result !== undefined){
+			if (result !== undefined) {
 				// console.log("学生公开的作品列表")
 				// console.log(JSON.stringify(result))
 				this.setState({
@@ -495,20 +495,38 @@ class Listofworksstudentone extends Component {
 	}
 
 	render() {
-		let {visibles, game_list, limit, viewtrainingdata, teacherdata,page, data, jobsettingsdata,styletable, datas, order, loadingstate} = this.state;
+		let {visibles, game_list, limit, viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate} = this.state;
 		let columns = [
 			{
 				title: '序号',
 				dataIndex: 'number',
 				key: 'number',
 				align: "center",
-				width:'96px',
+				width: '96px',
 				render: (text, record) => (
 					<span>
-             <a style={{
-							 "color": '#07111B',
-							 "text-align": "center"
-						 }}>{record.number === undefined ? "--" : record.number === "" ? "--" : record.number}</a>
+						{record.number === undefined ?
+							<a style={{
+								"color": '#9A9A9A',
+								"text-align": "center"
+							}}> --</a>
+							: record.number === "" ?
+								<a style={{
+									"color": '#9A9A9A',
+									"text-align": "center"
+								}}>--</a>
+								: record.number === "--" ?
+									<a style={{
+										"color": '#9A9A9A',
+										"text-align": "center"
+									}}>--</a>
+									:
+									<a style={{
+										"color": '#07111B',
+										"text-align": "center"
+									}}>  {record.number}</a>
+						}
+
         </span>
 				),
 			},
@@ -517,13 +535,39 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'name',
 				key: 'name',
 				align: "center",
-				width:'147px',
+				width: '147px',
 				render: (text, record) => (
 					<span>
-             <a style={{
-							 "color": '#07111B',
-							 "text-align": "center"
-						 }}>{record.name === undefined ? "--" : record.name === "" ? "--" : record.name === null ? "--" : record.name}</a>
+						{record.name === undefined ?
+							<a style={{
+								"color": '#9A9A9A',
+								"text-align": "center"
+							}}>--</a>
+							:
+							record.name === "" ?
+								<a style={{
+									"color": '#9A9A9A',
+									"text-align": "center"
+								}}>--</a>
+								:
+								record.name === null ?
+									<a style={{
+										"color": '#9A9A9A',
+										"text-align": "center"
+									}}>--</a>
+									:
+									record.name === "--" ?
+										<a style={{
+											"color": '#9A9A9A',
+											"text-align": "center"
+										}}>--</a>
+										:
+										<a style={{
+											"color": '#07111B',
+											"text-align": "center"
+										}}>{record.name}</a>
+						}
+
         </span>
 				),
 			},
@@ -532,7 +576,7 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'stduynumber',
 				key: 'stduynumber',
 				align: "center",
-				width:'200px',
+				width: '200px',
 				render: (text, record) => (
 					<span>
              <a style={{
@@ -609,17 +653,23 @@ class Listofworksstudentone extends Component {
 				align: "center",
 				render: (text, record) => (
 					<span>
-                          <a style={parseInt(record.levelscore) > 90 ? {
-														"color": '#DD1717',
-														"text-align": "center"
-													} : parseInt(record.levelscore) <= 90 ? {
-														"color": '#FF6800',
-														"text-align": "center",
-														"margin-left": "20px"
-													} : parseInt(record.levelscore) <= 60 ? {
-														"color": '#747A7F',
-														"text-align": "center"
-													} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+						{
+							record.levelscore && record.levelscore === "--"?
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.levelscore}</a>
+								:
+								<a style={parseInt(record.levelscore) > 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+								} : parseInt(record.levelscore) <= 90 ? {
+									"color": '#FF6800',
+									"text-align": "center",
+									"margin-left": "20px"
+								} : parseInt(record.levelscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center"
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+						}
+
         </span>
 				),
 			},
@@ -628,11 +678,11 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'operating',
 				key: 'operating',
 				align: "center",
-				width:'96px',
+				width: '96px',
 				render: (text, record) => (
 					<span>
                         {
-													record.submitstate === "未提交" ? "--"
+													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
 														:
 														<a style={{"text-align": "center"}}
 															 className="color-blue"
@@ -672,7 +722,7 @@ class Listofworksstudentone extends Component {
 								Cancel={() => this.cancelModulationModels()}
 							/>
 						</div>
-					 : ""
+						: ""
 					}
 
 					<div className={"educontent mb20"}>
@@ -683,12 +733,12 @@ class Listofworksstudentone extends Component {
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<ActionBtn
 									className=" btn colorgrey fl hovercolorblue "
-									to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id===undefined?"" :jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
+									to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<WordsBtn className="fl">作业详情</WordsBtn>
 							</p>
 						</div>
-						<div className="educontent mb30" style={{width:"1250px"}}>
+						<div className="educontent mb30" style={{width: "1250px"}}>
 							<p className=" fl color-black  summaryname">
 								{teacherdata === undefined ? "" : teacherdata.homework_name}
 							</p>
@@ -696,11 +746,11 @@ class Listofworksstudentone extends Component {
 								typelist={teacherdata === undefined ? [""] : teacherdata.homework_status}
 							/>
 							<a className="color-grey-9 fr font-16  summaryname  ml20 mr20"
-								 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id===undefined?"":jobsettingsdata.data.category.category_id}`}>返回</a>
+								 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>返回</a>
 							<p className="color-grey-9 fr font-16"></p>
 
 						</div>
-						<div className="edu-back-white" style={{width:"1250px"}}>
+						<div className="edu-back-white" style={{width: "1250px"}}>
 							<div className="stud-class-set bor-bottom-greyE ">
 								<div className=" clearfix edu-back-white poll_list">
 									<Link className="active"
@@ -742,11 +792,12 @@ class Listofworksstudentone extends Component {
                                 <span className="fl color-grey-6 font-12"><span
 																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}</span>已交<span
 																	className="ml10">{teacherdata === undefined ? "" : teacherdata.uncommit_count}</span><span>未交</span>
-																	{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" :teacherdata.left_time === null ? "" :
+																	{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
 																		<span className="ml20">{teacherdata.left_time.status}</span>
 																	}
 																	{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
-																		<span className="ml20" style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>
+																		<span className="ml20"
+																					style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>
 																	}
                                 </span>
 
@@ -888,8 +939,11 @@ class Listofworksstudentone extends Component {
                               <span className="fl color-grey-6 font-12"><span
 																className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}</span>已交<span
 																className="ml10">{teacherdata === undefined ? "" : teacherdata.uncommit_count}</span><span>未交</span>
-																{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :<span className="ml20">{teacherdata.left_time.status}</span>}
-																{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" :teacherdata.left_time === null ? "0" :<span className="ml20" style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span> }
+																{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
+																	<span className="ml20">{teacherdata.left_time.status}</span>}
+																{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
+																	<span className="ml20"
+																				style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>}
 
                               </span>
 											<div className="fr color-grey-6 edu-menu-panel">
@@ -899,9 +953,12 @@ class Listofworksstudentone extends Component {
 															{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
 														<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
 														<ul className="edu-position-hide undis mt10">
-															<li> <a  onClick={(e) => this.funorder("updated_at")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
-															<li> <a  onClick={(e) => this.funorder("work_score")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
-															<li> <a  onClick={(e) => this.funorder("student_id")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
+															<li><a onClick={(e) => this.funorder("updated_at")} data-remote="true"
+																		 className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
+															<li><a onClick={(e) => this.funorder("work_score")} data-remote="true"
+																		 className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
+															<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"
+																		 className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
 														</ul>
 													</li>
 												</ul>
diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index 8c7ad059e..9f82abcfe 100644
--- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -136,6 +136,7 @@ class TraineetraininginformationModal extends Component {
               dataIndex: 'number',
               key: 'number',
               align: "center",
+              width: "117px",
               render: (text, record) => (
                 <span >
             <a style={{"color":'#07111B', "text-align": "center"}}>{record.number}</a>
@@ -146,7 +147,7 @@ class TraineetraininginformationModal extends Component {
               title: '完成时间',
               dataIndex: 'name',
               key: 'name',
-              width: 178,
+              width: "203px",
               align: "center",
               render: (text, record) => (
                 <span >
@@ -159,6 +160,7 @@ class TraineetraininginformationModal extends Component {
               dataIndex: 'stduynumber',
               key: 'stduynumber',
               align: "center",
+              width: "117px",
               render: (text, record) => (
                 <span>
              <a style={{"color":'#989898', "text-align": "center"}}>{record.stduynumber}</a>
@@ -170,6 +172,7 @@ class TraineetraininginformationModal extends Component {
               key: 'classroom',
               dataIndex: 'classroom',
               align: "center",
+              width: "117px",
               render: (text, record) => (
                 <span>
              <a style={{"color":'#29BD8B', "text-align": "center"}}>{record.classroom}</a>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 18d970b1f..6a3379222 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -305,6 +305,10 @@ class Trainingjobsetting extends Component {
                     })
                     return
                 }else {
+
+                       if(!this.state.flagPageEditsthrees === false){
+
+
                         if (moment(this.state.end_time, "YYYY-MM-DD HH:mm") <= moment()) {
                             //截止时间小于当前时间
                             this.scrollToAnchor("publishtimeid");
@@ -325,6 +329,7 @@ class Trainingjobsetting extends Component {
                             })
                             return
                         }
+                       }
                 }
                 if (this.state.allowreplenishment === "允许补交") {
 
@@ -489,19 +494,22 @@ class Trainingjobsetting extends Component {
         if (this.state.completionefficiencyscore === true) {
             latedeductiontwos = this.state.latedeductiontwo;
         }
-        var len = 0;
-        for (var k = 0; k < challenge_scoredata.length; k++) {
-            len = len + challenge_scoredata[k];
-        }
-        var max = latedeductiontwos + len;
-        if (max > 100) {
-            this.props.showNotification(`总分值+效率占比分之和要等于100，现在分值为` + max);
-            return;
-        }
-        if(max<100){
-            this.props.showNotification(`总分值+效率占比分之和要等于100，现在分值为` + max);
-            return;
+        if(challenge_scoredata.length>0){
+            var len = 0;
+            for (var k = 0; k < challenge_scoredata.length; k++) {
+                len = len + challenge_scoredata[k];
+            }
+            var max = latedeductiontwos + len;
+            if (max > 100) {
+                this.props.showNotification(`总分值+效率占比分之和要等于100，现在分值为` + max);
+                return;
+            }
+            if(max<100){
+                this.props.showNotification(`总分值+效率占比分之和要等于100，现在分值为` + max);
+                return;
+            }
         }
+
         var url = `/homework_commons/${homeworkid}/update_settings.json`;
         var data = undefined;
         // console.log("this.state.unified_setting")
@@ -1939,7 +1947,7 @@ class Trainingjobsetting extends Component {
                             </div>
                             <div className={"mb20 mt15"}>
                                 <Checkbox disabled={!flagPageEdit} className="ml40" onChange={this.onChangepublicwork}
-                                          checked={this.state.publicwork} style={{"color":"#666666"}}>公开作品</Checkbox>
+                                          checked={this.state.publicwork} style={{"color":"#666666"}}>公开成绩</Checkbox>
                                 <span className={"font-14 color-grey-9 font-14 "} style={{"text-align":"left"}}>(选中，则在作业截止/补交结束时间之后，已提交作品的学生可以查看其它学生的成绩，否则只能查看自己的成绩)</span>
                             </div>