diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 7f9ab561f..1823f43bb 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2344,17 +2344,15 @@ class Listofworksstudentone extends Component {
 								<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
 									<li className="clearfix ">
 										<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-										<span>
-									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
-										(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
-											计算成绩
-										</div>:""):
-										teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
-											(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
-													计算成绩
-												</div>:"")
-											}
-						  	</span>
+
+											{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+																{teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "":
+																	computeTimetype===true&&this.props.isNotMember()===false?	<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+																		计算成绩
+																	</div>:<div className={"computeTimes font-13"}>
+																		计算成绩
+																	</div>}
+															</span>}
 
 										<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 											<Search
@@ -2633,21 +2631,15 @@ class Listofworksstudentone extends Component {
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
 															{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-													{computeTimetype===true?
-														(this.props.isNotMember()===false?
-															<div className={"computeTime font-13"} onClick={this.setComputeTime}>
-																计算成绩
-															</div>
-															:"")
-														:
-														(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
-															this.props.isNotMember()===false?
-																<div className={"computeTimes font-13"}>
-																	计算成绩
-																</div>
-																:"")
-													}
-												</span>}
+
+																{teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "":
+																	computeTimetype===true&&this.props.isNotMember()===false?	<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+																		计算成绩
+																	</div>:<div className={"computeTimes font-13"}>
+																		计算成绩
+																	</div>}
+															</span>}
+
 
 														</div>
 
@@ -2800,17 +2792,16 @@ class Listofworksstudentone extends Component {
 														<div className="fr">
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-													{computeTimetype===true?
-														(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
-															计算成绩
-														</div>:""):
-														teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
-															(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
-																计算成绩
-															</div>:"")
-													}
-												 </span>}
+															{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":
+															 <span>
+																 {teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status===0?"":
+																	 this.props.isNotMember()===false&&computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+																	 计算成绩
+																 </div>:<div className={"computeTimes font-13"}>
+																	 计算成绩
+																 </div>}
+															 </span>
+															}
 
 														</div>
 														{/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
index 4e9b22831..f0a7ff941 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
@@ -60,8 +60,9 @@ class OfficialAcademicTranscript extends Component {
 			className:"TaskForms",
 			render: (text, record) => (
 				<span>
-					<span className={"task-hide"} style={{color:"#676767"}}><a className="tasknameName font-14" onClick={()=>this.myjumptopic("id"+record.customs)} title={record.taskname.name} >{record.taskname.name}</a></span>
-           {record.taskname.complete_status===2?<span className={"tasknamebox ml10"}>延时</span>:record.taskname.complete_status===3?<span className={"tasknameboxs ml10"}>延时</span>:""}
+					<span className={"task-hide"} style={{color:"#676767"}}><a className="tasknameName font-14" onClick={()=>this.myjumptopic("id"+record.customs)} title={record.taskname.name} >
+						{record.taskname.name}{record.taskname.complete_status===2?<span className={"tasknamebox ml10"}>延时</span>:record.taskname.complete_status===3?<span className={"tasknameboxs ml10"}>延时</span>:""}
+					</a></span>
         </span>
 			),
 		}, {
@@ -145,8 +146,11 @@ class OfficialAcademicTranscript extends Component {
 					}
 
 					.tasknameboxs{
-					   color: #666666 !important;
-					   background:rgba(237,237,237,1) !important;
+				    width: 50px;
+						height: 24px;
+						border: 1px solid rgba(221,23,23,1);
+						color: rgba(221,23,23,1);
+						border-radius: 12px;
 					}
 
 				  .ant-table-tbody > tr > td{
@@ -167,7 +171,7 @@ class OfficialAcademicTranscript extends Component {
 					     overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
-						    width: 500px;
+						    width: 450px;
 						    text-align: left !important;
 					}
 					.TaskForms{
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 39663e6be..184b6313a 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -200,7 +200,8 @@ class Newshixuns extends Component {
 						languagewritetype:false,
 						systemenvironmenttype:false,
 						testcoderunmodetype:false,
-					  attachmentidstype:false
+					  attachmentidstype:false,
+				  	datalisttype:false
         }
     }
 
@@ -369,20 +370,32 @@ class Newshixuns extends Component {
     }
 
     shixunScopeInput = (e, id) => {
+       let types=false
         let {scope_partment} = this.state;
         let datalist = scope_partment;
         if (datalist === undefined) {
             datalist = []
         }
-        datalist.push(e)
-        // else{
-        //   datalist[id]=e
-        // }
 
-        this.setState({
-            scope_partment: datalist,
-            onSearchvalue: ""
-        });
+				datalist.map((item,key)=>{
+					if(e===item){
+						types=true
+						 this.setState({
+							 datalisttype:true
+						 })
+						return
+					}
+				})
+
+			 if(types===false){
+				 datalist.push(e)
+				 this.setState({
+					 scope_partment: datalist,
+					 onSearchvalue: ""
+				 });
+			 }
+
+
     }
 
     deleteScopeInput = (key) => {
@@ -495,7 +508,9 @@ class Newshixuns extends Component {
     }
 
     shixunHandleSearch = (value) => {
+
         this.shixunsfetch(value, departmentslist => this.setState({departmentslist}));
+
         this.setState({
             onSearchvalue: ""
         })
@@ -787,7 +802,7 @@ class Newshixuns extends Component {
     render() {
         const { getFieldDecorator } = this.props.form;
         const  thiss=this;
-        let {testcoderunmode ,systemenvironment,languagewrite,deleteisnot, fileList,TimePickervalue, scope_partmenttype, opensmail, newshixunlist, name, scope_partment, departmentslist, postapplyvisible, sendsure_applyvalue, postapplytitle, shixun_nametype, main_types, trainee_types, SelectTheCommandtype, opers, operss, onSearchvalue} = this.state;
+        let {testcoderunmode ,systemenvironment,languagewrite,deleteisnot, fileList,TimePickervalue, scope_partmenttype, opensmail, newshixunlist, name, scope_partment, departmentslist, postapplyvisible, sendsure_applyvalue, postapplytitle, shixun_nametype, main_types, trainee_types, SelectTheCommandtype, opers, datalisttype, onSearchvalue} = this.state;
         let options
         if (departmentslist != undefined) {
             options = this.state.departmentslist.map((d, k) => {
@@ -1142,6 +1157,7 @@ class Newshixuns extends Component {
                                                     </Select>
                                                 </div>
                                                 <span className="color-grey-9">(搜索选中添加单位名称)</span>
+																							{this.state.datalisttype===true?<span className="color-red ml10">请勿选择重复单位</span>:""}
                                                 {/*<a className="white-btn orange-btn fl mt1 use_scope-btn" onClick={this.adduse_scopeinput}>+ 添加</a>*/}
                                             </div>
                                         </div>
@@ -1153,7 +1169,7 @@ class Newshixuns extends Component {
                                                         return (
                                                             <li className="task_tag_span" key={key}><span>{item}</span>
                                                                 <a style={{color: 'rgba(0,0,0,.25)'}}
-                                                                   onClick={(key) => this.deleteScopeInput(key)}>×</a>
+                                                                   onClick={() => this.deleteScopeInput(key)}>×</a>
                                                             </li>
                                                         )
                                                     })