diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index afed0fa9d..c630abf7e 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -46,7 +46,7 @@ debugType = "admin";
 // 老师
 // debugType="teacher";
 // 学生
-//  debugType="student";
+//debugType="student";
 
 
 
diff --git a/public/react/src/modules/courses/Video/LiveItem.js b/public/react/src/modules/courses/Video/LiveItem.js
index b54b0f03d..c0cef91c4 100644
--- a/public/react/src/modules/courses/Video/LiveItem.js
+++ b/public/react/src/modules/courses/Video/LiveItem.js
@@ -24,7 +24,7 @@ class LiveItem extends Component{
       visible:false
     }
   }
-  
+
   deleteLive=(id)=>{
     this.props.confirm({
       content: '是否确认删除?',
@@ -136,7 +136,7 @@ class LiveItem extends Component{
                 item.url ?
                 <React.Fragment>
                   {
-                    wei_flag ? 
+                    wei_flag ?
                       <a className="btns going" onClick={this.alertInfo}>进入</a>
                     :
                       <a className="btns going" target="_blank" href={`${item.url}`}>进入</a>
@@ -154,17 +154,17 @@ class LiveItem extends Component{
           <span className="lineMiddle color-grey-9">
             <img alt={`${item.author_name}`} className="liveAuthor" src={getImageUrl(`images/${item.author_img}`)}/>
             <label className="mr50">{item.author_name}</label>
-            { item.platform && <span className="mr50">直播平台：{item.platform}</span>   }      
-            { item.live_time && <span className="mr50">开播时间：{item.live_time}</span>}   
+            { item.platform && <span className="mr50">直播平台：{item.platform}</span>   }
+            { item.live_time && <span className="mr50">开播时间：{item.live_time}</span>}
             { item.duration && <span className="mr50">直播预计时长：{item.duration}分钟</span> }
           </span>
-          <span className="edu-txt-right" style={{width:"80px"}}>
+          <span className="edu-txt-right" style={{width:"120px"}}>
             {
               item.op_auth ?
               <WordsBtn style="grey" onClick={()=>setLiveId(item.id)}>编辑</WordsBtn>:""
             }
             {
-              item.delete_auth ? 
+              item.delete_auth ?
               <WordsBtn style="grey" className="ml30" onClick={()=>this.deleteLive(item.id)}>删除</WordsBtn>
               :""
             }
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index a6e22f080..5ef7173ee 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -404,7 +404,7 @@ class CoursesBanner extends Component {
     exitclass=()=>{
       this.setState({
         modalsType: true,
-        modalsTopval: "退出后您将不再是本课题的成员,作品将全部被删除，",
+        modalsTopval: "退出后您将不再是本课堂的成员，作品将全部被删除，",
         modalsBottomval:"确定要退出该课堂吗？",
         metype:6
       })
@@ -620,13 +620,13 @@ class CoursesBanner extends Component {
                   </div>
 
                   <div className="clearfix ">
-                    <div className="fl fl mr40 mb20" >
+                    <div className="fl fl mr40" >
                       <div className="task-hide" style={{height:25,marginBottom:10,marginLeft:60}}>
                               {coursedata.teacher_users.length===0?'':
                                <span className="color-white" >协作老师：
                                 {coursedata.teacher_users.map((iem,idx)=>{
                                   return(
-                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''}  {coursedata.teacher_users.length>3&&idx===2?'...':''} </span> 
+                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''}  {coursedata.teacher_users.length>3&&idx===2?'...':''} </span>
                                   )
                                 })
                                 }
@@ -635,7 +635,7 @@ class CoursesBanner extends Component {
                         </div>
 
                     </div>
-                   
+
 
                     {/*{excellent===false?*/}
                     {/*  :*/}
@@ -765,12 +765,12 @@ background:rgba(204,204,204,0.2) !important;
 														placement="topLeft"
 																		 title={<pre className="antsoancss">
 																			 {coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?
-																				 <span >您有{coursedata.teacher_applies_count}条新的加入申请
-																					 <a className={"daishenp"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
+																				 <span>新收到{coursedata.teacher_applies_count}条加入课堂的申请
+																					 <a className={"daishenp ml5"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
 																			 <span style={{
 																			 	color:"#FFA804"
 																			 }}>
-																			 待审批
+																			 去审批
 																		 </span></a></span>:""}</pre>}>
 																<span className="color-grey-c font-16" onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers")}>
 																	<span className={"mr10"}>教师</span>
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index b8880c6f2..b3f126e9f 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -23,14 +23,18 @@ import './yslexercisetable.css';
 import {getImageUrl, toPath, sortDirections} from 'educoder';
 import NoneData from '../../../modules/courses/coursesPublic/NoneData';
 import ModulationModal_exercise from "../coursesPublic/ModulationModal_exercise";
+
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
 const {Option} = Select;
 //学生老师页面
-let columnsystwo=[];
+let columnsystwo = [];
+let myssubjective = 0; //是否显示主观题
+let mysubjective_score = 0;//主观题得分
+let myobjective_score = 0;//客观题得分
+
 class Studentshavecompletedthelist extends Component {
-	// http://localhost:3007/courses/1309/exercises/722/exercises/student_exercise_list?debug=s
 	constructor(props) {
 		super(props);
 		this.state = {
@@ -47,7 +51,7 @@ class Studentshavecompletedthelist extends Component {
 			teacherlist: undefined,
 			searchtext: "",
 			Teacherliststudentlist: undefined,
-			mylistansum:0,
+			mylistansum: 0,
 			review: null,
 			course_groupysls: undefined,
 			nocomment: false,
@@ -72,13 +76,13 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span>
 							{record.number === "--" ?
-								<span style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.number}</span>
+								<span style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.number}</span>
 								:
-								<span style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.number}</span>
+								<span style={{color: '#07111B', textAlign: "center", width: '100px'}}>{record.number}</span>
 
 							}
         </span>
@@ -90,15 +94,16 @@ class Studentshavecompletedthelist extends Component {
 					key: 'name',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth110",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span className="maxnamewidth110 font-14" style={{
-							width:'100px'
+							width: '100px'
 						}}>
 								{record.name === "--" ?
-									<span style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.name}</span>
 									:
-									<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}} title={record.name}>{record.name}</a>
+									<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center", width: '100px'}}
+										 title={record.name}>{record.name}</a>
 
 								}
         </span>
@@ -110,30 +115,30 @@ class Studentshavecompletedthelist extends Component {
 					key: 'stduynumber',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth175",
-					width:'175px',
+					width: '175px',
 					sorter: true,
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span className="maxnamewidth175" style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.stduynumber === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'175px',
+									width: '175px',
 								}}>--</span> :
 								record.stduynumber ===
 								"" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}}>--</span> :
 									<a className="maxnamewidth175" style={{
 										color: '#9A9A9A',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}} title={record.stduynumber}>{record.stduynumber}</a>
 							}
 
@@ -146,26 +151,26 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth255",
-					width:'255px',
+					width: '255px',
 					render: (text, record) => (
-						<span className="maxnamewidth255" style={{width:'255px'}}>
+						<span className="maxnamewidth255" style={{width: '255px'}}>
 								{record.classroom === null ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'255px',
+										width: '255px',
 									}}>--</span> :
 									record.classroom ===
 									"" ?
 										<span style={{
 											color: '#999999',
 											textAlign: "center",
-											width:'255px',
+											width: '255px',
 										}}>--</span> :
 										<a className="maxnamewidth255" style={{
 											color: '#07111B',
 											textAlign: "center",
-											width:'255px',
+											width: '255px',
 										}} title={record.classroom}>{record.classroom}</a>
 								}
 
@@ -178,19 +183,19 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span style={{
-							width:'98px',
+							width: '98px',
 						}}>
              <span style={record.submitstate === "未提交" ? {
 							 color: '#999999',
 							 textAlign: "center",
-							 width:'98px',
-						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center",	width:'98px'} : {
+							 width: '98px',
+						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center", width: '98px'} : {
 							 color: '#29BD8B',
 							 textAlign: "center",
-							 width:'98px',
+							 width: '98px',
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -202,18 +207,18 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'175px',
+					width: '175px',
 					sorter: true,
 					defaultSortOrder: 'descend',
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.updatetime === "--" ?
-								<span style={{color: '#999999', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#999999', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 								:
-								<span style={{color: '#9A9A9A', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -224,14 +229,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span>   {
 							record.completion === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>
 									{record.completion}
 								</span>
@@ -239,20 +244,20 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.completion) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'98px',
-								} : parseInt(record.completion) <= 90 ? {
+									width: '98px',
+								} : parseInt(record.completion) <= 90 &&parseInt(record.completion)>60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : parseInt(record.completion) <= 60 ? {
 										color: '#747A7F',
 										textAlign: "center",
-										width:'98px',
+										width: '98px',
 									} :
 									{
 										color: '#747A7F',
 										textAlign: "center",
-										width:'98px',
+										width: '98px',
 									}}>{record.completion}</span>
 						}
 
@@ -265,14 +270,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'99px',
+					width: '99px',
 					render: (text, record) => (
 						<span>
 							{record.levelscore === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								}}>
 									{record.levelscore}
 								</span>
@@ -280,22 +285,36 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.levelscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'99px',
-								} : parseInt(record.levelscore) <= 90 ? {
+									width: '99px',
+								} : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore) >60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								} : parseInt(record.levelscore) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'99px',
-								} : {color: '#747A7F', textAlign: "center",width:'99px'}}>{record.levelscore}</span>
+									width: '99px',
+								} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
+									{
+										//主观题老师没有评分是
+										parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+											<span style={{
+												color: '#DD1717',
+												textAlign: "center",
+												marginLeft: "5px",
+											}}>
+																					(待批阅)
+																					</span> :
+											""
+
+									}
+								</span>
 							}
         </span>
 					)
 				},
 				{
-					title:<span>最终成绩<Tooltip placement="top" title={<pre>
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
@@ -305,11 +324,11 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					sorter: true,
 					sortDirections: sortDirections,
-					width:'199px',
+					width: '199px',
 					render: (text, record) => (
-						<span style={{width:"199px"}}>
+						<span style={{width: "199px"}}>
 							{record.efficiencyscore === "--" ?
-								<Tooltip  placement="bottom" title={<div>
+								<Tooltip placement="bottom" title={<div>
 									<div>未评分</div>
 								</div>}>
 									<a style={{
@@ -320,15 +339,15 @@ class Studentshavecompletedthelist extends Component {
 									</a>
 								</Tooltip>
 								:
-								record.commit_method===5?
-									<Tooltip  placement="bottom" title={
+								record.commit_method === 5 ?
+									<Tooltip placement="bottom" title={
 										<div>
 											<div>最终调整成绩：{record.efficiencyscore}分</div>
 										</div>}>
 									<span style={parseInt(record.efficiencyscore) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center"
-									} : parseInt(record.efficiencyscore) <= 90 ? {
+									} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 										color: '#FF6800',
 										textAlign: "center"
 									} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -342,24 +361,32 @@ class Studentshavecompletedthelist extends Component {
 									:
 									<Tooltip placement="right" title={<div>
 
-										<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+										<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+											<span>客观题得分：0分</span> :
 											<span>客观题得分：{record.objective_score}分</span>}
 										</div>
 
-										<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+										<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+											<span>主观题得分：0分</span> :
 											<span>主观题得分：{record.subjective_score}分</span>}
 										</div>
-
-										<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
-											<span>最终成绩：{record.efficiencyscore}分</span>}
-										</div>
+										{
+											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+												<div>
+													<span>待批阅</span>
+												</div>
+												:
+												<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+													<span>最终成绩：{record.efficiencyscore}分</span>}
+												</div>
+										}
 									</div>
 
 									}>
 								<span style={parseInt(record.efficiencyscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center"
-								} : parseInt(record.efficiencyscore) <= 90 ? {
+								} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 									color: '#FF6800',
 									textAlign: "center"
 								} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -369,6 +396,17 @@ class Studentshavecompletedthelist extends Component {
 									color: '#747A7F',
 									textAlign: "center"
 								}}>{record.efficiencyscore}</span>
+										{//只有一个主观题的时候
+											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+												<span style={{
+													color: '#DD1717',
+													textAlign: "center",
+													marginLeft: "5px",
+												}}>
+																					(待批阅)
+																				</span> :
+												""
+										}
 									</Tooltip>
 							}
         </span>
@@ -380,9 +418,9 @@ class Studentshavecompletedthelist extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: "edu-txt-center  font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
-						<span style={{width:'98px'}}>
+						<span style={{width: '98px'}}>
 						<span style={{textAlign: "center", color: '#999999'}}>--</span>
             </span>
 					)
@@ -395,11 +433,11 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span>
 							{
-								<span style={{color: '#999999', textAlign: "center",width:'100px'}}>我</span>
+								<span style={{color: '#999999', textAlign: "center", width: '100px'}}>我</span>
 							}
         </span>
 					)
@@ -410,14 +448,16 @@ class Studentshavecompletedthelist extends Component {
 					key: 'name',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth110",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span className="maxnamewidth110 font-14">
 							{
 								record.name === "--" ?
-									<span className="maxnamewidth110" style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span className="maxnamewidth110"
+												style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.name}</span>
 									:
-									<span className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span className="maxnamewidth110"
+												style={{color: '#07111B', textAlign: "center", width: '100px'}}>{record.name}</span>
 
 							}
         </span>
@@ -429,29 +469,29 @@ class Studentshavecompletedthelist extends Component {
 					key: 'stduynumber',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth175",
-					width:'175px',
+					width: '175px',
 					render: (text, record) => (
 						<span className="maxnamewidth175" style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.stduynumber === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'175px',
+									width: '175px',
 								}}>--</span>
 								:
 								record.stduynumber === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}}>--</span>
 									:
 									<a className="maxnamewidth175 font-14" style={{
 										color: '#9A9A9A',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}} title={record.stduynumber}>{record.stduynumber}</a>
 							}
 
