Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js

@@ -156,7 +156,7 @@ class ShixunWorkReport extends Component {
 						{/*>导出实训报告数据</a> : ""}*/}
 					</div>
 
-					<div className="stud-class-set bor-bottom-greyE">
+					<div className="stud-class-set">
 						<div className="clearfix edu-back-white poll_list">
 
 							<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">总体评价</div>

public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js

@@ -177,6 +177,8 @@ class OfficialAcademicTranscript extends Component {
 					}
 					.TaskForms{
 					   width: 500px;
+					   text-align: left !important;
+					   padding: 16px !important;
 					}
 				  .TaskForms.ant-table-header-column{
 						width: 100%;

public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js

@@ -12,6 +12,7 @@ function startechart(data){
 	var option = {
 		title: {
 			text: '工作效率',
+			subtext: '工作效率=log(实训总得分/实训总耗时)'
 		},
 		grid:{
 			left: '3%',
@@ -61,7 +62,7 @@ function startechart(data){
 		yAxis:  [
 			{
 				type : "value",
-				name : "             实训总得分/实训总耗时",
+				name : " ",
 				nameGap: 20,
 				nameTextStyle: {
 					color: '#000',
@@ -169,6 +170,7 @@ function startechart(data){
 	var option1 = {
 		title: {
 			text: '能力值',
+			subtext: '能力值（实训获得经验值/实训评测次数）'
 		},
 		backgroundColor: '#fff',
 		color: [
@@ -212,7 +214,7 @@ function startechart(data){
 		},
 		yAxis: {
 			type: 'value',
-			name: "    实训获得经验值/实训评测次数",
+			name: "    ",
 			nameLocation: 'end',
 			nameGap: 20,
 			nameTextStyle: {
@@ -356,7 +358,7 @@ class Shixunechart extends Component {
 					`}
 				</style>
 
-				<div className="fl with24 ml50">
+				<div className="fl ml50">
 					<div className="bor-grey-e bor-radius4 clearfix mt100 colorE6F3FF pd10">
 						<div className="fl with25 colorE6F3FF" style={{textAlign:"right",paddingRight:"5%"}}>
 							<li className="mt5 mb5 color-grey-9">姓名</li>

public/react/src/modules/paths/PathDetail/sendPanel.js

@@ -27,9 +27,27 @@ class sendPanel extends Component{
 
   //发送至
   SentToLesson =() =>{
-    this.setState({
+		let id=this.props.detailInfoList.id;
-      sentShixunPath:true
+		let url="/paths/"+id+"/choose_course.json";
-    })
+		axios.get(url).then((result)=>{
+			if(result.status==200){
+
+				if (result.data.status === 403||result.data.status === 402||result.data.status === 407||result.data.status === 408) {
+
+				}else{
+					this.setState({
+						sendToCourseList:result.data,
+						sentShixunPath:true
+					})
+				}
+
+			}
+		}).catch((error)=>{
+			console.log(error);
+		})
+    // this.setState({
+    //   sentShixunPath:true
+    // })
   }
   //隐藏发送至弹框
   hideSenttothevalue =()=>{
@@ -99,17 +117,17 @@ class sendPanel extends Component{
   }
 
   componentDidMount(){
-    let id=this.props.detailInfoList.id;
+    // let id=this.props.detailInfoList.id;
-    let url="/paths/"+id+"/choose_course.json";
+    // let url="/paths/"+id+"/choose_course.json";
-    axios.get(url).then((result)=>{
+    // axios.get(url).then((result)=>{
-      if(result.status==200){
+    //   if(result.status==200){
-        this.setState({
+    //     this.setState({
-          sendToCourseList:result.data
+    //       sendToCourseList:result.data
-        })
+    //     })
-      }
+    //   }
-    }).catch((error)=>{
+    // }).catch((error)=>{
-      console.log(error);
+    //   console.log(error);
-    })
+    // })
   }
 
  cardsModalcancel=()=>{