From 42e47bd447beb083dd922f37f881ec26c776a6cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 16 Dec 2019 16:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                 |  1 -
 .../shixunHomework/Listofworksstudentone.js   |  8 +++----
 .../modules/courses/statistics/Statistics.js  | 24 ++++++++++++++-----
 .../Challenges/Challengesjupyter.js           |  1 +
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index acd18e6c3..95b08ecb4 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -52,7 +52,6 @@ export function initAxiosInterceptors(props) {
 			//proxy="http://47.96.87.25:48080"
 			proxy="https://pre-newweb.educoder.net"
       proxy="https://test-newweb.educoder.net"
-      proxy="https://test-jupyterweb.educoder.net"
 	     //proxy="http://192.168.2.63:3001"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index ab75b6c89..9c1d2146c 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -269,7 +269,7 @@ class Listofworksstudentone extends Component {
 					),
 				},
 				{
-					title: '提交状态',
+					title: '作品状态',
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: "center",
@@ -638,7 +638,7 @@ class Listofworksstudentone extends Component {
 					),
 				},
 				{
-					title: '提交状态',
+					title: '作品状态',
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: "center",
@@ -967,7 +967,7 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '提交状态',
+					title: '作品状态',
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: 'center',
@@ -1315,7 +1315,7 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '提交状态',
+					title: '作品状态',
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: 'center',
diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js
index 20427a1fa..d8647870e 100644
--- a/public/react/src/modules/courses/statistics/Statistics.js
+++ b/public/react/src/modules/courses/statistics/Statistics.js
@@ -392,24 +392,36 @@ class Statistics extends Component{
 			)
 		}
 
-		// console.log(this.props.isAdmin)
+		 // console.log("Statistics");
+		 // console.log(this.props.user.course_is_end)
 
-
-		const operations = <React.Fragment>
+     const course_is_endismy=this.props&&this.props.user&&this.props.user.course_is_end;
+		 const operations = <React.Fragment>
 			{course_grouptype===false||this.state.course_groups.length===0?"":
+				this.props.isAdmin()===true?
 					<Dropdownbox
 						{...this.props}
 						{...this.state}
 						postwork_scoredata={(group_idss)=>this.getwork_scoredata(1,group_idss,'desc')
 						}
 					/>
+					:""
 			}
 			{
 				this.state.activeKey==="1"?
-					<a className={"ml20 ant-btn-link"} onClick={()=>this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩</a>
+					(
+						course_is_endismy===false?
+							<a className={"ml20 ant-btn-link"} onClick={()=>this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩</a>
+							:
+							""
+					)
+					:""
+			}
+			{
+				this.props.isAdmin()===true?
+					<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
 					:""
 			}
-			<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
 		</React.Fragment>;
 		return(
 			<React.Fragment>
@@ -586,7 +598,7 @@ class Statistics extends Component{
 									}
 								`
 							}</style>
-						<Tabs  className="statisticsTabs" activeKey={this.state.activeKey} onChange={this.activeKey} tabBarExtraContent={this.props.isAdmin()===true?operations:""}>
+						<Tabs  className="statisticsTabs" activeKey={this.state.activeKey} onChange={this.activeKey} tabBarExtraContent={operations}>
 							<TabPane tab="学习成绩" key="1" className={"statisticsTabs1"} >
 								{bomdata===undefined||bomdata===null?"":bomdata.length===0?<NoneData/>:<Table
 									columns={columns}
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 3bbc4bf8f..81959a30b 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -189,6 +189,7 @@ class Challengesjupyter extends Component {
 		const  business  = this.props&&this.props.current_user&&this.props.current_user.business?this.props.current_user.business:false;
 		//管理员
 		const  admin = this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
+
 		let  mysidentity =false;
 		try {
 			mysidentity =this.props.identity < 5 &&ChallengesDataList&& ChallengesDataList.shixun_status< 3?true:false;