diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 0a76ae339..1b20f56bc 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -144,8 +144,8 @@ class Trainingjobsetting extends Component { } componentDidMount() { - console.log("Trainingjobsetting"); - console.log("componentDidMount"); + //console.log("Trainingjobsetting"); + //console.log("componentDidMount"); this.getTrainingjobsetting(true); let query = this.props.location.pathname; const type = query.split('/'); @@ -339,6 +339,7 @@ class Trainingjobsetting extends Component { var datas = challenge_settings; var challenge_scoredata = []; + let datasinde=0; for (var i = 0; i < datas.length; i++) { if (datas[i].checked === true) { // var object = { @@ -347,9 +348,16 @@ class Trainingjobsetting extends Component { // }; challenge_scoredata.push(datas[i].challenge_score); // array.push(object) + }else{ + datasinde=datasinde+1; } } + + // //console.log("datasinde Calculatethetotalscore"); + // //console.log(datasinde); + // //console.log(datas.length); + // if(array === "[]" || array.length === 0){ // this.props.showNotification(`没有关卡不能更新设置`); // return; @@ -361,32 +369,27 @@ class Trainingjobsetting extends Component { // latedeductiontwos = this.state.latedeductiontwo; // } // if(challenge_scoredata.length>0){ - let len = 0; - console.log(challenge_scoredata); - for (var k = 0; k < challenge_scoredata.length; k++) { - len = len + parseFloat(challenge_scoredata[k]); - // console.log(challenge_scoredata[k]); - // console.log(len); + if(datasinde!==datas.length){ + let len = 0; + //console.log(challenge_scoredata); + for (var k = 0; k < challenge_scoredata.length; k++) { + len = len + parseFloat(challenge_scoredata[k]); + } + let max = latedeductiontwos + len; + let maxs = max.toFixed(1); + this.setState({ + CalculateMax: maxs, + }) } - let max = latedeductiontwos + len; - let maxs = max.toFixed(1); - console.log("Calculatethetotalscore"); - console.log(maxs); - this.setState({ - CalculateMax: maxs, - }) - - // } - } //提交数据 pustdate = () => { var thiss = this; - // console.log("pustdate"); + // //console.log("pustdate"); var homeworkid = this.props.match.params.homeworkid var array = []; var datas = this.state.challenge_settings; @@ -399,9 +402,9 @@ class Trainingjobsetting extends Component { }; challenge_scoredata.push(datas[i].challenge_score); array.push(object) - // console.log("datas[i].challenge_score"); - // console.log(i); - // console.log(datas[i].challenge_score); + // //console.log("datas[i].challenge_score"); + // //console.log(i); + // //console.log(datas[i].challenge_score); } } @@ -690,7 +693,7 @@ class Trainingjobsetting extends Component { if (this.state.unifiedsetting === true) { - console.log("统一设置"); + //console.log("统一设置"); data = { unified_setting: this.state.unifiedsetting, //统一配置 publish_time: moment(this.state.publish_time).format('YYYY-MM-DD HH:mm'), //发布时间 @@ -999,21 +1002,21 @@ 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); + //console.log(intkks); mact = mact + 1; if (mact === srorelength) { challenge_settingsdata[i].challenge_score = (parseFloat(Proportion.toFixed(1)) + parseFloat(intkks.toFixed(1))).toFixed(1); - console.log(challenge_settingsdata[i].challenge_score); + //console.log(challenge_settingsdata[i].challenge_score); } else { challenge_settingsdata[i].challenge_score = Proportion.toFixed(1); } } else { - console.log(intkk); + //console.log(intkk); mact = mact + 1; if (mact === srorelength) { challenge_settingsdata[i].challenge_score = (parseFloat(Proportion.toFixed(1)) + parseFloat(intkk.toFixed(1))).toFixed(1); - console.log(challenge_settingsdata[i].challenge_score); + //console.log(challenge_settingsdata[i].challenge_score); } else { challenge_settingsdata[i].challenge_score = Proportion.toFixed(1); } @@ -1092,14 +1095,14 @@ class Trainingjobsetting extends Component { if (mact === macts) { if (bool === true) { challenge_settingsdata[i].challenge_score = (parseFloat(challenge_settingsdata[i].challenge_score) + parseFloat(expzsy.toFixed(1))).toFixed(1); - console.log(parseFloat(challenge_settingsdata[i].challenge_score) + parseFloat(expzsy.toFixed(1))); - console.log(parseFloat(expzsy.toFixed(1))); + //console.log(parseFloat(challenge_settingsdata[i].challenge_score) + parseFloat(expzsy.toFixed(1))); + //console.log(parseFloat(expzsy.toFixed(1))); } else { challenge_settingsdata[i].challenge_score = (parseFloat(challenge_settingsdata[i].challenge_score) - parseFloat(expzsy.toFixed(1))).toFixed(1); - console.log(parseFloat(challenge_settingsdata[i].challenge_score) - parseFloat(expzsy.toFixed(1))); - console.log(parseFloat(expzsy.toFixed(1))); + //console.log(parseFloat(challenge_settingsdata[i].challenge_score) - parseFloat(expzsy.toFixed(1))); + //console.log(parseFloat(expzsy.toFixed(1))); } } @@ -1407,7 +1410,7 @@ class Trainingjobsetting extends Component { }); } ontimeonok = (value) => { - console.log("ontimeonok点击了2"); + //console.log("ontimeonok点击了2"); if (value === undefined) { return; @@ -1479,7 +1482,7 @@ class Trainingjobsetting extends Component { } } onStartChange = (value, dateString) => { - console.log("onStartChange点击了1"); + //console.log("onStartChange点击了1"); if (value == null) { this.setState({ @@ -1508,8 +1511,8 @@ class Trainingjobsetting extends Component { } catch (e) { } - // console.log(value); - console.log(dateString); + // //console.log(value); + //console.log(dateString); // console.log(handleDateString(dateString)); // this.onChangedata('publish_time', value, dateString); this.setState({ @@ -1662,7 +1665,7 @@ class Trainingjobsetting extends Component { rulesdata.map((item, key) => { if (item.publish_time != "Invalid date") { if (moment(value, "YYYY-MM-DD HH:mm") <= moment(item.publish_time)) { - console.log(moment(item.publish_time, "YYYY-MM-DD HH:mm") <= moment(publish_time)) + //console.log(moment(item.publish_time, "YYYY-MM-DD HH:mm") <= moment(publish_time)) let kes = key + 1; this.setState({ hand__e_tip: "补交时间不能早于发布规则" + kes + "的发布时间", @@ -2061,9 +2064,9 @@ class Trainingjobsetting extends Component { } } catch (e) { - console.log("报错editSettings"); - console.log(1); - console.log(e); + //console.log("报错editSettings"); + //console.log(1); + //console.log(e); } @@ -2089,8 +2092,8 @@ class Trainingjobsetting extends Component { } } } catch (e) { - console.log(2); - console.log(e); + //console.log(2); + //console.log(e); this.setState({ flagPageEditsbox: true, flagPageEdit: true, @@ -2121,8 +2124,8 @@ class Trainingjobsetting extends Component { } } catch (e) { - console.log(3); - console.log(e); + //console.log(3); + //console.log(e); } }; //取消编辑 @@ -2167,8 +2170,8 @@ class Trainingjobsetting extends Component { } } - console.log(rules); - console.log(datas); + //console.log(rules); + //console.log(datas); this.setState({ rules, rulesdata: datas,