diff --git a/public/react/src/modules/courses/common/CNotificationHOC.js b/public/react/src/modules/courses/common/CNotificationHOC.js index a74620764..4dfa25f0b 100644 --- a/public/react/src/modules/courses/common/CNotificationHOC.js +++ b/public/react/src/modules/courses/common/CNotificationHOC.js @@ -18,14 +18,22 @@ export function CNotificationHOC(options = {}) { } showNotification = (description, message = "提示", icon) => { - const data = { - message, - description - } - if (icon) { - data.icon = icon; - } - notification.open(data); + // const data = { + // message, + // description + // } + // if (icon) { + // data.icon = icon; + // } + // notification.open(data); + + notification.open({ + message:message, + description: description, + style: { + zIndex: 99999999 + }, + }); } bytesToSize = (bytes) => { diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 5f63952cb..0114f564c 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -78,6 +78,12 @@ class CoursesNew extends Component { console.log(error); }) }else{ + let url = "/courses/new.json" + axios.get(url).then((result) => { + console.log(result) + }).catch((error) => { + console.log(error); + }) // console.log(user_school); this.props.form.setFieldsValue({ school:user_school, diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 8bb2bbcfd..8ec2ffcbc 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -15,7 +15,8 @@ import { Pagination, Radio, Tooltip, - notification + notification, + Spin, } from "antd"; import './style.css'; import 'moment/locale/zh-cn'; @@ -2253,7 +2254,7 @@ class Listofworksstudentone extends Component { render() { let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state; - + const antIcon = ; // console.log(this.state.student_works); // console.log("841"); // console.log(this.state.columns); @@ -2384,13 +2385,16 @@ class Listofworksstudentone extends Component { background:#EDEDED; cursor: pointer; } - + .shixunSpin{ + color:#FF6801; + margin-right: 10px; + } `} {computeTimetype===false?
  • + - 正在执行成绩计算,请稍后刷新页面查看结果 - 温馨提示:执行时间因作品数量而异 + 正在执行成绩计算,完成后将为您自动刷新结果。温馨提示:执行时间因作品数量而异
  • :""} @@ -2630,10 +2634,10 @@ class Listofworksstudentone extends Component {
    - - + {computeTimetype===false?
  • + - 正在执行成绩计算,请稍后刷新页面查看结果 - 温馨提示:执行时间因作品数量而异 + 正在执行成绩计算,完成后将为您自动刷新结果。温馨提示:执行时间因作品数量而异
  • :""} @@ -2774,12 +2785,20 @@ class Listofworksstudentone extends Component {
    - + {computeTimetype===false?
  • + - 正在执行成绩计算,请稍后刷新页面查看结果 - 温馨提示:执行时间因作品数量而异 + 正在执行成绩计算,完成后将为您自动刷新结果。温馨提示:执行时间因作品数量而异
  • :""} diff --git a/public/react/src/modules/paths/PathNew.js b/public/react/src/modules/paths/PathNew.js index 0575fc817..3acad7eed 100644 --- a/public/react/src/modules/paths/PathNew.js +++ b/public/react/src/modules/paths/PathNew.js @@ -158,6 +158,15 @@ class PathNew extends Component{ } componentDidMount() { + + let url = "/paths/new.json" + axios.get(url).then((result) => { + console.log(result) + }).catch((error) => { + console.log(error); + }) + + let pathId = this.props.match.params.pathId; if (pathId) { this.isEditPage = true