diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js
index 449f79a7a..52aebcf7c 100644
--- a/public/react/src/context/TPIContextProvider.js
+++ b/public/react/src/context/TPIContextProvider.js
@@ -571,6 +571,9 @@ pop_box_new(htmlvalue, 480, 182);
 	}
 	closeTaskResultLayer() {
 		this.setState({
+			game: (this.state.game.status == 2 ? update(this.state.game, {
+				isPassThrough: { $set: true },
+			}) : this.state.game) ,
 			currentGamePassed: false
 		})
 	}
@@ -581,7 +584,7 @@ pop_box_new(htmlvalue, 480, 182);
 		let currentGamePassed = false
 		if (challenge_chooses_count === choose_correct_num) {
 			game.status = 2;
-			game.isPassThrough = true
+			// game.isPassThrough = true
 			game.next_game = next_game;
 
 			currentGamePassed = true;
@@ -734,7 +737,7 @@ pop_box_new(htmlvalue, 480, 182);
 		compileSuccess && this.language_display(response);
 		if (currentGamePassed) {
 			game.status = 2;
-			game.isPassThrough = true
+			// game.isPassThrough = true
 			game.next_game = next_game;	
 		} else {
 			this.showDialog({
diff --git a/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js b/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
index 3f4f1a0ca..2f08d08a1 100644
--- a/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
+++ b/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
@@ -105,4 +105,4 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
         </ModalWrapper>
     )
 }
-export default useMemo(CourseGroupChooserModal)
\ No newline at end of file
+export default (CourseGroupChooserModal)
\ No newline at end of file
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a83fec2ee..1823f43bb 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1591,6 +1591,7 @@ class Listofworksstudentone extends Component {
 
 	// 设置数据
 	seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
+	 debugger
 		let {page, limit} = this.state;
 		let datalist = [];
 		let columns = this.state.columns;
@@ -2343,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
@@ -2632,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.time_status!==undefined&&teacherdata.time_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>
 
@@ -2799,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/page/main/ActionView.js b/public/react/src/modules/page/main/ActionView.js
index fff7d416d..d8638efb8 100644
--- a/public/react/src/modules/page/main/ActionView.js
+++ b/public/react/src/modules/page/main/ActionView.js
@@ -64,7 +64,7 @@ class ActionView extends Component {
 	      	<div className="-flex -layout-h" id="game_operate_action">
 	      		<span className="mt10 -flex c_grey ml15" id="time-consuming">
 	      			{!gameBuilding && record ? 
-	      				<Tooltip title={ "本次评测耗时" }>
+	      				<Tooltip title={ "本次评测耗时(编译、运行总时间)" }>
 	      					<span>{ record } 秒</span>
 	      				</Tooltip>
 	      			: ""}
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>
                                                         )
                                                     })
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 33eac0e6b..06076a3cd 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -84,7 +84,7 @@ class InfosProject extends Component{
   // 进入项目
   turnToCourses=(url,flag)=>{
     if(flag){
-      this.props.history.push(url);
+			window.location.href=url;
     }
   }
 
diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js
index 2b5f3cbee..59fee95e9 100644
--- a/public/react/src/search/SearchPage.js
+++ b/public/react/src/search/SearchPage.js
@@ -94,6 +94,7 @@ class SearchPage extends Component{
 	//获取数据
 	getdata=(pages,type,keywords)=>{
 		let url = "/search.json";
+		this.setState({ loading: true })
 		axios.get(url,{params:{
 				keyword:keywords,
 				type:type,
@@ -101,6 +102,8 @@ class SearchPage extends Component{
 				per_page:this.state.perpages,
 			}
 		}).then((response) => {
+			this.setState({ loading: false })
+			
 			if(response === undefined){
 
 				return
@@ -118,11 +121,19 @@ class SearchPage extends Component{
 	}
 
 	render(){
-		let {tab,count,data,page,perpages}=this.state;
+		let {tab,count,data,page,perpages, type }=this.state;
 
 
 		return(
 			<div className="newMain clearfix">
+				<style>{`
+					.ziticor.iconfont {
+						margin-bottom: 2px;
+						display: inline-block;
+						margin-right: 4px;
+						font-size: 16px !important;
+					}
+				`}</style>
 				<div className="headersear" >
 					<div style={{height:"53px"}}></div>
 					<Search
@@ -145,7 +156,7 @@ class SearchPage extends Component{
 					</div>
 				</div>
 				{
-					JSON.stringify(data) === "[]" ?
+					JSON.stringify(data) === "[]" && this.state.loading != true ?
 
 						<div id="forum_list" className="forum_table">
 							<div className="mh650 bjyss">
@@ -227,13 +238,75 @@ class SearchPage extends Component{
 													}
 													</div>
 
+													
+
+													<div className="mt20">
+														{/* <span className="ziticor">
+															<i className="fa fa-user ziticor"></i><span className="ml10">主讲：{item.author_name}</span>
+														</span>
+														<span className="ml10 ziticor "><span>{item.author_school_name}</span></span>  
+														<span className="ml20 ziticor">
+															<i className="iconfont icon-shixunguanqia ziticor"></i>
+															<span>任务:
+																<span className="ml10 ziticor">{item.challenges_count===undefined?0:item.challenges_count}</span>
+															</span>
+														</span> 
+														<span className="ml20 ziticor">
+															<i className="iconfont icon-chengyuan ziticor"></i>
+															<span>学习人数:
+																<span className="ml10 ziticor">{item.study_count===undefined?0:item.study_count}</span>
+															</span>
+														</span> */}
+
+														<span className="ziticor">
+															{/* <i className="fa fa-user ziticor"></i> */}
+															<span className="ml10">{item.author_name}</span></span>
+															<span className="ml10 ziticor "><span>{item.author_school_name}</span>
+														</span>  
+														{!!item.challenges_count && <span className="ml20 ziticor">
+															<i className="iconfont icon-shixunguanqia ziticor"></i>
+															<span>任务:
+																<span className="ml10 ziticor">{item.challenges_count}</span>
+															</span>
+														</span> }
+														{!!item.study_count && <span className="ml20 ziticor">
+															<i className="iconfont icon-chengyuan ziticor"></i>
+															<span>学习人数:
+																<span className="ml10 ziticor">{item.study_count}</span>
+															</span>
+														</span>}
+
+														{!!item.stage_shixuns_count && <span className="ml20 ziticor">
+															<i className="iconfont icon-shixunguanqia ziticor"></i>
+															<span>实训数:
+																<span className="ml10 ziticor">{item.stage_shixuns_count}</span>
+															</span>
+														</span>}
+														{type == 'subject' && !!item.visits_count && <span className="ml20 ziticor">
+															<i className="iconfont icon-chengyuan ziticor" style={{ 'margin-bottom': '1px' }}></i>
+															<span>访问数:
+																<span className="ml10 ziticor">{item.visits_count}</span>
+															</span>
+														</span>}
+
+														{!!item.members_count && <span className="ml20 ziticor">
+															<i className="iconfont icon-chengyuan ziticor"></i>
+															<span>成员数:
+																<span className="ml10 ziticor">{item.members_count}</span>
+															</span>
+														</span>}
+
+														{!!item.all_replies_count && <span className="ml20 ziticor">
+															<i className="iconfont icon-huifu1 ziticor"></i>
+															<span>回复数:<span className="ml10 ziticor">{item.all_replies_count}</span></span>
+														</span> }
+															
+														{/* <span className="ml20 ziticor">
+															<i className="iconfont icon-chengyuan ziticor"></i>
+														<span>
+														学习人数:<span className="ml10 ziticor">{item.study_count===undefined?0:item.study_count}</span></span></span> */}
 
-													<div className="foohter">
-														<div className="ziticor"><i className="fa fa-user ziticor"></i><span className="ml10">主讲：{item.author_name}</span></div>
-														<div className="ml10 ziticor "><span>{item.author_school_name}</span></div>  <div className="ml20 ziticor"><i className="iconfont icon-shixunguanqia ziticor"></i><span>任务:<span className="ml10 ziticor">{item.challenges_count===undefined?0:item.challenges_count}</span></span></div>
-														<div className="ml20 ziticor"><i className="iconfont icon-chengyuan ziticor"></i><span>学习人数:<span className="ml10 ziticor">{item.study_count===undefined?0:item.study_count}</span></span></div>
 													</div>
-
 												</div>
 											</div>