@@ -464,26 +504,26 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth255",
-					width:'255px',
+					width: '255px',
 					render: (text, record) => (
 						<span className="font-14 maxnamewidth255" style={{
-							width:'255px',
+							width: '255px',
 						}}>
 							{record.classroom === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'255px',
-								}}>--</span>: record.classroom === "" ?
+									width: '255px',
+								}}>--</span> : record.classroom === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'255px',
-									}}>--</span>:
+										width: '255px',
+									}}>--</span> :
 									<a className="maxnamewidth255" style={{
 										color: '#07111B',
 										textAlign: "center",
-										width:'255px',
+										width: '255px',
 									}} title={record.classroom}>{record.classroom}</a>
 							}
 
@@ -496,17 +536,17 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
-						<span style={{width:'98px',}}>
+						<span style={{width: '98px',}}>
              <span style={record.submitstate === "未提交" ? {
 							 color: '#999999',
 							 textAlign: "center",
-							 width:'98px',
-						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center",		 width:'98px',} : {
+							 width: '98px',
+						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center", width: '98px',} : {
 							 color: '#29BD8B',
 							 textAlign: "center",
-							 width:'98px',
+							 width: '98px',
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -518,15 +558,15 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'175px',
+					width: '175px',
 					render: (text, record) => (
 						<span style={{
-							width:'175px',
+							width: '175px',
 						}}>
-							{record.updatetime === "--"?
-								<span style={{color: '#999999', textAlign: "center",width:'175px'}}>--</span>
+							{record.updatetime === "--" ?
+								<span style={{color: '#999999', textAlign: "center", width: '175px'}}>--</span>
 								:
-								<span style={{color: '#9A9A9A', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -537,14 +577,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span>
 							{record.completion === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>
 									--
 								</span>
@@ -553,19 +593,19 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.completion) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'98px',
-								} : parseInt(record.completion) <= 90 ? {
+									width: '98px',
+								} : parseInt(record.completion) <= 90 && parseInt(record.completion)>60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : parseInt(record.completion) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>{record.completion}</span>
 							}
         </span>
@@ -577,14 +617,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'99px',
+					width: '99px',
 					render: (text, record) => (
 						<span>
-							{record.levelscore === "--"?
+							{record.levelscore === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								}}>
 									--
 								</span>
@@ -592,22 +632,36 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.levelscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'99px'
-								} : parseInt(record.levelscore) <= 90 ? {
+									width: '99px'
+								} : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) >60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'99px'
+									width: '99px'
 								} : parseInt(record.levelscore) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'99px'
-								} : {color: '#747A7F', textAlign: "center",	width:'99px'}}>{record.levelscore}</span>
+									width: '99px'
+								} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
+									{
+										//主观题老师没有评分是
+										parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+											<span style={{
+												color: '#DD1717',
+												textAlign: "center",
+												marginLeft: "5px",
+											}}>
+																					(待批阅)
+																					</span> :
+											""
+
+									}
+								</span>
 							}
         </span>
 					)
 				},
 				{
-					title:<span>最终成绩<Tooltip placement="top"  title={<pre>
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
@@ -615,78 +669,97 @@ class Studentshavecompletedthelist extends Component {
 					key: 'efficiencyscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 columnstwoachievement",
-					width:"199px",
+					width: "199px",
 					render: (text, record) => (
-						<span style={{width:"199px"}}>
+						<span style={{width: "199px"}}>
 							{
-								record.efficiencyscore === "--"?
-									<Tooltip  placement="bottom" title={<div>
+								record.efficiencyscore === "--" ?
+									<Tooltip placement="bottom" title={<div>
 										<div>未评分</div>
 									</div>}>
 										<a style={{
 											color: '#DD1717',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										}}>--</a>
 									</Tooltip>
 									:
-									record.commit_method===5?
-										<Tooltip  placement="bottom" title={
+									record.commit_method === 5 ?
+										<Tooltip placement="bottom" title={
 											<div>
 												<div>最终调整成绩：{record.efficiencyscore}分</div>
 											</div>}>
 										<span style={parseInt(record.efficiencyscore) > 90 ? {
 											color: '#DD1717',
 											textAlign: "center",
-											width:"199px"
-										} : parseInt(record.efficiencyscore) <= 90 ? {
+											width: "199px"
+										} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 											color: '#FF6800',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										} : parseInt(record.efficiencyscore) <= 60 ? {
 											color: '#747A7F',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										} : {
 											color: '#747A7F',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										}}>{record.efficiencyscore}</span>
 										</Tooltip>
 										:
 										<Tooltip placement="right" title={<div>
 
-											<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+											<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+												<span>客观题得分：0分</span> :
 												<span>客观题得分：{record.objective_score}分</span>}
 											</div>
 
-											<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+											<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+												<span>主观题得分：0分</span> :
 												<span>主观题得分：{record.subjective_score}分</span>}
 											</div>
-
-											<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
-												<span>最终成绩：{record.efficiencyscore}分</span>}
-											</div>
+											{
+												parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+													<div>
+														<span>待批阅</span>
+													</div>
+													:
+													<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+														<span>最终成绩：{record.efficiencyscore}分</span>}
+													</div>
+											}
 										</div>
 
 										}>
 									<span style={parseInt(record.efficiencyscore) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center",
-										width:"199px"
-									} : parseInt(record.efficiencyscore) <= 90 ? {
+										width: "199px"
+									} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 										color: '#FF6800',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									} : parseInt(record.efficiencyscore) <= 60 ? {
 										color: '#747A7F',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									} : {
 										color: '#747A7F',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									}}>{record.efficiencyscore}</span>
