diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 636214885..30a0af582 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -61,6 +61,7 @@ class Listofworks extends Component {
 			props: props,
 			data: [],
 			page: 1,
+			computeTimetype:true,
 			limit: 20,
 			loadingstate: true,
 			order: "update_time",
@@ -1182,8 +1183,6 @@ class Listofworks extends Component {
 		}).catch((error) => {
 			console.log(error)
 		});
-
-
 	}
 // 立即发布
 	homeworkstartend = (ds,endtime) => {
@@ -1313,10 +1312,24 @@ class Listofworks extends Component {
 
 	}
 
+	setComputeTime=()=>{
+    this.setState({
+			computeTimetype:false
+		})
+		let homeworkid = this.props.match.params.homeworkid;
+		let url = "/homework_commons/"+homeworkid+"/update_score.json";
+
+		axios.get(url).then((response) => {
+			this.props.showNotification(`${response.data.message}`);
+		}).catch((error) => {
+			console.log(error)
+		});
+
+	}
 	render() {
 		// console.log("Listofworks.js000")
 
-		let {columns, page, boolgalist,limit,experience,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
+		let {columns,computeTimetype, page, boolgalist,limit,experience,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
 		//
 		// console.log(teacherdata&&teacherdata.shixun_identifier)
 		// console.log(course_group_info)
@@ -1345,8 +1358,8 @@ class Listofworks extends Component {
 							{
 								`
               body {
-         overflow: hidden !important;
-       }
+							 overflow: hidden !important;
+						 }
               `
 							}
 						</style>
@@ -1418,6 +1431,7 @@ class Listofworks extends Component {
 
 					</div>
 
+
 					<div className="edu-back-white">
 						<div className="stud-class-set bor-bottom-greyE ">
 							<div className=" clearfix edu-back-white poll_list">
@@ -1481,10 +1495,83 @@ class Listofworks extends Component {
 							</div>
 						</div>
 
+						<style>
+							{`
+							.startbox{
+					    height: 48px;
+					    background: rgba(255,104,0,0.1);
+					    line-height: 48px;
+
+					    text-align: center;
+							}
+
+							.startfont{
+							 font-size:14px;
+							font-family:MicrosoftYaHei;
+							font-weight:400;
+							color:rgba(255,104,0,1);
+							}
+
+							.computeTime{
+								width: 73px;
+								height: 24px;
+								display: inline-block;
+								padding: 5px;
+								text-align: center;
+								line-height: 13px;
+								color: #4CACFF;
+								border: 1px solid #4CACFF;
+							  cursor: pointer;
+							}
+
+							.computeTimes{
+							  width: 73px;
+								height: 24px;
+								display: inline-block;
+								padding: 5px;
+								text-align: center;
+								line-height: 13px;
+								color: #C5C5C5;
+								border: 1px solid #EDEDED;
+								background:#EDEDED;
+							  cursor: pointer;
+							}
+
+							`}
+						</style>
+						{computeTimetype===false?<li className="clearfix startbox">
+							<span className={"startfont"}>
+				         	正在执行成绩计算，请稍后刷新页面查看结果
+								  温馨提示：执行时间因作品数量而异
+							</span>
+						</li>:""}
 
 						{/*作品状态GraduationTaskssettinglist*/}
 						<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>
+									{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+												计算成绩
+									</div>:<div className={"computeTimes font-13"} onClick={this.setComputeTime}>
+										计算成绩
+									</div>}
+						  	</span>
+
+								<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
+									<Search
+										placeholder="请输入姓名或学号搜索"
+										id="subject_search_input"
+										autoComplete="off"
+										value={searchtext}
+										onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
+										onInput={this.inputSearchValues}
+										onSearch={this.searchValues}
+									></Search>
+								</div>
+							</li>
+
+							<li className="clearfix mt10">
 
 								<span className="fl  mr10 color-grey-8 ">作品状态：</span>
 								<span className="fl "><a id="graduation_comment_no_limit"
@@ -1508,17 +1595,7 @@ class Listofworks extends Component {
 								</CheckboxGroup>
 								{/*请输入姓名或学号搜索*/}
 
-								<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
-									<Search
-										placeholder="请输入姓名或学号搜索"
-										id="subject_search_input"
-										autoComplete="off"
-										value={searchtext}
-										onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
-										onInput={this.inputSearchValues}
-										onSearch={this.searchValues}
-									></Search>
-								</div>
+
 							</li>
 
 
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 7636db4e3..2974bf6ac 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -41,6 +41,7 @@ class Listofworksstudentone extends Component {
 			data: [],
 			datas: [],
 			view_report:false,
+			computeTimetype:true,
 			page: 1,
 			pages: 1,
 			limit: 20,
@@ -746,21 +747,77 @@ class Listofworksstudentone extends Component {
 		this.Getalistofworkstwo(this.state.order, "", "", "", pageNumber, this.state.limit);
 	}
 
+	setComputeTime=()=>{
+		this.setState({
+			computeTimetype:false
+		})
+		let homeworkid = this.props.match.params.homeworkid;
+		let url = "/homework_commons/"+homeworkid+"/update_student_score.json";
+
+		axios.get(url).then((response) => {
+			this.props.showNotification(`${response.data.message}`);
+		}).catch((error) => {
+			console.log(error)
+		});
+
+	}
 	render() {
-		let {visibles, game_list,columns, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate} = this.state;
+		let {visibles, game_list,columns, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
 
 		return (
 			teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
 				// 学生不能查看别人的
 				<div className="newMain clearfix ">
+					<style>
+						{`
+							.startbox{
+					    height: 48px;
+					    background: rgba(255,104,0,0.1);
+					    line-height: 48px;
+
+					    text-align: center;
+							}
+
+							.startfont{
+							 font-size:14px;
+							font-family:MicrosoftYaHei;
+							font-weight:400;
+							color:rgba(255,104,0,1);
+							}
+			     	.computeTime{
+								width: 73px;
+								height: 24px;
+								display: inline-block;
+								padding: 5px;
+								text-align: center;
+								line-height: 13px;
+								color: #4CACFF;
+								border: 1px solid #4CACFF;
+							  cursor: pointer;
+							}
+
+							.computeTimes{
+							  width: 73px;
+								height: 24px;
+								display: inline-block;
+								padding: 5px;
+								text-align: center;
+								line-height: 13px;
+								color: #C5C5C5;
+								border: 1px solid #EDEDED;
+								background:#EDEDED;
+							  cursor: pointer;
+							}
+							`}
+					</style>
 					{visibles === true ?
 						<div>
 							<style>
 								{
 									`
               body {
-         overflow: hidden !important;
-       }
+							 overflow: hidden !important;
+						 }
               `
 								}
 							</style>
@@ -833,6 +890,14 @@ class Listofworksstudentone extends Component {
 							</div>
 
 
+							{computeTimetype===false?<li className="clearfix startbox mb20">
+									<span className={"startfont"}>
+								      正在执行成绩计算，请稍后刷新页面查看结果
+								      温馨提示：执行时间因作品数量而异
+									</span>
+							</li>:""}
+
+
 							{JSON.stringify(data) !== "[]" ?
 								<div>
 									<div id="graduation_work_list"
@@ -843,17 +908,32 @@ class Listofworksstudentone extends Component {
 											 }}>
 
 										<div className="clearfix">
-                                <span className="fl color-grey-6 font-12"><span
-																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}</span>已交<span
-																	className="ml10">{teacherdata === undefined ? "" : teacherdata.uncommit_count}</span><span>未交</span>
-																	{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
-																		<span className="ml20">{teacherdata.left_time.status}</span>
-																	}
-																	{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
-																		<span className="ml20"
-																					style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>
-																	}
-                                </span>
+
+											<span className="fl color-grey-6 font-12">
+												<span
+												className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}</span>已交<span
+												className="ml10">{teacherdata === undefined ? "" : teacherdata.uncommit_count}</span><span>未交</span>
+												{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
+													<span className="ml20">{teacherdata.left_time.status}</span>
+												}
+												{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
+													<span className="ml20"
+																style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>
+												}
+											</span>
+
+											<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>
+												<span>
+													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+														计算成绩
+													</div>:<div className={"computeTimes font-13"} onClick={this.setComputeTime}>
+														计算成绩
+													</div>}
+												</span>
+
+											</div>
 
 										</div>
 
@@ -962,17 +1042,14 @@ class Listofworksstudentone extends Component {
 								</div>
 							</div>
 
+							{computeTimetype===false?<li className="clearfix startbox mb20">
+									<span className={"startfont"}>
+								      正在执行成绩计算，请稍后刷新页面查看结果
+								      温馨提示：执行时间因作品数量而异
+									</span>
+							</li>:""}
 
-							{/*<div id="graduation_work_list" style={{padding: '0px 40px 10px 40px'}}>*/}
 
-							{/*    <div className="clearfix">*/}
-							{/*        <span className="fl color-grey-6 font-12"><span className="color-orange-tip">89</span>已交<span*/}
-							{/*            className="ml10">9000</span><span>未交</span>    <span className="ml20">剩余提交时间:</span><span*/}
-							{/*            className="ml20">{this.state.day}天 {this.state.hour}:{this.state.minute}:{this.state.second}</span></span>*/}
-
-							{/*    </div>*/}
-
-							{/*</div>*/}
 							<div className="edu-table edu-back-white ">
 								{data === undefined ? "" : <Table
 									style={styletable}
@@ -991,33 +1068,51 @@ class Listofworksstudentone extends Component {
 										"margin-bottom": "10px"
 									}}>
 										<div className="clearfix">
-                              <span className="fl color-grey-6 font-12"><span
-																className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}</span>已交<span
-																className="ml10">{teacherdata === undefined ? "" : teacherdata.uncommit_count}</span><span>未交</span>
-																{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
-																	<span className="ml20">{teacherdata.left_time.status}</span>}
-																{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
-																	<span className="ml20"
-																				style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>}
-
-                              </span>
-											<div className="fr  edu-menu-panel">
-												<ul>
-													<li className="edu-position edu-position-hidebox">
-														<a className="font-12 ">
-															{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
-														<i className="iconfont icon-xiajiantou ml5 font-12 "></i>
-														<ul className="edu-position-hide undis mt10">
-															<li><a onClick={(e) => this.funorder("updated_at")} data-remote="true"
-																		 className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
-															<li><a onClick={(e) => this.funorder("work_score")} data-remote="true"
-																		 className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
-															<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"
-																		 className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
-														</ul>
-													</li>
-												</ul>
-											</div>
+											<span className="fl color-grey-6 font-12">
+												<span className="color-orange-tip">
+													{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}
+												</span>已交
+												<span className="ml10">{teacherdata === undefined ? "" : teacherdata.uncommit_count}</span><span>未交</span>
+												{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
+													<span className="ml20">{teacherdata.left_time.status}</span>}
+												{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
+													<span className="ml20"
+																style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>}
+
+
+												 <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>
+												 <span>
+													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+														计算成绩
+													</div>:<div className={"computeTimes font-13"} onClick={this.setComputeTime}>
+														计算成绩
+													</div>}
+												 </span>
+
+											   </div>
+
+											</span>
+
+											{/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}
+											{/*<div className="fr  edu-menu-panel">*/}
+												{/*<ul>*/}
+													{/*<li className="edu-position edu-position-hidebox">*/}
+														{/*<a className="font-12 ">*/}
+															{/*{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>*/}
+														{/*<i className="iconfont icon-xiajiantou ml5 font-12 "></i>*/}
+														{/*<ul className="edu-position-hide undis mt10">*/}
+															{/*<li><a onClick={(e) => this.funorder("updated_at")} data-remote="true"*/}
+																		 {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>*/}
+															{/*<li><a onClick={(e) => this.funorder("work_score")} data-remote="true"*/}
+																		 {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>*/}
+															{/*<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"*/}
+																		 {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>*/}
+														{/*</ul>*/}
+													{/*</li>*/}
+												{/*</ul>*/}
+											{/*</div>*/}
 
 										</div>