Merge remote-tracking branch 'origin/master'

dev_forum
杨树明 6 years ago
commit 50f45d36c8

@ -932,7 +932,7 @@ class Listofworksstudentone extends Component {
componentDidMount() { componentDidMount() {
console.log("componentDidMount"); console.log("componentDidMount");
console.log(this.props.isAdmin()); // console.log(this.props.isAdmin());
if(this.props.isAdmin() === true){ if(this.props.isAdmin() === true){
this.tearchar(); this.tearchar();
// console.log("909"); // console.log("909");
@ -1109,7 +1109,7 @@ class Listofworksstudentone extends Component {
}) })
} else { } else {
console.log(teacherdata) // console.log(teacherdata)
if (teacherdata.id !== undefined || teacherdata.id !== null || teacherdata.id !== "") { if (teacherdata.id !== undefined || teacherdata.id !== null || teacherdata.id !== "") {
// console.log("seacthdata设置数据1") // console.log("seacthdata设置数据1")
// console.log(this.state.teacherdata ) // console.log(this.state.teacherdata )
@ -1611,7 +1611,7 @@ class Listofworksstudentone extends Component {
let columns = this.state.columns; let columns = this.state.columns;
var columns2=[]; var columns2=[];
if (teacherdata !== undefined) { if (teacherdata !== undefined) {
console.log("1588"); // console.log("1588");
for (var i = 0; i < student_works.length; i++) { for (var i = 0; i < student_works.length; i++) {
var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm'); var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
datalist.push({ datalist.push({

@ -54,9 +54,9 @@ class ShixunHomeworkPage extends Component {
} }
Getdataback = (jobsettingsdata, teacherdata) => { Getdataback = (jobsettingsdata, teacherdata) => {
console.log("56"); // console.log("56");
console.log(jobsettingsdata); // console.log(jobsettingsdata);
console.log(teacherdata); // console.log(teacherdata);
this.setState({ this.setState({
jobsettingsdata: jobsettingsdata, jobsettingsdata: jobsettingsdata,
@ -72,13 +72,13 @@ class ShixunHomeworkPage extends Component {
// let sum = [] // let sum = []
// sum.push(type[1]) // sum.push(type[1])
// console.log("componentDidMountcomponentDidMount"); // console.log("componentDidMountcomponentDidMount");
console.log(type); // console.log(type);
this.setState({ this.setState({
tab: type[1], tab: type[1],
}) })
let querys = this.props.location.pathname; let querys = this.props.location.pathname;
const types = querys.split('/'); const types = querys.split('/');
console.log(types); // console.log(types);
this.setState({ this.setState({
shixuntypes: types[3] shixuntypes: types[3]
}) })

Loading…
Cancel
Save