m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整

Browse Source
dev_forum
杨树林 6 years ago
parent 41015ff53a
commit a191fb425b
7 changed files with 80 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -1907,7 +1907,7 @@ class Studentshavecompletedthelist extends Component {
})
}
} else {
console.log("2699包含主观题包含分班");
// console.log("2699包含主观题包含分班");
if (response.data.exercise_types.groups_count > 0) {
this.setState({
data: datalist,

6
public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
Unescape View File

@ -113,19 +113,21 @@ class Testpapersettinghomepage extends Component{
experiment=(url)=>{
axios.get(url).then((response) => {
console.log(response);
debugger
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){
if(response.data.messages === "100"){
// 已超出文件导出的上限数量（100 ），建议：
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:500
})
}

4
public/react/src/modules/courses/shixunHomework/Listofworks.js
Unescape View File

@ -1348,13 +1348,13 @@ class Listofworks extends Component {
// 已超出文件导出的上限数量（100 ），建议：
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:500
})
}

4
public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
Unescape View File

@ -468,13 +468,13 @@ class ShixunStudentWork extends Component {
// 已超出文件导出的上限数量（100 ），建议：
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:500
})
}

4
public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
Unescape View File

@ -41,13 +41,13 @@ class ShixunWorkReport extends Component {
// 已超出文件导出的上限数量（100 ），建议：
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:500
})
}

