Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

dev_forum
杨树明 6 years ago
commit 23fea61cc0

@ -1716,14 +1716,14 @@ class Trainingjobsetting extends Component {
if(rules[i].course_group_id instanceof Array ){
datas.push({
group_id:rules[i].course_group_id,
publish_time:rules[i].publish_time===undefined||rules[i].publish_time===null||rules[i].publish_time===""?"": moment(rules[i].publish_time).format('YYYY-MM-DD HH:mm') ,
end_time:rules[i].end_time===undefined||rules[i].end_time===null||rules[i].end_time===""?"": moment(rules[i].end_time).format('YYYY-MM-DD HH:mm') ,
publish_time: moment(rules[i].publish_time).format('YYYY-MM-DD HH:mm') ,
end_time:moment(rules[i].end_time).format('YYYY-MM-DD HH:mm') ,
});
}else {
datas.push({
group_id:[rules[i].course_group_id],
publish_time: rules[i].publish_time===undefined||rules[i].publish_time===null||rules[i].publish_time===""?"": moment(rules[i].publish_time).format('YYYY-MM-DD HH:mm') ,
end_time:rules[i].end_time===undefined||rules[i].end_time===null||rules[i].end_time===""?"": moment(rules[i].end_time).format('YYYY-MM-DD HH:mm') ,
publish_time: moment(rules[i].publish_time).format('YYYY-MM-DD HH:mm') ,
end_time:moment(rules[i].end_time).format('YYYY-MM-DD HH:mm') ,
});
}

Loading…
Cancel
Save