+											{//只有一个主观题的时候
+												parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+													<span style={{
+														color: '#DD1717',
+														textAlign: "center",
+														marginLeft: "5px",
+													}}>
+																					(待批阅)
+																				</span> :
+													""
+											}
 										</Tooltip>
 							}
 
@@ -699,21 +772,21 @@ class Studentshavecompletedthelist extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:"98px",
+					width: "98px",
 					render: (text, record) => (
-						<span style={{width:"98px"}}>
+						<span style={{width: "98px"}}>
 							{
-								record.submitstate === "未提交"||record.commit_method===5?
-									<span style={{textAlign: "center", color: '#999999',width:"98px"}}>-aa-</span>
-									:record.submitstate === "已提交"?
-									record.score_open===null||record.score_open===undefined?"":
-										record.score_open===true?
-											<a style={{textAlign: "center",width:"98px"}} className="color-blue"
+								record.submitstate === "未提交" || record.commit_method === 5 ?
+									<span style={{textAlign: "center", color: '#999999', width: "98px"}}>-aa-</span>
+									: record.submitstate === "已提交" ?
+									record.score_open === null || record.score_open === undefined ? "" :
+										record.score_open === true ?
+											<a style={{textAlign: "center", width: "98px"}} className="color-blue"
 												 target="_blank"
 												 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
-											:""
+											: ""
 									:
-									<span style={{textAlign: "center", color: '#999999',width:"98px"}}>--</span>
+									<span style={{textAlign: "center", color: '#999999', width: "98px"}}>--</span>
 							}
                     </span>
 					)
