From 535e47d06de3b0dd97e6f8289bc2a83a05115777 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 4 Jul 2019 11:16:00 +0800
Subject: [PATCH 01/11] img

---
 public/react/src/modules/user/account/AccountImg.js      | 6 +++++-
 .../src/modules/user/account/ChangeHeaderPicModal.js     | 9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountImg.js b/public/react/src/modules/user/account/AccountImg.js
index fdb4bedb9..12dfb9d29 100644
--- a/public/react/src/modules/user/account/AccountImg.js
+++ b/public/react/src/modules/user/account/AccountImg.js
@@ -1,12 +1,16 @@
 import React, { Component } from 'react';
 
 import { SnackbarHOC, getImageUrl } from 'educoder';
-
+import ChangeHeaderPicModal from './ChangeHeaderPicModal'
 class AccountNav extends Component {
+    editImg = () => {
+      this.refs['picModal'].setVisible(true)
+    }
     render() {
       // newMain clearfix
       return (
         <div className="headphoto mt14">
+          <ChangeHeaderPicModal {...this.props} ref="picModal"></ChangeHeaderPicModal>
           <style>{`
             /*
             .headphoto {
diff --git a/public/react/src/modules/user/account/ChangeHeaderPicModal.js b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
index 32532f904..1691c2a22 100644
--- a/public/react/src/modules/user/account/ChangeHeaderPicModal.js
+++ b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
@@ -41,8 +41,9 @@ class ChangeHeaderPicModal extends Component{
           // cropper = new Cropper(image, options);
           inputImage.value = null;
         } else {
-          // TODO noti
-          window.alert('Please choose an image file.');
+          
+          this.props.showNotification && this.props.showNotification("请选择一个图片格式的文件")
+          // window.alert('Please choose an image file.');
         }
       }
     };
@@ -78,7 +79,9 @@ class ChangeHeaderPicModal extends Component{
       .then((response) => {
         // {"status":0,"message":"success","avatar_url":"avatars/User/15739"}
         if (response.data.status == 0) {
-          // TODO noti
+          
+          this.props.showNotification && this.props.showNotification("修改头像成功")
+          this.setVisible(false)
         }
       })
       .catch(function (error) {

From 769347c77a87b1c25472753c0d55d59cebb297b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 4 Jul 2019 11:34:44 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E8=B7=B3=E5=85=B3=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpm/shixunchild/Challenges/Challenges.js  | 55 +++++++++++--------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 5554e0370..04cbaf6a3 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -479,46 +479,41 @@ class Challenges extends Component {
 
                           {/*判断比较复杂 有排第一不能是灰色按钮*/}
                           {item.status === 2 ?
-                            <a className="edu-default-btn edu-blueline-btn fr Finish_button mtf3"
-                               onClick={() => this.startshixunCombat(false,undefined, item.challenge_id)}
+                            <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+															 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
                                // onClick={() => this.startshixunCombat(false)}
+															 title={"查看挑战关卡"}
                             >已完成</a> : ""
                           }
 
                           {
                             ChallengesDataList.allow_skip === true && item.status === 1?
-                              <a className="edu-default-btn edu-blueback-btn fr Finish_button"
+                              <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+																 title={"直接挑战"}
                                  style={{marginTop: '-2px'}}
-                                 onClick={() => this.startshixunCombat(false,undefined, item.challenge_id)}
+																 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
                                  // onClick={() => this.startshixunCombat(false)}
                               >直接挑战</a> : ""
                           }
 
 
+													{
+														ChallengesDataList.allow_skip === false ? item.status === 1?
+															<Tooltip placement="bottom" title={"直接挑战"}>
+																<a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+																	 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
+																	 style={{marginTop: '-2px'}}>直接挑战</a>
+															</Tooltip>:"":""
 
-                          {
-                            ChallengesDataList.allow_skip === false ? item.status === 1 && newstatus === 2 ?
-                              <Tooltip placement="bottom" title={item.open_game!=""?"直接挑战":"请先完成前序关卡"}>
-                                <a className={item.open_game!=""?"edu-default-btn edu-blueback-btn fr Finish_button":"edu-default-btn edu-greyback-btn fr Finish_button"}
-                                onClick={item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
-                                style={{marginTop: '-2px'}}>直接挑战</a>
-                              </Tooltip>
-
-                              : item.status === 1 && newstatus === 1 ?
-                                <Tooltip placement="bottom" title={this.props.identity<5?"直接挑战":"请先完成前序关卡"}>
-                                  <a className={this.props.identity<5&&item.open_game!=""?"edu-default-btn edu-blueback-btn fr Finish_button":"edu-default-btn edu-greyback-btn fr Finish_button"}
-                                     onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
-                                     style={{marginTop: '-2px'}}>直接挑战</a>
-                                </Tooltip> : "" : ""
+													}
 
-                          }
 
 
                           {
                            item.status === 0 ?
-                              <Tooltip placement="bottom" title={this.props.identity<5&&item.open_game!=""?"直接挑战":"请先完成前序关卡"}>
-                                <a className={this.props.identity<5&&item.open_game!=""?"edu-default-btn edu-blueback-btn fr Finish_button":"edu-default-btn edu-greyback-btn fr Finish_button"}
-                                   onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
+                              <Tooltip placement="bottom" title={"请先完成前序关卡"}>
+                                <a className={"edu-default-btn edu-greyback-btn fr Finish_button"}
+                                   // onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
                                    style={{marginTop: '-2px'}}>直接挑战</a>
                               </Tooltip>: ""
                           }
@@ -598,3 +593,19 @@ class Challenges extends Component {
 }
 
 export default Challenges;
+    // {
+		// 				ChallengesDataList.allow_skip === false ? item.status === 1 && newstatus === 2 ?
+		// 					<Tooltip placement="bottom" title={"直接挑战"}>
+		// 						<a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+		// 							 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
+		// 						style={{marginTop: '-2px'}}>直接挑战</a>
+		// 					</Tooltip>
+		//
+		// 					: item.status === 1 && newstatus === 1 ?
+		// 						<Tooltip placement="bottom" title={"直接挑战"}>
+		// 							<a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+		// 								 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
+		// 								 style={{marginTop: '-2px'}}>直接挑战</a>
+		// 						</Tooltip> : "" : ""
+		//
+		// 			}
\ No newline at end of file

From e3ff332d27a52f145999a34e4a07a280099d63b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 4 Jul 2019 13:57:05 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E8=B7=B3=E5=85=B3=E5=8A=9F=E8=83=BD?=
 =?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/modules/courses/Resource/index.js  | 13 ++++++-------
 .../tpm/shixunchild/Challenges/Challenges.js        | 11 ++++++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 8ce285ae1..f26d97ad3 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -176,8 +176,8 @@ class Fileslists extends Component{
           let list=result.data.data;
           this.setState({
             total_count:list.total_count,
-            public_count:list.public_count,
-            private_count:list.private_count,
+						publish_count:list.publish_count,
+						unpublish_count:list.unpublish_count,
             files:list.files,
             filesId:list.id,
             name:list.name,
@@ -625,13 +625,12 @@ class Fileslists extends Component{
 		})
 	}
   render(){
-
     let { searchValue,
       checkBoxValues,
       checkAllValue,
       total_count,
-      public_count,
-      private_count,
+			publish_count,
+			unpublish_count,
       files,
       sorttype,
       Modalstype,
@@ -766,8 +765,8 @@ class Fileslists extends Component{
                 secondRowLeft={
                   <div style={{"display":"inline-block", "marginTop": "22px"}}>
                     <span>共 {total_count} 个资源</span>
-                    <span style={{"marginLeft":"16px"}}>已发布：{public_count}个</span>
-                    <span style={{"marginLeft":"16px"}}>未发布：{private_count}个</span>
+                    <span style={{"marginLeft":"16px"}}>已发布：{publish_count}个</span>
+                    <span style={{"marginLeft":"16px"}}>未发布：{unpublish_count}个</span>
                   </div>
                 }
                 onPressEnter={this.onPressEnter}
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 04cbaf6a3..d0a6acbef 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -479,7 +479,7 @@ class Challenges extends Component {
 
                           {/*判断比较复杂 有排第一不能是灰色按钮*/}
                           {item.status === 2 ?
-                            <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+                            <a className={"edu-default-btn edu-blueline-btn fr Finish_button mtf3"}
 															 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
                                // onClick={() => this.startshixunCombat(false)}
 															 title={"查看挑战关卡"}
@@ -510,12 +510,17 @@ class Challenges extends Component {
 
 
                           {
-                           item.status === 0 ?
+                           item.status === 0 ?this.props.identity>2?
                               <Tooltip placement="bottom" title={"请先完成前序关卡"}>
                                 <a className={"edu-default-btn edu-greyback-btn fr Finish_button"}
                                    // onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
                                    style={{marginTop: '-2px'}}>直接挑战</a>
-                              </Tooltip>: ""
+                              </Tooltip>: <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
+																								title={"直接挑战"}
+																								style={{marginTop: '-2px'}}
+																								onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
+															 // onClick={() => this.startshixunCombat(false)}
+														 >直接挑战</a>:""
                           }
 
 

From 2b97bed30c13c5774258f34b2b6204720b28a600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 4 Jul 2019 13:59:10 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/tpm/shixunchild/Challenges/Challenges.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index d0a6acbef..4ef6abfa3 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -510,17 +510,12 @@ class Challenges extends Component {
 
 
                           {
-                           item.status === 0 ?this.props.identity>2?
+                           item.status === 0 ?
                               <Tooltip placement="bottom" title={"请先完成前序关卡"}>
                                 <a className={"edu-default-btn edu-greyback-btn fr Finish_button"}
                                    // onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}
                                    style={{marginTop: '-2px'}}>直接挑战</a>
-                              </Tooltip>: <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
-																								title={"直接挑战"}
-																								style={{marginTop: '-2px'}}
-																								onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
-															 // onClick={() => this.startshixunCombat(false)}
-														 >直接挑战</a>:""
+                              </Tooltip>:""
                           }
 
 

From f7b666db838607824be0bc794730043fd92cd0b1 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 4 Jul 2019 14:01:38 +0800
Subject: [PATCH 05/11] prevProps.basicInfo == undefined

---
 public/react/src/modules/user/account/AccountBasicEdit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 2ef1d5e19..016a32eb5 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -28,8 +28,8 @@ class AccountBasic extends Component {
     }
   }
 
-  componentDidUpdate =(prevState)=>{
-    if(this.props.basicInfo && this.props.basicInfo != prevState.basicInfo){
+  componentDidUpdate =(prevProps)=>{
+    if(this.props.basicInfo && prevProps.basicInfo == undefined){
       this.setValue(this.props.basicInfo);
       this.getSchoolList(this.props.basicInfo);
     }

From 0ed99a5645bac9974a4e7f1d462969cfb90603ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 4 Jul 2019 14:23:02 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/poll/PollDetailTabForthRules.js   |   2 +
 .../courses/shixunHomework/Listofworks.js     |  35 +++--
 .../shixunHomework/Trainingjobsetting.js      | 135 ++++++++++++++----
 3 files changed, 138 insertions(+), 34 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index 2f3621844..cb24ebc8d 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -48,6 +48,8 @@ class PollDetailTabForthRules extends Component{
       selectedCourse:[],
       flagPageEdit:this.props.flagPageEdit
     }
+    console.log("PollDetailTabForthRules");
+    console.log(props);
   }
   componentDidUpdate(prevProps) {
     if (JSON.stringify(this.props.rules) != JSON.stringify(prevProps.rules) ) {
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index e7b85b19d..438a7f152 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -67,6 +67,7 @@ class Listofworks extends Component {
 			order: "update_time",
 			b_order:"desc",
 			search: null,
+			allow_late:false,
 			task_status: [],
 			course_group_info: [],
 			teacherdata: undefined,
@@ -220,7 +221,7 @@ class Listofworks extends Component {
 						<span>
             {
 							record.efficiencyscore&& record.efficiencyscore=== "--"?(
-									record.submitstate==="按时提交"?
+									this.state.allow_late&&this.state.allow_late===false?
 										<Tooltip placement="bottom" title={<div>
 											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
 										</div>}>
@@ -229,7 +230,7 @@ class Listofworks extends Component {
 											</span>
 										</Tooltip>
 										:
-										record.submitstate==="延时提交"?
+										this.state.allow_late&&this.state.allow_late===true?
 											<Tooltip placement="bottom" title={<div>
 												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
 											</div>}>
@@ -472,7 +473,7 @@ class Listofworks extends Component {
 						<span>
             {
 							record.efficiencyscore&& record.efficiencyscore=== "--"?(
-									record.submitstate==="按时提交"?
+									this.state.allow_late&&this.state.allow_late===false?
 										<Tooltip placement="bottom" title={<div>
 											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
 										</div>}>
@@ -481,7 +482,7 @@ class Listofworks extends Component {
 											</span>
 										</Tooltip>
 										:
-										record.submitstate==="延时提交"?
+										this.state.allow_late&&this.state.allow_late===true?
 											<Tooltip placement="bottom" title={<div>
 												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
 											</div>}>
@@ -653,6 +654,7 @@ class Listofworks extends Component {
 				this.setState({
 					teacherdata: result.data,
 					task_status: result.data.task_status,
+					allow_late:result.data.allow_late,
 					course_group_info: result.data.course_group_info,
 					loadingstate: false,
 					jobsettingsdata: result,
@@ -713,6 +715,7 @@ class Listofworks extends Component {
 					course_group_info: result.data.course_group_info,
 					loadingstate: false,
 					jobsettingsdata: result,
+					allow_late:result.data.allow_late,
 					publish_immediately: result.data.publish_immediately,
 					work_efficiency: result.data.work_efficiency,
 					end_immediately: result.data.end_immediately,
@@ -1340,10 +1343,18 @@ class Listofworks extends Component {
 				course_group: this.state.checkedValuesineinfo,
 				search: this.state.searchtext,
 			}
-		}).then((response) => {
+		},{responseType: 'blob'}).then((response) => {
 			console.log("1342");
 			console.log(response);
-
+			var blob = new Blob([response.data])
+			var downloadElement = document.createElement('a');
+			var href = window.URL.createObjectURL(blob); //创建下载的链接
+			downloadElement.href = href;
+			downloadElement.download = '实习报告.pdf'; //下载后文件名
+			document.body.appendChild(downloadElement);
+			downloadElement.click(); //点击下载
+			document.body.removeChild(downloadElement); //下载完成移除元素
+			window.URL.revokeObjectURL(href); //释放掉blob对象
  		}).catch((error) => {
 			console.log(error)
 		});
@@ -1359,10 +1370,18 @@ class Listofworks extends Component {
 				group_id: this.state.checkedValuesineinfo,
 				search:  this.state.searchtext,
 			}
-		}).then((response) => {
+		},{responseType: 'blob'}).then((response) => {
 			console.log("1306");
 			console.log(response);
-
+			var blob = new Blob([response.data])
+			var downloadElement = document.createElement('a');
+			var href = window.URL.createObjectURL(blob); //创建下载的链接
+			downloadElement.href = href;
+			downloadElement.download = '课堂学生成绩.xlsx'; //下载后文件名
+			document.body.appendChild(downloadElement);
+			downloadElement.click(); //点击下载
+			document.body.removeChild(downloadElement); //下载完成移除元素
+			window.URL.revokeObjectURL(href); //释放掉blob对象
 		}).catch((error) => {
 			console.log(error)
 		});
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 362e3dc40..84f2f72ba 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -162,28 +162,33 @@ class Trainingjobsetting extends Component {
                     })
                 }else {
                     for(var i=0;i<result.data.group_settings.length;i++) {
-                        array.push({
+                        if(result.data.group_settings[i].publish_time === null &&result.data.group_settings[i].end_time === null){
+
+                        }else {
+                            array.push({
+                                course_group_id: result.data.group_settings[i].group_id,
+                                course_group_name: result.data.group_settings[i].group_name,
+                                publish_time: result.data.group_settings[i].publish_time,
+                                end_time: result.data.group_settings[i].end_time,
+                                publish_flag: "",
+                                end_flag: "",
+                                class_flag: "",
+                                course_search: "",
+                                open: false
+                            })
+                        }
+                    }
+                }
+
+                for(var i=0;i<result.data.group_settings.length;i++){
+
+                        arrays.push({
                             course_group_id:result.data.group_settings[i].group_id,
                             course_group_name:result.data.group_settings[i].group_name,
                             publish_time:result.data.group_settings[i].publish_time,
                             end_time:result.data.group_settings[i].end_time,
-                            publish_flag:"",
-                            end_flag:"",
-                            class_flag:"",
-                            course_search:"",
-                            open:false
+                            course_choosed:0,
                         })
-                    }
-                }
-
-                for(var i=0;i<result.data.group_settings.length;i++){
-                    arrays.push({
-                        course_group_id:result.data.group_settings[i].group_id,
-                        course_group_name:result.data.group_settings[i].group_name,
-                        publish_time:result.data.group_settings[i].publish_time,
-                        end_time:result.data.group_settings[i].end_time,
-                        course_choosed:0,
-                    })
 
                     if(result.data.group_settings[i].group_id instanceof Array ) {
                         rulesdatas.push({
@@ -741,8 +746,10 @@ class Trainingjobsetting extends Component {
         //占比分
         if(challenge_settingsdata.length>0){
             var  Proportion=100;
+            var oushution=0;
             //获取占用分后的值
             Proportion=Proportion-latedeductiontwos;
+            oushution=Proportion;
             var srorelength=0;
             //计算选中用户
             for (var k=0;k<challenge_settingsdata.length;k++){
@@ -762,10 +769,17 @@ class Trainingjobsetting extends Component {
             //计算平均值
             Proportion= Proportion/srorelength;
             var intkk=0;
-             if(srbool==true){
+            var intkks=0;
+            if(srbool==true){
+                // 奇数
                  var exams = Math.round(Proportion)
                  var intk = srorelength*exams;
-                 intkk=100 - intk;
+                 intkk=oushution - intk;
+
+             }else {
+                // 偶数
+                 var examsy = Math.round(Proportion)
+                intkks=oushution - (examsy*srorelength);
 
              }
              var mact=0;
@@ -774,8 +788,13 @@ class Trainingjobsetting extends Component {
             for (var i=0;i<challenge_settingsdata.length;i++){
                 if(challenge_settingsdata[i].checked  === true) {
                     if(srbool===false){
-                        challenge_settingsdata[i].challenge_score = Math.round(Proportion);
+                        mact=mact+1;
+                        if(mact===srorelength){
+                            challenge_settingsdata[i].challenge_score = Math.round(Proportion)+intkks;
 
+                        }else {
+                            challenge_settingsdata[i].challenge_score = Math.round(Proportion);
+                        }
                     }else{
                         mact=mact+1;
                         if(mact===srorelength){
@@ -1468,6 +1487,13 @@ class Trainingjobsetting extends Component {
 				  	starttimes:undefined,
         })
     }
+    cancelBox=()=>{
+        this.setState({
+            modalsType: false,
+            modalsTopval: "",
+            loadtype: false,
+        })
+    }
     //编辑
     editSetting = () => {
         try {
@@ -1540,7 +1566,8 @@ class Trainingjobsetting extends Component {
             handclass: undefined,
             unit_e_tip: "",
         })
-        this.refs.targetElementTrainingjobsetting.scrollIntoView()
+        this.refs.targetElementTrainingjobsetting.scrollIntoView();
+        this.getTrainingjobsetting();
     }
 
     rulesCheckInfo=(rules)=>{
@@ -1580,6 +1607,37 @@ class Trainingjobsetting extends Component {
             showmodel:false
         })
     }
+// 导出实习报告批量
+    internshipreport = () => {
+        console.log("internshipreport");
+        var homeworkid = this.props.match.params.homeworkid;
+        let url = "/zip/shixun_report";
+        axios.get((url),{
+            params: {
+                homework_common_id: homeworkid,
+            }
+        }).then((response) => {
+            console.log("1593");
+            console.log(response);
+
+        }).catch((error) => {
+            console.log(error)
+        });
+    }
+
+    // 课堂学生成绩的导出下载
+    Classstudentachievement = () => {
+        console.log("Classstudentachievement");
+        const course_id = this.props.match.params.coursesId;
+        let url = "/courses/" + course_id + "/export_member_scores_excel.xlsx";
+        axios.get(url).then((response) => {
+            console.log("1607");
+            console.log(response);
+
+        }).catch((error) => {
+            console.log(error)
+        });
+    }
 
 
     render() {
@@ -1698,10 +1756,35 @@ class Trainingjobsetting extends Component {
                                 {/*<Link className="ml30" to={`/courses/${this.state.props.match.params.coursesId}/shixun_homeworks/${this.state.props.match.params.homeworkid}/shixun_work_report`}>*/}
                                 {/*<a className="color-blue">查看实训报告</a>*/}
                                 {/*</Link>*/}
-                                {this.props.isAdmin() ? <a
-                                    className="fr color-blue font-16"
-                                    href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}
-                                >导出</a> : ""}
+                                <style>{`
+                        .drop_down_menu li a {
+                            padding: 0px;
+                            font-size: 14px;
+                        }
+                        .drop_down_menu {
+                            width: 93px;
+                        }
+                        .drop_down_menu li {
+                            overflow: visible;
+                            width: 93px;
+                        }
+                        .drop_down_menu, .drop_down_normal {
+                            padding-top: 10px;
+                            padding-bottom: 8px;
+                        }
+                        a:hover {
+                        color:#1A0B00 !important;
+                        }
+                        `}</style>
+                                {this.props.isAdmin() ? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
+                                    导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                                    <ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
+                                        <li><a onClick={()=>this.internshipreport()}>实训报告</a>
+                                        </li>
+                                        <li><a onClick={()=>this.Classstudentachievement()}>学生成绩</a>
+                                        </li>
+                                    </ul>
+                                </li>: ""}
                                 {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true?
                                     <a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a> : "": ""}
                                 {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.publish_immediately===true?
@@ -1997,7 +2080,7 @@ class Trainingjobsetting extends Component {
                                     提交
                                 </Button>
                                 {/*<a className="defalutSubmitbtn fl mr20">提交</a>*/}
-                                <a className="defalutCancelbtn fl" onClick={this.cancelEdit}>取消</a>
+                                <a className="defalutCancelbtn fl" onClick={()=>this.cancelEdit()}>取消</a>
                             </div>
                             : ""
                     }

From 19cfbc2cc11601bba40259ca744135db59c2c6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 4 Jul 2019 14:24:21 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/coursesPublic/AccessoryModal.js  | 2 --
 .../react/src/modules/courses/coursesPublic/SelectSetting.js   | 1 -
 .../modules/courses/exercise/Studentshavecompletedthelist.js   | 1 -
 public/react/src/modules/courses/members/teacherList.js        | 1 -
 .../react/src/modules/courses/poll/PollDetailTabForthRules.js  | 3 +--
 .../src/modules/courses/shixunHomework/Trainingjobsetting.js   | 1 +
 public/react/src/modules/login/Trialapplication.js             | 1 -
 7 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index 72512be43..5541a01a6 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -151,7 +151,6 @@ class AccessoryModal extends Component{
         }).then((result)=>{
 
 					if(result.data.status===0){
-						debugger
 						this.props.Cancel()
 						this.props.setupdate()
 
@@ -199,7 +198,6 @@ class AccessoryModal extends Component{
     }).then((result)=>{
 
       if(result.data.status===0){
-      	debugger
 				this.props.Cancel()
         this.props.setupdate()
 
diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index 4e84bae8c..08e01e28e 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -175,7 +175,6 @@ class Selectsetting extends Component{
 	}
 
 	savecouseShixunModal=()=>{
-		debugger
 		let {fileList,is_public,unified_setting,description,datatime,course_groups}=this.state;
 
 		let newfileList=[];
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 09cfdf947..a3ee9ef1a 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -2192,7 +2192,6 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 	funtaskstatustwo = (checkedValues, data) => {
-		debugger
 		// console.log(checkedValues);
 		if (JSON.stringify(checkedValues) === "[]") {
 			// console.log(checkedValues);
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index c5422b96f..5f2459dd3 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -211,7 +211,6 @@ class studentsList extends Component{
   }
   onCheckAllChange = (e, item, index) => {
     const that = this;
-    debugger;
     const checkAllArray = that.state.checkAllArray.slice(0)
     checkAllArray[index] = !checkAllArray[index]
     that.setState({checkAllArray})
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index cb24ebc8d..ac0417f39 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -48,8 +48,7 @@ class PollDetailTabForthRules extends Component{
       selectedCourse:[],
       flagPageEdit:this.props.flagPageEdit
     }
-    console.log("PollDetailTabForthRules");
-    console.log(props);
+
   }
   componentDidUpdate(prevProps) {
     if (JSON.stringify(this.props.rules) != JSON.stringify(prevProps.rules) ) {
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 84f2f72ba..91cbec710 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1623,6 +1623,7 @@ class Trainingjobsetting extends Component {
         }).catch((error) => {
             console.log(error)
         });
+
     }
 
     // 课堂学生成绩的导出下载
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index cd3b72dad..89164da2b 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -227,7 +227,6 @@ class Trialapplication extends Component {
 
 	postregistered = () => {
 		//提交按钮
-		debugger
 		if (this.state.user_phone_binded === false) {
 
 			if (this.state.Phonenumberisnotcobool === false) {

From 1c4315697ffd68978d4174b5c03c09c46ccd9c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 4 Jul 2019 14:32:24 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/shixunHomework/Listofworks.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 438a7f152..a922172bc 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1325,6 +1325,10 @@ class Listofworks extends Component {
 
 		axios.get(url).then((response) => {
 			this.props.showNotification(`${response.data.message}`);
+			this.setState({
+				loadingstate: true
+			})
+			this.Startsorting(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		}).catch((error) => {
 			console.log(error)
 		});

From a7e6972e76dee72616a34ce158656a56b8c8036f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 4 Jul 2019 14:55:26 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/shixunHomework/Listofworks.js   | 2 +-
 .../modules/courses/shixunHomework/Listofworksstudentone.js   | 4 ++--
 .../src/modules/courses/shixunHomework/ShixunStudentWork.js   | 2 +-
 .../src/modules/courses/shixunHomework/Trainingjobsetting.js  | 2 +-
 .../modules/courses/shixunHomework/Workquestionandanswer.js   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index a922172bc..2553300ab 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1481,7 +1481,7 @@ class Listofworks extends Component {
 						</p>
 					</div>
 					<div className="educontent mb30">
-						<p className=" fl color-black  summaryname">
+						<p className=" fl color-black  summaryname" style={{heigth:"33px"}}>
 							{teacherdata === undefined ? "" : teacherdata.homework_name}
 						</p>
 						<CoursesListType
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 759b936ae..ce3af71ef 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -855,7 +855,7 @@ class Listofworksstudentone extends Component {
 							</p>
 						</div>
 						<div className="educontent mb30" style={{width: "1250px"}}>
-							<p className=" fl color-black  summaryname">
+							<p className=" fl color-black  summaryname" style={{heigth:"33px"}}>
 								{teacherdata === undefined ? "" : teacherdata.homework_name}
 							</p>
 							<CoursesListType
@@ -1009,7 +1009,7 @@ class Listofworksstudentone extends Component {
 							</p>
 						</div>
 						<div className="educontent mb30">
-							<p className=" fl color-black  summaryname">
+							<p className=" fl color-black  summaryname" style={{heigth:"33px"}}>
 								{jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}
 							</p>
 							<CoursesListType
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 7188c65bd..751d44459 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -571,7 +571,7 @@ class ShixunStudentWork extends Component {
 						</p>
 					</div>
 						<div className="educontent mb30">
-						<p className=" fl color-black  summaryname">
+						<p className=" fl color-black  summaryname" style={{heigth:"33px"}}>
 							{data&&data.homework_name}
 						</p>
 						<CoursesListType
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 91cbec710..55770c359 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1715,7 +1715,7 @@ class Trainingjobsetting extends Component {
                     </div>
 
                     <div className="educontent mb30">
-                        <p className=" fl color-black  summaryname mt5">
+                        <p className=" fl color-black  summaryname mt5" style={{heigth:"33px"}}>
                             {jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}
 
                         </p>
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index c342227c6..28560d4fe 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -412,7 +412,7 @@ class Workquestionandanswer extends Component {
 						</p>
 					</div>
 					<div className="educontent mb30">
-						<p className=" fl color-black  summaryname">
+						<p className=" fl color-black  summaryname" style={{heigth:"33px"}}>
 							{jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}
 						</p>
 						<CoursesListType

From 1a7d9a7f60faa8b3e81d4161248dc6f8f4c73925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 4 Jul 2019 15:12:05 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/ShixunStudentWork.js       |  7 ++-
 .../shixunHomework/ShixunhomeWorkItem.js      |  2 +-
 .../Shixunworkdetails/ShixunWorkModal.js      | 57 ++++++++++---------
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 7188c65bd..30d5830d2 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -659,7 +659,7 @@ class ShixunStudentWork extends Component {
 
 						{data&&data?
 						<div>
-						<ul className="clearfix" style={{padding: '20px 40px 10px 40px'}}>
+						<ul className="clearfix" style={{padding: '20px 16px 10px'}}>
 							<li className="clearfix ">
 
 								<span   className="fl  mr10 color-grey-8 ">查重时间：{data&&data.last_review_time}</span>
@@ -715,7 +715,7 @@ class ShixunStudentWork extends Component {
 						</ul>
 
 
-						<div id="graduation_work_list" style={{padding: '0px 40px 10px 40px'}}>
+						<div id="graduation_work_list" style={{padding: '0px 16px 10px'}}>
 
 							<div className="clearfix">
                   <span className="fl color-grey-6 font-12">
@@ -755,11 +755,12 @@ class ShixunStudentWork extends Component {
 							{datalist === undefined ? "" : <Table
 								dataSource={datalist}
 								columns={columns}
-								pagination={{  //分页
+								pagination={ datalist.length<11?false:{  //分页
 									total: datalist.length===0?0:data&&data.all_reviews_count, //数据总数量
 									pageSize: 10,  //显示几条一页
 									current:page,
 								}}
+
 								onChange={this.TablePagination}
 							/>}
 						</div>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 5731c3b73..d6c96182b 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -358,7 +358,7 @@ class ShixunhomeWorkItem extends Component{
 								`
 							}
 						</style>
-            {this.props.isAdmin?<div className={this.props.isClassManagement?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
+            {this.props.isAdmin?<div className={this.props.isAdminOrTeacher()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
               <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
 								{this.props.isAdminOrTeacher()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
               <WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings`}  > 设置</WordsBtn>
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 5a4ad673c..173346c81 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -31,7 +31,9 @@ class ShixunWorkModal extends Component{
 				response.data.group_list.map((item,key)=>{
 					newgroup_list.push(item)
 				})
-				if( response.data.ungroup_list!== undefined ||  response.data.ungroup_list !== null){
+				if(response.data.ungroup_list===undefined){
+
+				}else{
 					newgroup_list.push(response.data.ungroup_list)
 				}
 				this.setState({
@@ -255,31 +257,10 @@ class ShixunWorkModal extends Component{
 
 								<Checkbox.Group style={{ width: '100%' }}  onChange={this.shixunhomeworkedit} value={group_ids}>
 									{
-										group_list===undefined?course_groups.ungroup_list.work_count===0?"":
-
-											<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
-												<li className="fl task-hide" style={{width: '240px'}}>
-													<Checkbox
-														className="fl task-hide edu-txt-left"
-														name="shixun_homework[]"
-														value={course_groups.ungroup_list.id}
-													>
-														<label style={{"textAlign": "left", "color": "#05101A"}}
-																	 className="task-hide color-grey-name" title="frerere">{course_groups.ungroup_list.name}</label>
-													</Checkbox>
-												</li>
-												<li className="fl" style={{width: '100px'}}>
-													{course_groups.ungroup_list.work_count}
-												</li>
-												<li className="fl" style={{width: '160px'}}>
-													{course_groups.ungroup_list.last_review_time}
-												</li>
-											</div>
-
-											:
-											group_list&&group_list.length===0?"":group_list[0]===undefined?"":group_list.map((item,key)=>{
+										group_list===undefined?"":
+											group_list&&group_list.length===0?"":group_list.map((item,key)=>{
 												return(
-													item.work_count===0?"":<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
+													 <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
 														<li className="fl task-hide" style={{width: '240px'}}>
 															<Checkbox
 																className="fl task-hide edu-txt-left"
@@ -318,4 +299,28 @@ class ShixunWorkModal extends Component{
 		)
 	}
 }
-export default ShixunWorkModal;
\ No newline at end of file
+export default ShixunWorkModal;
+
+
+// course_groups.ungroup_list.work_count===0?"":
+//
+// 	<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
+// 		<li className="fl task-hide" style={{width: '240px'}}>
+// 			<Checkbox
+// 				className="fl task-hide edu-txt-left"
+// 				name="shixun_homework[]"
+// 				value={course_groups.ungroup_list.id}
+// 			>
+// 				<label style={{"textAlign": "left", "color": "#05101A"}}
+// 							 className="task-hide color-grey-name" title="frerere">{course_groups.ungroup_list.name}</label>
+// 			</Checkbox>
+// 		</li>
+// 		<li className="fl" style={{width: '100px'}}>
+// 			{course_groups.ungroup_list.work_count}
+// 		</li>
+// 		<li className="fl" style={{width: '160px'}}>
+// 			{course_groups.ungroup_list.last_review_time}
+// 		</li>
+// 	</div>
+//
+// :
\ No newline at end of file

From 74f213c4815a63da4fe1eb866ac834d1cbdd4d09 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 4 Jul 2019 15:17:14 +0800
Subject: [PATCH 11/11] cropper

---
 public/react/src/common/components/Cropper.js | 13 ++++++++----
 public/react/src/modules/tpm/TPMIndexHOC.js   | 11 ++++++----
 public/react/src/modules/user/AccountPage.js  |  4 ++--
 .../src/modules/user/account/AccountImg.js    | 10 +++++----
 .../src/modules/user/account/AccountNav.js    |  2 +-
 .../user/account/ChangeHeaderPicModal.js      | 21 ++++++++++++++-----
 6 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/public/react/src/common/components/Cropper.js b/public/react/src/common/components/Cropper.js
index 2fe71ea2b..f11248751 100644
--- a/public/react/src/common/components/Cropper.js
+++ b/public/react/src/common/components/Cropper.js
@@ -110,13 +110,15 @@ class Cropper extends Component {
   render() {
     
     const { width, height, previewId, imageSrc } = this.props;
+
     return (
       <div>
         {/* This rule is very important, please do not ignore this! */}
         <style>{`
             .wrapper {
-                width: ${ (width+'px') || '500px'};
-                height: ${ (height+'px') || '500px'};
+                width: ${ width ? (width+'px') : '500px'};
+                height: ${ height ? (height+'px') : '500px'};
+                border: 1px solid #eee;
             }
             img {
                 max-width: 100%; 
@@ -129,8 +131,11 @@ class Cropper extends Component {
             }
         `}</style>
         <div className="wrapper">
-            {/* http://localhost:3007/images/footNavLogo.png  图片转了后不对 */}
-            <img id={this.props.imageId || "__image"} src={`${imageSrc || "/images/testPicture.jpg"}`}></img>
+            {/* http://localhost:3007/images/footNavLogo.png  图片转了后不对 
+                || "/images/testPicture.jpg"
+                || "/images/shixun0.jpg"
+            */}
+            <img id={this.props.imageId || "__image"} src={`${imageSrc }`}></img>
         </div>
         {/* background: 'aquamarine', 
             'border-radius': '128px'
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index f03d59751..cc89f3003 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -75,9 +75,11 @@ export function TPMIndexHOC(WrappedComponent) {
 
       // header里面需要有user
       initCommonState(user) {
+        // 更新头像后，需要改变参数，不然会被图片缓存影响到
+        const newUser = Object.assign({}, {...user}, { image_url: `${user.image_url}?t=${new Date().getTime()}`});
         this.setState({
-          user,
-          current_user: user
+          user: newUser,
+          current_user: newUser
         })
       }
       showShixun = () => {
@@ -230,7 +232,7 @@ export function TPMIndexHOC(WrappedComponent) {
       /**
         课堂权限相关方法，暂时写这里了 ----------------------------------------END
       */
-      fetchUser() {
+      fetchUser = () => {
         let url = `/users/get_user_info.json`
         let courseId;
         let query = this.props.location.pathname;
@@ -289,7 +291,8 @@ export function TPMIndexHOC(WrappedComponent) {
             isStudent: this.isStudent,
             isAdminOrStudent: this.isAdminOrStudent,
             isNotMember: this.isNotMember,
-            isUserid:this.state.coursedata&&this.state.coursedata.userid
+            isUserid:this.state.coursedata&&this.state.coursedata.userid,
+            fetchUser: this.fetchUser
           }
 		    return (
 		    	<div>
diff --git a/public/react/src/modules/user/AccountPage.js b/public/react/src/modules/user/AccountPage.js
index 430f086a1..065724faf 100644
--- a/public/react/src/modules/user/AccountPage.js
+++ b/public/react/src/modules/user/AccountPage.js
@@ -51,11 +51,11 @@ class AccountPage extends Component {
   }
 
   getBasicInfo=(login)=>{
-    let url=`/users/accounts/${login}.json`;
+    let url=`/users/accounts/${login || this.props.current_user.login}.json`;
     axios.get(url).then((result)=>{
       if(result.data){
         this.setState({
-          basicInfo:result.data
+          basicInfo: Object.assign({}, {...result.data}, { avatar_url: `${result.data.avatar_url}?t=${new Date().getTime()}`})
         })
         if(result.data && result.data.base_info_completed == false){
           this.props.history.push(`/account/basic/edit`);
diff --git a/public/react/src/modules/user/account/AccountImg.js b/public/react/src/modules/user/account/AccountImg.js
index a802367f2..b8e060750 100644
--- a/public/react/src/modules/user/account/AccountImg.js
+++ b/public/react/src/modules/user/account/AccountImg.js
@@ -2,14 +2,16 @@ import React, { Component } from 'react';
 
 import { SnackbarHOC, getImageUrl } from 'educoder';
 import ChangeHeaderPicModal from './ChangeHeaderPicModal'
-class AccountNav extends Component {
+class AccountImg extends Component {
     editImg = () => {
       this.refs['picModal'].setVisible(true)
     }
     render() {
+      const picUrl = getImageUrl("images/"+this.props.src)
       return (
         <div className="headphoto mt14">
-          <ChangeHeaderPicModal {...this.props} ref="picModal"></ChangeHeaderPicModal>
+          <ChangeHeaderPicModal 
+            {...this.props} ref="picModal" imageSrc={picUrl} userLogin={this.props.current_user ? this.props.current_user.login : '' }></ChangeHeaderPicModal>
           <style>{`
             /*
             .headphoto {
@@ -47,11 +49,11 @@ class AccountNav extends Component {
               display: block;
             }
           `}</style>
-          <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={`${getImageUrl("images/"+this.props.src)}`}></img>
+          <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={`${picUrl}`}></img>
           <p className="headphoto-black" onClick={this.editImg} >修改头像</p>
         </div>
       );
     }
 }
 
-export default AccountNav;
+export default AccountImg;
diff --git a/public/react/src/modules/user/account/AccountNav.js b/public/react/src/modules/user/account/AccountNav.js
index ea84b735e..6f07bd075 100644
--- a/public/react/src/modules/user/account/AccountNav.js
+++ b/public/react/src/modules/user/account/AccountNav.js
@@ -22,7 +22,7 @@ class AccountNav extends Component {
       return (
           <div className="accountNav fl">
             <div className="accountInfo">
-              <AccountImg src={basicInfo && basicInfo.avatar_url}></AccountImg>
+              <AccountImg src={basicInfo && basicInfo.avatar_url} {...this.props}></AccountImg>
               <span className="name">{basicInfo && basicInfo.name}</span>
               <span className="role">{basicInfo && basicInfo.technical_title}</span>
             </div>
diff --git a/public/react/src/modules/user/account/ChangeHeaderPicModal.js b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
index 1691c2a22..89f21838e 100644
--- a/public/react/src/modules/user/account/ChangeHeaderPicModal.js
+++ b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
@@ -28,6 +28,10 @@ class ChangeHeaderPicModal extends Component{
         file = files[0];
 
         if (/^image\/\w+/.test(file.type)) {
+          if (file.size > 2 * 1024 * 1024) {
+            this.props.showNotification && this.props.showNotification("仅支持文件大小小于2M的文件")  
+            return;
+          }
           uploadedImageType = file.type;
           uploadedImageName = file.name;
 
@@ -41,7 +45,6 @@ class ChangeHeaderPicModal extends Component{
           // cropper = new Cropper(image, options);
           inputImage.value = null;
         } else {
-          
           this.props.showNotification && this.props.showNotification("请选择一个图片格式的文件")
           // window.alert('Please choose an image file.');
         }
@@ -72,14 +75,16 @@ class ChangeHeaderPicModal extends Component{
       var dataUrl = canvas.toDataURL("image/jpeg");    
       console.log(dataUrl)   
 
-      const url = `/users/accounts/${this.props.userLogin || 'kosasa'}/avatar.json`
+      const url = `/users/accounts/${this.props.userLogin}/avatar.json`
       axios.put(url, { 
         image: dataUrl
       })
       .then((response) => {
         // {"status":0,"message":"success","avatar_url":"avatars/User/15739"}
         if (response.data.status == 0) {
-          
+          // this.props.getBasicInfo()          
+          this.props.fetchUser()
+          // 头像更新后会触发AccountPage的DidUpdate，然后会调用getBasicInfo
           this.props.showNotification && this.props.showNotification("修改头像成功")
           this.setVisible(false)
         }
@@ -111,6 +116,7 @@ class ChangeHeaderPicModal extends Component{
                 text-align: center;
                 width: 120px;
                 height: 120px;
+                border: 1px solid #eee;
             }
             .previewWrap {
               flex-direction: column;
@@ -121,10 +127,14 @@ class ChangeHeaderPicModal extends Component{
             }
             .changeHeaderModal .tip {
               color: #9B9B9B;
+              margin-top: 4px;
+            }
+            .changeHeaderModal .cropperWrap .tip {
+              display: inline-block;
             }
             .previewWrap .tip {
               text-align: center;
-              margin-top: 2px;
+              margin-top: 4px;
             }
             #uploadBtn {
               color: #4CACFF;
@@ -134,8 +144,9 @@ class ChangeHeaderPicModal extends Component{
             }
         `}</style>
         <div className="df">
-            <div>
+            <div className="cropperWrap">
               <Cropper
+                  imageSrc={''}
                   ref="cropper"
                   imageId={imageId}
                   previewId="changeHeader_imagePreview"