diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index d5d002e52..159694da8 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -111,6 +111,7 @@ export function initAxiosInterceptors(props) {
if(response===undefined){
return
}
+ // locationurl(402);
const config = response.config
if (response.data.status === -1) {
// console.error('error:', response.data.message)
diff --git a/public/react/src/common/components/SetAppModel.js b/public/react/src/common/components/SetAppModel.js
index b243bd0c2..a504beb69 100644
--- a/public/react/src/common/components/SetAppModel.js
+++ b/public/react/src/common/components/SetAppModel.js
@@ -1,8 +1,6 @@
import React, { Component } from 'react';
import { Modal } from 'antd';
-// import Notcompleted from './Notcompleted';
-
-export function SetAppModel(options = {}) {
+export function SetAppModel(options) {
return function wrap(WrappedComponent) {
return class Wrapper extends Component {
constructor(props) {
@@ -11,6 +9,16 @@ export function SetAppModel(options = {}) {
this.state = {
}
+ console.log("SetAppModel");
+ console.log("13");
+ console.log(options);
+ }
+ modalCancel=()=>{
+ window.location.href = "/";
+ }
+
+ setDownload=()=>{
+ window.location.href ='/account/profile';
}
componentDidMount(){
console.log(this.props)
@@ -18,13 +26,27 @@ export function SetAppModel(options = {}) {
render() {
const { titlemessage, Modallisttype, Modallist, singleButton } = this.state;
-
+ console.log(this.state.Notcompleteds);
return (
-
- {/*
*/}
+
+
+
)
}
}
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 5a2c89154..a63db222c 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -906,8 +906,11 @@ class Listofworksstudentone extends Component {
console.log("componentDidMount");
if(this.props.isAdmin() === true){
this.tearchar();
+ console.log("909");
}else{
this.student();
+ console.log("911");
+
}
}
student=()=>{
@@ -1482,7 +1485,7 @@ class Listofworksstudentone extends Component {
}
axios.post(urll, data).then((result) => {
debugger
- if (result !== undefined) {
+ if (result) {
// console.log(url)
// console.log("作品列表6789077")
// console.log(JSON.stringify(result))
@@ -1582,6 +1585,7 @@ class Listofworksstudentone extends Component {
let columns = this.state.columns;
var columns2=[];
if (teacherdata !== undefined) {
+ console.log("1588");
for (var i = 0; i < student_works.length; i++) {
var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
datalist.push({
@@ -1605,6 +1609,8 @@ class Listofworksstudentone extends Component {
user_name: student_works[i].user_name,
user_login: student_works[i].user_login,
})
+ console.log(datalist);
+ console.log("1612");
}
@@ -1701,6 +1707,9 @@ class Listofworksstudentone extends Component {
} else {
}
+
+ console.log(datalist);
+ console.log("1712");
this.setState({
data: datalist,
columns: columns2,
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 5282b86a0..03d69d61c 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -141,8 +141,9 @@ class ShixunHomeworkPage extends Component {
render() {
let {tab, teacherdata, jobsettingsdata} = this.state;
-
const isAdmin = this.props.isAdmin();
+ console.log(tab);
+ console.log("147147147147147147147");
return (
@@ -279,13 +280,13 @@ class ShixunHomeworkPage extends Component {
/>
- {parseInt(tab) === 0 && this.Getdataback(jobsettingsdata, teacherdata)}>}
+ {parseInt(tab) === 0 ? this.Getdataback(jobsettingsdata, teacherdata)}>:""}
- {parseInt(tab) === 1 && this.Getdataback(jobsettingsdata, teacherdata)}>}
+ {parseInt(tab) === 1 ? this.Getdataback(jobsettingsdata, teacherdata)}>:""}
- {parseInt(tab) === 2 && this.Getdataback(jobsettingsdata, teacherdata)}>}
+ {parseInt(tab) === 2 ? this.Getdataback(jobsettingsdata, teacherdata)}>:""}
- {parseInt(tab) === 3 && this.Getdataback(jobsettingsdata, teacherdata)}>}
+ {parseInt(tab) === 3 ? this.Getdataback(jobsettingsdata, teacherdata)}>:""}
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 44a1ebbbd..c672caa84 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -171,7 +171,7 @@ class NewHeader extends Component {
submitapplications:false,
isRender:false,
// isRenders:false,
- // showTrial:false,
+ showTrial:false,
}
// console.log("176")
// console.log(props);
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index 7dba8a4e5..5453647aa 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -159,7 +159,7 @@
display: flex;
justify-content:center;
width: 60px;
- margin-left: 21px;
+ margin-left: 26px;
}
.yslgouxuanimg{