93
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -693,11 +693,11 @@ class Trainingjobsetting extends Component {
this.state.proportion=e.target.value
if (e.target.value === "均分比例") {
this.Equalproportion();
this.Equalproportion(this.state.latedeductiontwo);
}
if (e.target.value === "经验值比例") {
this.Empiricalvalueratio();
this.Empiricalvalueratio(this.state.latedeductiontwo);
}
if (e.target.value === "自定义分值") {
@ -717,11 +717,11 @@ class Trainingjobsetting extends Component {
}
onChangeslevelproportiontwo=(value)=>{
if (value === "均分比例") {
this.Equalproportion();
this.Equalproportion(this.state.latedeductiontwo);
}
if (value === "经验值比例") {
this.Empiricalvalueratio();
this.Empiricalvalueratio(this.state.latedeductiontwo);
}
if (value=== "自定义分值") {
@ -739,9 +739,9 @@ class Trainingjobsetting extends Component {
})
}
//均分比例
Equalproportion = () => {
Equalproportion = (latedeductiontwo) => {
var challenge_settingsdata=this.state.challenge_settings;
var latedeductiontwos=this.state.latedeductiontwo;
var latedeductiontwos=latedeductiontwo;
if(latedeductiontwos === undefined || latedeductiontwos===null || latedeductiontwos===""){
latedeductiontwos=0;
}
@ -774,15 +774,22 @@ class Trainingjobsetting extends Component {
var intkks=0;
if(srbool==true){
// 奇数
var exams = Math.round(Proportion)
var exams = parseFloat(Proportion.toFixed(1));
var intk = srorelength*exams;
intkk=oushution - intk;
console.log("奇数");
console.log(srorelength);//3
console.log(oushution);//79
console.log(exams);//26.3
console.log(intk);//78.9
console.log(intkk);
}else {
// 偶数
var examsy = Math.round(Proportion)
var examsy =parseFloat(Proportion.toFixed(1));
intkks=oushution - (examsy*srorelength);
console.log("偶数");
console.log(oushution);
console.log((examsy*srorelength));
}
var mact=0;
@ -790,20 +797,23 @@ class Trainingjobsetting extends Component {
for (var i=0;i<challenge_settingsdata.length;i++){
if(challenge_settingsdata[i].checked === true) {
if(srbool===false){
console.log(intkks);
mact=mact+1;
if(mact===srorelength){
challenge_settingsdata[i].challenge_score = Math.round(Proportion)+intkks;
challenge_settingsdata[i].challenge_score = (parseFloat(Proportion.toFixed(1))+parseFloat(intkks.toFixed(1))).toFixed(1);
console.log( challenge_settingsdata[i].challenge_score);
}else {
challenge_settingsdata[i].challenge_score = Math.round(Proportion);
challenge_settingsdata[i].challenge_score = Proportion.toFixed(1);
}
}else{
console.log(intkk);
mact=mact+1;
if(mact===srorelength){
challenge_settingsdata[i].challenge_score = Math.round(Proportion)+intkk;
challenge_settingsdata[i].challenge_score = (parseFloat(Proportion.toFixed(1))+parseFloat( intkk.toFixed(1))).toFixed(1);
console.log( challenge_settingsdata[i].challenge_score);
}else {
challenge_settingsdata[i].challenge_score = Math.round(Proportion);
challenge_settingsdata[i].challenge_score = Proportion.toFixed(1);
}
}
@ -822,10 +832,10 @@ class Trainingjobsetting extends Component {
}
//经验值比例
Empiricalvalueratio=()=>{
Empiricalvalueratio=(latedeductiontwo)=>{
var shixun_exp = this.state.shixun_exp;
var challenge_settingsdata=this.state.challenge_settings;
var latedeductiontwos=this.state.latedeductiontwo;
var latedeductiontwos=latedeductiontwo;
if(latedeductiontwos === undefined || latedeductiontwos===null || latedeductiontwos===""){
latedeductiontwos=0;
}
@ -845,14 +855,45 @@ class Trainingjobsetting extends Component {
}
}
//开始循环赋值
var expzs=0;
var mact=0;
for (var i=0;i<challenge_settingsdata.length;i++){
if(challenge_settingsdata[i].checked===true) {
mact=mact+1;
var myint = (challenge_settingsdata[i].challenge_exp / Proportion) * ionsp;
challenge_settingsdata[i].challenge_score = myint.toFixed(2);
challenge_settingsdata[i].challenge_score = myint.toFixed(1);
expzs=parseFloat(myint.toFixed(1))+parseFloat(expzs);
}else{
challenge_settingsdata[i].challenge_score =0;
}
}
debugger
var expzsy=0;
var bool= true;
if(ionsp - expzs>0){
expzsy=ionsp - expzs;
bool=true;
}else{
expzsy=ionsp - expzs;
bool=false;
}
var macts=0;
for (var i=0;i<challenge_settingsdata.length;i++){
if(challenge_settingsdata[i].checked===true) {
macts= macts+1;
if(mact===macts){
if(bool===true){
challenge_settingsdata[i].challenge_score = challenge_settingsdata[i].challenge_score+expzsy;
}else {
challenge_settingsdata[i].challenge_score = challenge_settingsdata[i].challenge_score-parseInt(expzsy);
}
}
}else{
challenge_settingsdata[i].challenge_score =0;
}
}
}
}
}
@ -873,10 +914,10 @@ class Trainingjobsetting extends Component {
})
//均分比例
if(this.state.proportion==="均分比例"){
this.Equalproportion();
this.Equalproportion(20);
}else if(this.state.proportion==="经验值比例"){
this.Empiricalvalueratio();
this.Empiricalvalueratio(20);
}
@ -889,10 +930,10 @@ class Trainingjobsetting extends Component {
})
//均分比例
if(this.state.proportion==="均分比例"){
this.Equalproportion();
this.Equalproportion(0);
}else if(this.state.proportion==="经验值比例"){
this.Empiricalvalueratio();
this.Empiricalvalueratio(0);
}
}
@ -961,10 +1002,10 @@ class Trainingjobsetting extends Component {
})
//均分比例
if(this.state.proportion==="均分比例"){
this.Equalproportion();
this.Equalproportion(value);
}else if(this.state.proportion==="经验值比例"){
this.Empiricalvalueratio();
this.Empiricalvalueratio(value);
}
@ -1627,13 +1668,13 @@ class Trainingjobsetting extends Component {
if(response.data.messages === "100"){
// 已超出文件导出的上限数量（100 ），建议：
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:500
})
}

4
public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
Unescape View File

@ -322,13 +322,13 @@ class Workquestionandanswer extends Component {
if(response.data.messages === "100"){
// 已超出文件导出的上限数量（100 ），建议：
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:false,
DownloadType:true,
DownloadMessageval:500
})
}

Write Preview
Loading…
Cancel
Save