diff --git a/public/react/package.json b/public/react/package.json index e21a44df3..47e7ecddd 100644 --- a/public/react/package.json +++ b/public/react/package.json @@ -91,6 +91,7 @@ "react-router-dom": "^4.2.2", "react-split-pane": "^0.1.89", "react-url-query": "^1.4.0", + "react-zmage": "^0.8.5-beta.31", "redux": "^4.0.0", "redux-thunk": "2.3.0", "rsuite": "^4.0.1", diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 5182cb991..2d04baa58 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -46,7 +46,7 @@ debugType = "admin"; // 老师 // debugType="teacher"; // 学生 - debugType="student"; +// debugType="student"; diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js index 75fbaaab4..db06f0166 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js @@ -107,6 +107,15 @@ class CommonWorkAppraise extends Component{ } gotoget_next_work=(id)=>{ + + if(this.props.match.path===`/classrooms/:coursesId/common_homework/:workId/:studentWorkId/appraise`){ + this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`); + } + + if(this.props.match.path===`/classrooms/:coursesId/group_homework/:workId/:studentWorkId/appraise`){ + this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`); + } + if(this.props.match.path===`/classrooms/:coursesId/common_homeworks/:workId/:studentWorkId/appraise`){ this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`); } @@ -114,6 +123,7 @@ class CommonWorkAppraise extends Component{ if(this.props.match.path===`/classrooms/:coursesId/group_homeworks/:workId/:studentWorkId/appraise`){ this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`); } + this.setState({ get_next_worktype:false }) diff --git a/public/react/src/modules/page/layers/ImageLayer.js b/public/react/src/modules/page/layers/ImageLayer.js index b1adc5b6b..af9359fe4 100644 --- a/public/react/src/modules/page/layers/ImageLayer.js +++ b/public/react/src/modules/page/layers/ImageLayer.js @@ -1,22 +1,18 @@ import React, { Component } from 'react'; import ReactDOM from 'react-dom' -import { Redirect } from 'react-router'; - -import PropTypes from 'prop-types'; -import Rate from 'rc-rate'; import './TaskResultLayer.css' class ImageLayer extends Component { - + render() { let { showImage, imageSrc, onImageLayerClose } = this.props; - + // 语法介绍 https://reactjs.org/docs/portals.html // 将html渲染都指定的element下 return ReactDOM.createPortal(