From 975368af0090ed3a67c9bc738dbf923acf7a690a 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, 8 Jul 2019 09:03:26 +0800 Subject: [PATCH 1/2] =?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/login/EducoderLogin.js | 2 +- public/react/src/modules/user/Interestpage.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js index 787acedce..b46435fe7 100644 --- a/public/react/src/modules/login/EducoderLogin.js +++ b/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({ diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js index 97a52bae9..77397fbc6 100644 --- a/public/react/src/modules/user/Interestpage.js +++ b/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 = "/" } From 14a65df3fffef7695952b98e359e6d7dc590c1d6 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, 8 Jul 2019 10:48:35 +0800 Subject: [PATCH 2/2] =?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/exercise/Testpapersettinghomepage.js | 8 ++++---- .../src/modules/courses/shixunHomework/Listofworks.js | 2 +- .../courses/shixunHomework/ShixunStudentWork.js | 2 +- .../modules/courses/shixunHomework/ShixunWorkReport.js | 2 +- .../courses/shixunHomework/Trainingjobsetting.js | 10 +++++++++- .../courses/shixunHomework/Workquestionandanswer.js | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index 1928bd85b..62ec3ff2f 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/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?
  • 导出
    • :""} diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 50faef559..46fb859af 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1359,7 +1359,7 @@ class Listofworks extends Component { }) } }else { - window.open(url, '_blank'); + window.open("/api"+url, '_blank'); } }).catch((error) => { console.log(error) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 2d2babb09..652170726 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/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) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 4dce1b5f2..646bd5f02 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/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) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 1ff1c1170..e483484e7 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/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) diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js index a02ec50e7..3666ad7f2 100644 --- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js +++ b/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)