@@ -729,7 +802,7 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.number=== "--"?
+								record.number === "--" ?
 									<span style={{color: '#999999', textAlign: "center"}}>--</span>
 									:
 									<span style={{color: '#07111B', textAlign: "center"}}>{record.number}</span>
@@ -789,14 +862,14 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth260",
-					width:"260px",
+					width: "260px",
 					render: (text, record) => (
 						<span>
 							{record.classroom === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center"
-								}}  className="maxnamewidth260">--</span>  : record.classroom === "" ?
+								}} className="maxnamewidth260">--</span> : record.classroom === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center"
@@ -857,7 +930,7 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.completion === "--"?
+								record.completion === "--" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
@@ -866,7 +939,7 @@ class Studentshavecompletedthelist extends Component {
 									<span style={parseInt(record.completion) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center",
-									} : parseInt(record.completion) <= 90 ? {
+									} : parseInt(record.completion) <= 90&& parseInt(record.completion) >60 ? {
 										color: '#FF6800',
 										textAlign: "center",
 									} : parseInt(record.completion) <= 60 ? {
@@ -898,20 +971,34 @@ class Studentshavecompletedthelist extends Component {
 											<span style={parseInt(record.levelscore) > 90 ? {
 												color: '#DD1717',
 												textAlign: "center",
-											} : parseInt(record.levelscore) <= 90 ? {
+											} : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore)>60? {
 												color: '#FF6800',
 												textAlign: "center",
 											} : parseInt(record.levelscore) <= 60 ? {
 												color: '#747A7F',
 												textAlign: "center",
-											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}</span>
+											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
+												{
+													//主观题老师没有评分是
+													parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+														<span style={{
+															color: '#DD1717',
+															textAlign: "center",
+															marginLeft: "5px",
+														}}>
+																					(待批阅)
+																					</span> :
+														""
+
+												}
+											</span>
 									}
 
         </span>
 					)
 				},
 				{
-					title: <span>最终成绩<Tooltip placement="top"  title={<pre>
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
@@ -923,7 +1010,7 @@ class Studentshavecompletedthelist extends Component {
 						<span>
 							              {
 															record.efficiencyscore === "--" ?
-																<Tooltip  placement="bottom" title={<div>
+																<Tooltip placement="bottom" title={<div>
 																	<div>未评分</div>
 																</div>}>
 																	<a style={{
@@ -932,15 +1019,15 @@ class Studentshavecompletedthelist extends Component {
 																	}}>--</a>
 																</Tooltip>
 																:
-																record.commit_method===5?
-																	<Tooltip  placement="bottom" title={
+																record.commit_method === 5 ?
+																	<Tooltip placement="bottom" title={
 																		<div>
-																		<div>最终调整成绩：{record.efficiencyscore}分</div>
-																	  </div>}>
+																			<div>最终调整成绩：{record.efficiencyscore}分</div>
+																		</div>}>
 																	<span style={parseInt(record.efficiencyscore) > 90 ? {
 																		color: '#DD1717',
 																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																	} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																		color: '#FF6800',
 																		textAlign: "center",
 																	} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -954,24 +1041,32 @@ class Studentshavecompletedthelist extends Component {
 																	:
 																	<Tooltip placement="right" title={<div>
 
-																		<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+																		<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+																			<span>客观题得分：0分</span> :
 																			<span>客观题得分：{record.objective_score}分</span>}
 																		</div>
 
-																		<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+																		<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+																			<span>主观题得分：0分</span> :
 																			<span>主观题得分：{record.subjective_score}分</span>}
 																		</div>
-
-																		<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
-																			<span>最终成绩：{record.efficiencyscore}分</span>}
-																		</div>
+																		{
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																				<div>
+																					<span>待批阅</span>
+																				</div>
+																				:
+																				<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+																					<span>最终成绩：{record.efficiencyscore}分</span>}
+																				</div>
+																		}
 																	</div>
 
 																	}>
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 90 ? {
+																} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																	color: '#FF6800',
 																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -981,6 +1076,17 @@ class Studentshavecompletedthelist extends Component {
 																	color: '#747A7F',
 																	textAlign: "center",
 																}}>{record.efficiencyscore}</span>
+																		{//只有一个主观题的时候
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																				<span style={{
+																					color: '#DD1717',
+																					textAlign: "center",
+																					marginLeft: "5px",
+																				}}>
+																					(待批阅)
+																				</span> :
+																				""
+																		}
 																	</Tooltip>
 														}
 						</span>
@@ -994,10 +1100,10 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							       {record.operating==="--"?
-											 <span style={{textAlign: "center",color: '#999999',}}>{record.operating}</span>
-											 :record.submitstate === "未提交"?
-												 <span style={{textAlign: "center",color: '#999999',}}>--</span>
+							       {record.operating === "--" ?
+											 <span style={{textAlign: "center", color: '#999999',}}>{record.operating}</span>
+											 : record.submitstate === "未提交" ?
+												 <span style={{textAlign: "center", color: '#999999',}}>--</span>
 												 :
 												 <a style={{textAlign: "center"}} className="color-blue"
 														target="_blank"
@@ -1040,7 +1146,7 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.name==="--"?
+							{record.name === "--" ?
 								<span style={{color: '#999999', textAlign: "center"}}>{record.name}</span>
 								:
 								<span style={{color: '#07111B', textAlign: "center"}}>{record.name}</span>
@@ -1072,13 +1178,15 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth260",
-					width:'260px',
+					width: '260px',
 					render: (text, record) => (
 						<span>
-							{record.classroom==="--"?
-								<span style={{color: '#999999', textAlign: "center"}} className="maxnamewidth260">{record.classroom}</span>
+							{record.classroom === "--" ?
+								<span style={{color: '#999999', textAlign: "center"}}
+											className="maxnamewidth260">{record.classroom}</span>
 								:
-								<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260" title={record.classroom}>{record.classroom}</a>
+								<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260"
+									 title={record.classroom}>{record.classroom}</a>
 							}
         </span>
 					)
@@ -1114,7 +1222,7 @@ class Studentshavecompletedthelist extends Component {
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
-							{record.updatetime==="--"?
+							{record.updatetime === "--" ?
 								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
 								<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.updatetime}</span>
@@ -1130,12 +1238,28 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.completion=== "--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
+						{
+							record.completion === "--" ?
+								<span style={{
+									color: '#999999',
+									textAlign: "center",
+								}}>--</span>
 								:
-								<span style={{color: '#07111B', textAlign: "center"}}>{record.completion}</span>
-							}
-        </span>
+								<span style={parseInt(record.completion) > 90 ? {
+									color: '#DD1717',
+									textAlign: "center",
+								} : parseInt(record.completion) <= 90 && parseInt(record.completion) > 60 ? {
+									color: '#FF6800',
+									textAlign: "center",
+								} : parseInt(record.completion) <= 60 ? {
+									color: '#747A7F',
+									textAlign: "center",
+								} : {
+									color: '#747A7F',
+									textAlign: "center",
+								}}>{record.completion}</span>
+						}
+	           </span>
 					)
 				},
 				{
@@ -1146,16 +1270,44 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.levelscore==="--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#FF6800', textAlign: "center"}}>{record.levelscore}</span>
-							}
+									{
+										record.levelscore === "--" ?
+											<span style={{
+												color: '#999999',
+												textAlign: "center",
+											}}>--</span> :
+											<span style={parseInt(record.levelscore) > 90 ? {
+												color: '#DD1717',
+												textAlign: "center",
+											} : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) > 60 ? {
+												color: '#FF6800',
+												textAlign: "center",
+											} : parseInt(record.levelscore) <= 60 ? {
+												color: '#747A7F',
+												textAlign: "center",
+											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
+												{
+													//主观题老师没有评分是
+													parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+														<span style={{
+															color: '#DD1717',
+															textAlign: "center",
+															marginLeft: "5px",
+														}}>
+																					(待批阅)
+																					</span> :
+														""
+
+												}
+
+											</span>
+									}
+
         </span>
 					)
 				},
 				{
-					title: <span>最终成绩<Tooltip placement="top"  title={<pre>
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
@@ -1168,22 +1320,24 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 															{record.efficiencyscore === "--" ?
-																<Tooltip  placement="bottom" title={<div>
+																<Tooltip placement="bottom" title={<div>
 																	<div>未评分</div>
 																</div>}>
-																	<a style={{color: '#999999',
-																		textAlign: "center",}}>--</a>
+																	<a style={{
+																		color: '#999999',
+																		textAlign: "center",
+																	}}>--</a>
 																</Tooltip>
 																:
-																record.commit_method===5?
-																	<Tooltip  placement="bottom" title={
+																record.commit_method === 5 ?
+																	<Tooltip placement="bottom" title={
 																		<div>
 																			<div>最终调整成绩：{record.efficiencyscore}分</div>
 																		</div>}>
 																	<span style={parseInt(record.efficiencyscore) > 90 ? {
 																		color: '#DD1717',
 																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																	} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																		color: '#FF6800',
 																		textAlign: "center",
 																	} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -1197,24 +1351,37 @@ class Studentshavecompletedthelist extends Component {
 																	:
 																	<Tooltip placement="right" title={<div>
 
-																		<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+																		<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+																			<span>客观题得分：0分</span> :
 																			<span>客观题得分：{record.objective_score}分</span>}
 																		</div>
 
-																		<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+																		<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+																			<span>主观题得分：0分</span> :
 																			<span>主观题得分：{record.subjective_score}分</span>}
 																		</div>
+																		{
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																				<div>
+																					<span>待批阅</span>
+																				</div>
+																				:
+																				<div>
+																					{record.efficiencyscore === "--" ?
+																						<span>最终成绩：0分</span>
+																						:
+																						<span>最终成绩：{record.efficiencyscore}分</span>
+																					}
+																				</div>
+																		}
 
-																		<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
-																			<span>最终成绩：{record.efficiencyscore}分</span>}
-																		</div>
-																		</div>
+																	</div>
 
 																	}>
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 90 ? {
+																} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																	color: '#FF6800',
 																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -1223,7 +1390,19 @@ class Studentshavecompletedthelist extends Component {
 																} : {
 																	color: '#747A7F',
 																	textAlign: "center",
-																}}>{record.efficiencyscore}</span>
+																}}>{parseInt(record.efficiencyscore) === 0 ? 0 : record.efficiencyscore}</span>
+																		{//只有一个主观题的时候
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																				<span style={{
+																					color: '#DD1717',
+																					textAlign: "center",
+																					marginLeft: "5px",
+																				}}>
+																					(待批阅)
+																				</span> :
+																				""
+																		}
+
 																	</Tooltip>
 															}
         </span>
@@ -1238,37 +1417,40 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.submitstate === "未提交"||record.commit_method===5?
+								record.submitstate === "未提交" || record.commit_method === 5 ?
 									(//是否助教
-										this.props.isAssistant()&&this.props.isAssistant()===true?
+										this.props.isAssistant() && this.props.isAssistant() === true ?
 											(//助教是否有权限
-												this.props.assistant_auth&&this.props.assistant_auth===true?
+												this.props.assistant_auth && this.props.assistant_auth === true ?
 													<a style={{textAlign: "center"}} className="color-blue"
-														 target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
+														 target="_blank"
+														 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
 													:
 													(//是否截止
-														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
+														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ?
 															<a style={{textAlign: "center"}} className="color-blue"
-																 target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
+																 target="_blank"
+																 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
 											)
 											:
 											<a style={{textAlign: "center"}} className="color-blue"
-												 target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
+												 target="_blank"
+												 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
 									)
-									:record.submitstate === "已提交"?
+									: record.submitstate === "已提交" ?
 									(//是否助教
-										this.props.isAssistant()&&this.props.isAssistant()===true?
+										this.props.isAssistant() && this.props.isAssistant() === true ?
 											(//助教是否有权限
-												this.props.assistant_auth&&this.props.assistant_auth===true?
+												this.props.assistant_auth && this.props.assistant_auth === true ?
 													<a style={{textAlign: "center"}} className="color-blue"
 														 target="_blank"
 														 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
 													:
 													(//是否截止
-														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
+														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ?
 															<a style={{textAlign: "center"}} className="color-blue"
 																 target="_blank"
 																 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
@@ -1288,8 +1470,8 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 			],
-		// 也会被columnsys当作参数接收
-			exercise_status:0,
+			// 也会被columnsys当作参数接收
+			exercise_status: 0,
 			order_type: "desc",
 			exeuserid: 0,
 			subjective: 0,
@@ -1302,8 +1484,10 @@ class Studentshavecompletedthelist extends Component {
 		}
 		{/*	 onClick={() => this.Adjustment(record.user_id)}>评阅</a>*/
 		}
-		{/*<span style={{textAlign: "center", color: '#999999'}}*/}
-		{/*>--</span>*/}
+		{/*<span style={{textAlign: "center", color: '#999999'}}*/
+		}
+		{/*>--</span>*/
+		}
 		// //console.log("Studentshavecompletedthelist");
 		// //console.log(props.current_status);
 		// columnsys 老师列表
@@ -1353,16 +1537,16 @@ class Studentshavecompletedthelist extends Component {
 		// console.log("componentDidMount");
 		// console.log(columnsystwo);
 		try {
-			columnsystwo=this.state.columnsys;
-		}catch (e) {
+			columnsystwo = this.state.columnsys;
+		} catch (e) {
 
 		}
-   // console.log(columnsystwo);
+		// console.log(columnsystwo);
 		this.Teacherliststudentlist();
 
 		try {
 			this.props.triggerRef(this);
-		}catch (e) {
+		} catch (e) {
 
 		}
 
@@ -1391,6 +1575,17 @@ class Studentshavecompletedthelist extends Component {
 				limit: null,
 			}
 		}).then((response) => {
+			if (response === undefined) {
+				return
+			}
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
+
 			//学生
 			if (response.data.exercise_types.user_permission === 1) {
 				this.setState({
@@ -1400,7 +1595,7 @@ class Studentshavecompletedthelist extends Component {
 					exercise_users: response.data.exercise_users,
 					current_answer_user: response.data.current_answer_user,
 					course_groups: response.data.course_groups,
-					mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users
+					mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users
 				})
 				if (response.data.current_answer_user === undefined || response.data.current_answer_user === null) {
 					// 学生未截止
@@ -1410,19 +1605,15 @@ class Studentshavecompletedthelist extends Component {
 
 						if (this.state.noclassroom === undefined || this.state.noclassroom === "" || this.state.noclassroom === null) {
 							console.log("4");
-							var arr =[];
-							for(var i=0;i<this.state.columnss.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnss.length; i++) {
 								var item = this.state.columnss[i];
-								if(item.title==="分班"){
-								}
-								else if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "分班") {
+								} else if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
@@ -1433,18 +1624,15 @@ class Studentshavecompletedthelist extends Component {
 						} else {
 							console.log("5");
 							debugger
-							var arr =[];
-							for(var i=0;i<this.state.columnss.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnss.length; i++) {
 								var item = this.state.columnss[i];
-								if(item.title==="客观题得分"){
+								if (item.title === "客观题得分") {
 
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
@@ -1459,32 +1647,26 @@ class Studentshavecompletedthelist extends Component {
 					// //console.log("试卷学生已截止");
 					if (response.data.exercise_types.subjective === 0) {
 						if (this.state.loadingstate === false) {
-							var arr =[];
-							for(var i=0;i<this.state.columnstwo.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnstwo.length; i++) {
 								var item = this.state.columnstwo[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
 
-							var arr2 =[];
-							for(var i=0;i<this.state.columns.length;i++){
+							var arr2 = [];
+							for (var i = 0; i < this.state.columns.length; i++) {
 								var item = this.state.columns[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr2.push(item);
 								}
 							}
@@ -1495,43 +1677,37 @@ class Studentshavecompletedthelist extends Component {
 							})
 						} else {
 
-							var arr =[];
-							for(var i=0;i<this.state.columnstwo.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnstwo.length; i++) {
 								var item = this.state.columnstwo[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
-							var arr2 =[];
-							for(var i=0;i<this.state.columns.length;i++){
+							var arr2 = [];
+							for (var i = 0; i < this.state.columns.length; i++) {
 								var item = this.state.columns[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr2.push(item);
 								}
 							}
 							thiss.setState({
 								columns: arr2,
-								columnstwo:arr,
+								columnstwo: arr,
 							})
 						}
 
 
 					}
-					thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user,response.data.exercise_types);
+					thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user, response.data.exercise_types);
 				}
 			}
 			//老师
@@ -1557,7 +1733,7 @@ class Studentshavecompletedthelist extends Component {
 
 	}
 
-	Generatenewdata(exercise_users, current_answer_user,exercise_types) {
+	Generatenewdata(exercise_users, current_answer_user, exercise_types) {
 		let {page, limit} = this.state;
 		let datalist = [];
 		let datalisttwo = [];
@@ -1580,10 +1756,10 @@ class Studentshavecompletedthelist extends Component {
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-						subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-						operating:exercise_users[i].has_comment===true?"已评阅":"评阅",
-						commit_method:exercise_users[i].commit_method,
-						has_comment:exercise_users[i].has_comment
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						operating: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment
 					})
 				} else {
 					datalist.push({
@@ -1599,10 +1775,10 @@ class Studentshavecompletedthelist extends Component {
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-						subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-						operating:exercise_users[i].has_comment===true?"已评阅":"--",
-						commit_method:exercise_users[i].commit_method,
-						has_comment:exercise_users[i].has_comment
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						operating: exercise_users[i].has_comment === true ? "已评阅" : "--",
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment
 					})
 
 				}
@@ -1627,12 +1803,12 @@ class Studentshavecompletedthelist extends Component {
 				updatetime: moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm'),
 				efficiencyscore: current_answer_user.score === undefined ? "--" : current_answer_user.score === null ? "--" : current_answer_user.score === "" ? "--" : current_answer_user.score,
 				objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-				subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+				subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 				review_status: current_answer_user.review_status,
 				completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score,
 				levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score,
-				score_open:exercise_types.score_open,
-				commit_method:current_answer_user.commit_method
+				score_open: exercise_types.score_open,
+				commit_method: current_answer_user.commit_method
 
 			})
 
@@ -1671,10 +1847,10 @@ class Studentshavecompletedthelist extends Component {
 					levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 					efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 					objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-					subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-					operating:exercise_users[i].has_comment===true?"已评阅":"查看",
-					commit_method:exercise_users[i].commit_method,
-					has_comment:exercise_users[i].has_comment
+					subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+					operating: exercise_users[i].has_comment === true ? "已评阅" : "查看",
+					commit_method: exercise_users[i].commit_method,
+					has_comment: exercise_users[i].has_comment
 				})
 				noclassroom = exercise_users[i].user_group_name;
 			}
@@ -1739,42 +1915,46 @@ class Studentshavecompletedthelist extends Component {
 			params: params
 		}).then((response) => {
 			// //console.log(JSON.stringify(response));
+			if (response === undefined) {
+				return
+			}
 			this.setState({
 				Teacherliststudentlist: response.data,
 				review: response.data.review,
 				commit_status: response.data.commit_status,
 				exercise_users: response.data.exercise_users,
 				current_answer_user: response.data.current_answer_user,
-				mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+				mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 			})
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
 			if (response.data.exercise_types.subjective === 0) {
 
-				var arr =[];
-				for(var i=0;i<this.state.columnstwo.length;i++){
+				var arr = [];
+				for (var i = 0; i < this.state.columnstwo.length; i++) {
 					var item = this.state.columnstwo[i];
-					if(item.title==="客观题得分"){
-					}
-					else if(item.title==="主观题得分"){
-					}
-					else if(this.props.isNotMember()===true&&item.title==="学号") {
+					if (item.title === "客观题得分") {
+					} else if (item.title === "主观题得分") {
+					} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-					}
-					else{
+					} else {
 						arr.push(item);
 					}
 				}
 
-				var arr2 =[];
-				for(var i=0;i<this.state.columns.length;i++){
+				var arr2 = [];
+				for (var i = 0; i < this.state.columns.length; i++) {
 					var item = this.state.columns[i];
-					if(item.title==="客观题得分"){
-					}
-					else if(item.title==="主观题得分"){
-					}
-					else if(this.props.isNotMember()===true&&item.title==="学号") {
+					if (item.title === "客观题得分") {
+					} else if (item.title === "主观题得分") {
+					} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-					}
-					else{
+					} else {
 						arr2.push(item);
 					}
 				}
@@ -1784,7 +1964,7 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: false,
 				})
 			}
-			this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user,response.data.exercise_types);
+			this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user, response.data.exercise_types);
 		}).catch((error) => {
 			//console.log(error)
 			this.setState({
@@ -1819,11 +1999,11 @@ class Studentshavecompletedthelist extends Component {
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-						subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-						finalscore:exercise_users[i].has_comment===true?"已评阅":"评阅",
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						finalscore: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
 						user_id: exercise_users[i].user_id,
-						commit_method:exercise_users[i].commit_method,
-						has_comment:exercise_users[i].has_comment
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment
 					})
 				} else {
 					datalist.push({
@@ -1839,11 +2019,11 @@ class Studentshavecompletedthelist extends Component {
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-						subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-						finalscore:exercise_users[i].has_comment===true?"已评阅":"--",
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						finalscore: exercise_users[i].has_comment === true ? "已评阅" : "--",
 						user_id: exercise_users[i].user_id,
-						commit_method:exercise_users[i].commit_method,
-						has_comment:exercise_users[i].has_comment
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment
 					})
 					indexi++;
 				}
@@ -1867,17 +2047,14 @@ class Studentshavecompletedthelist extends Component {
 					// this.state.columnsys.map((item,key)=>{
 					//
 					// })
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -1890,7 +2067,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
@@ -1901,18 +2078,14 @@ class Studentshavecompletedthelist extends Component {
 					//分班小于0不显示分班
 					//6ge
 
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
-						}
-						else if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
-						}
-						else{
+						if (item.title === "分班") {
+						} else if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
+						} else {
 							arr.push(item);
 						}
 					}
@@ -1926,7 +2099,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
@@ -1941,16 +2114,14 @@ class Studentshavecompletedthelist extends Component {
 					//显示分班
 					//8ge
 
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -1965,28 +2136,25 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
-						columnsys:	arr,
+						columnsys: arr,
 					})
 				} else {
 					//不显示分班
 					//7ge
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
-						}
-						else if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "分班") {
+						} else if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2000,7 +2168,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
@@ -2017,13 +2185,12 @@ class Studentshavecompletedthelist extends Component {
 				//console.log("2548包含主观题不包含分班");
 
 				if (response.data.exercise_types.groups_count > 0) {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2035,23 +2202,21 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				} else {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
+						if (item.title === "分班") {
 
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2063,8 +2228,8 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
-						columnsys:arr,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
+						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
@@ -2081,7 +2246,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: columnsystwo,
 						subjective: response.data.exercise_types.subjective,
@@ -2089,16 +2254,14 @@ class Studentshavecompletedthelist extends Component {
 						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				} else {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
+						if (item.title === "分班") {
 
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2110,7 +2273,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
@@ -2158,12 +2321,21 @@ class Studentshavecompletedthelist extends Component {
 		}).then((response) => {
 			// //console.log("528");
 			// //console.log(JSON.stringify(response));
-			if(response===undefined){
+			if (response === undefined) {
 				return
 			}
+
+
 			this.setState({
 				loadingstate: false,
 			})
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
 			// //console.log(response);
 			// //console.log(1997);
 			this.Generatenewdatasy(response.data.exercise_users, response);
@@ -2181,13 +2353,13 @@ class Studentshavecompletedthelist extends Component {
 				unlimited: 0,
 				course_groupyslsthree: undefined,
 				loadingstate: true,
-				page:1
+				page: 1
 			})
 		} else {
 			this.setState({
 				unlimited: 0,
 				course_groupyslsthree: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
@@ -2207,13 +2379,13 @@ class Studentshavecompletedthelist extends Component {
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		} else {
 			this.setState({
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 
@@ -2228,13 +2400,13 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: true,
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
-					page:1,
+					page: 1,
 				})
 			}
 
@@ -2268,13 +2440,13 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: true,
 					course_groupyslstwo: checkedValues,
 					unlimiteds: 1,
-					page:1,
+					page: 1,
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: checkedValues,
 					unlimiteds: 1,
-					page:1,
+					page: 1,
 				})
 			}
 
@@ -2311,13 +2483,13 @@ class Studentshavecompletedthelist extends Component {
 					unlimited: 0,
 					course_groupyslsthree: undefined,
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
-					page:1
+					page: 1
 				})
 			}
 
@@ -2348,13 +2520,13 @@ class Studentshavecompletedthelist extends Component {
 					unlimited: 1,
 					loadingstate: true,
 					course_groupyslsthree: checkedValues,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					unlimited: 1,
 					course_groupyslsthree: checkedValues,
-					page:1
+					page: 1
 				})
 			}
 
@@ -2370,14 +2542,14 @@ class Studentshavecompletedthelist extends Component {
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		} else {
 			this.setState({
 				unlimitedtwo: 0,
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 
@@ -2393,13 +2565,13 @@ class Studentshavecompletedthelist extends Component {
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
 					loadingstate: true,
-					page:1,
+					page: 1,
 				})
 			} else {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
-					page:1,
+					page: 1,
 				})
 			}
 
@@ -2431,14 +2603,14 @@ class Studentshavecompletedthelist extends Component {
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					checkedValuesineinfo: checkedValues,
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
-					page:1
+					page: 1
 				})
 
 			}
@@ -2460,7 +2632,7 @@ class Studentshavecompletedthelist extends Component {
 			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			}
 
@@ -2477,7 +2649,7 @@ class Studentshavecompletedthelist extends Component {
 		if (this.state.loadingstate === false) {
 			this.setState({
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		}
 
@@ -2487,14 +2659,15 @@ class Studentshavecompletedthelist extends Component {
 
 
 	};
+
 	_getRequestParams() {
-		const { order, checkedValuesineinfo,course_groupyslstwo ,searchtext, page ,limit,course_groupyslsthree} = this.state
+		const {order, checkedValuesineinfo, course_groupyslstwo, searchtext, page, limit, course_groupyslsthree} = this.state
 		return {
 			page,
-			review:course_groupyslsthree,
-			commit_status:course_groupyslstwo,
-			search:searchtext,
-			exercise_group_id:checkedValuesineinfo,
+			review: course_groupyslsthree,
+			commit_status: course_groupyslstwo,
+			search: searchtext,
+			exercise_group_id: checkedValuesineinfo,
 			limit: limit,
 			order,
 		}
@@ -2694,14 +2867,13 @@ class Studentshavecompletedthelist extends Component {
 	Adjustment = (e) => {
 		// console.log("Adjustment");
 		// console.log(e);
-		if(this.state.objective_score===0&&this.state.subjective_score===0){
+		if (this.state.objective_score === 0 && this.state.subjective_score === 0) {
 			this.props.showNotification('试卷题型分被限制为0分，不能调分，请点击编辑试卷修改题型分数');
 
 			return
 		}
 
 
-
 		this.setState({
 			testpapergradingboll: true,
 			exeuserid: e,
@@ -2743,7 +2915,6 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 
-
 	render() {
 		const isAdmin = this.props.isAdmin();
 
@@ -2767,7 +2938,7 @@ class Studentshavecompletedthelist extends Component {
 					}}>
 						{/*老师*/}
 						{
-							this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===1 ?
+							this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 								<div className="edu-back-white">
 									<NoneData></NoneData>
 								</div>
@@ -2787,7 +2958,7 @@ class Studentshavecompletedthelist extends Component {
 											Saves={(value, num) => this.Testpapergrading(value, num)}
 										/> : ""
 									}
-									<div className="edu-back-white" >
+									<div className="edu-back-white">
 										<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
 											{/*你的评阅：*/}
@@ -2988,7 +3159,7 @@ class Studentshavecompletedthelist extends Component {
 							<div className=" clearfix "
 									 style={{"margin": "0 auto", "padding-bottom": "100px", minWidth: " 1200px"}}>
 								{
-									this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ?
+									this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 										<div className="edu-back-white">
 											<NoneData></NoneData>
 										</div>
@@ -3075,7 +3246,7 @@ class Studentshavecompletedthelist extends Component {
 								minWidth: " 1200px"
 							}}>
 								{
-									this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ?
+									this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 										<div className="edu-back-white">
 											<NoneData></NoneData>
 										</div>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 70e561c73..771c0dda8 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -305,7 +305,7 @@ class ShixunhomeWorkItem extends Component{
           <div className="clearfix ds pr contentSection" >
 						<style>{`
             .maxwidth333{
-                max-width: 333px;
+                max-width: 300px;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;
@@ -378,7 +378,7 @@ class ShixunhomeWorkItem extends Component{
                 }
 
 
-                {this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400  "}>重命名</a>:""}
+                {this.props.isAdmin()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400  "}>重命名</a>:""}
 								{/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
 								<WordsBtn className="btn colorblue  font-16 ml15 fontweight400  "  to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
 							</span>:""}
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index cb0d40c32..f9d059669 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -1188,7 +1188,7 @@ class ShixunHomework extends Component{
 								</span>}
 							</span>
               <li className="fr">
-								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
+								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
 									<span>
                     <WordsBtn style="blue" className={"mr30 font-16"}>
 											<Link className="color4CACFF" to={`/classrooms/${this.props.match.params.coursesId}/ordering/shixun_homework/${main_id&&main_id}`}>调整排序</Link>
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
index 2d0f61a0e..0cfb3381a 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
@@ -308,7 +308,7 @@ class OfficialAcademicTranscript extends Component {
 					      overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
-				        max-width: 210px;
+				        max-width: 200px;
 						    text-align: left !important;
 					}
 					.TaskForms{