Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -130,7 +130,7 @@ class Testpapersettinghomepage extends Component{
 										 })
                    }
             }else {
-                window.open(url, '_blank');
+                window.open("/api"+url, '_blank');
             }
         }).catch((error) => {
             console.log(error)
@@ -290,9 +290,9 @@ class Testpapersettinghomepage extends Component{
                                 {isAdmin  === true? <li className="li_line drop_down fr color-blue font-15" style={{"paddingLeft":"0px"}}>
                                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                                        <li><a onClick={()=>this.experiment(`/api/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}>学生成绩</a></li>
-                                        <li><a onClick={()=>this.experiment(`/api/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>
-                                        <li><a onClick={()=>this.experiment(`/api/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}>学生答题试卷</a></li>
+                                        <li><a onClick={()=>this.experiment(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}>学生成绩</a></li>
+                                        <li><a onClick={()=>this.experiment(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>
+                                        <li><a onClick={()=>this.experiment(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}>学生答题试卷</a></li>
                                     </ul>
                                 </li>:""}
                                 </div>

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

@@ -1364,7 +1364,7 @@ class Listofworks extends Component {
 					})
 				}
 			}else {
-				window.open(url, '_blank');
+				window.open("/api"+url, '_blank');
 			}
 		}).catch((error) => {
 			console.log(error)

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

@@ -479,7 +479,7 @@ class ShixunStudentWork extends Component {
 					})
 				}
 			}else {
-				window.open(url, '_blank');
+				window.open("/api"+url, '_blank');
 			}
 		}).catch((error) => {
 			console.log(error)

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

@@ -52,7 +52,7 @@ class ShixunWorkReport extends Component {
 					})
 				}
 			}else {
-				window.open(url, '_blank');
+				window.open("/api"+url, '_blank');
 			}
 		}).catch((error) => {
 			console.log(error)

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

@@ -959,6 +959,14 @@ class Trainingjobsetting extends Component {
         this.setState({
             latedeductiontwo: value,
         })
+        //均分比例
+        if(this.state.proportion==="均分比例"){
+            this.Equalproportion();
+
+        }else if(this.state.proportion==="经验值比例"){
+            this.Empiricalvalueratio();
+
+        }
 
     }
 
@@ -1630,7 +1638,7 @@ class Trainingjobsetting extends Component {
 									})
                 }
             }else {
-                window.open(url, '_blank');
+                window.open("/api"+url, '_blank');
             }
         }).catch((error) => {
             console.log(error)

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

@@ -333,7 +333,7 @@ class Workquestionandanswer extends Component {
 					})
 				}
 			}else {
-				window.open(url, '_blank');
+				window.open("/api"+url, '_blank');
 			}
 		}).catch((error) => {
 			console.log(error)

public/react/src/modules/login/EducoderLogin.js

@@ -116,9 +116,9 @@ class EducoderLogin extends Component {
             })
         } else if(e===2) {
             this.setState({
-                showbool: 2,
                 namezh:name,
                 passmm:pass,
+							  showbool: 2,
             })
         }else if(e===3){
             this.setState({

public/react/src/modules/user/Interestpage.js

@@ -122,7 +122,8 @@ class InterestpageComponent extends Component {
 			interest_ids: ints,
 		}).then((response) => {
 			if (response !== undefined) {
-      this.Jumptotheinterestpage();
+      // this.Jumptotheinterestpage();
+				window.location.href = "/"
 			}