调整 提的bug 需求

dev_forge
杨树林 5 years ago
parent 24b801629d
commit 99a21ac341

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

Loading…
Cancel
Save