diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js index 1e151b654..0a2ce11ba 100644 --- a/public/react/src/modules/courses/exercise/Exercisesetting.js +++ b/public/react/src/modules/courses/exercise/Exercisesetting.js @@ -548,7 +548,7 @@ class Exercisesetting extends Component{ }, }; - console.log(flagPageEdit===true?polls&&polls.exercise_status===1?3:2:1) + // console.log(flagPageEdit===true?polls&&polls.exercise_status===1?3:2:1) return(
{data&&data.shixun_name}
{/*{this.props.isAdmin()?导出实训报告数据:""}*/} diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 466f2e9b7..1ff1c1170 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -27,7 +27,7 @@ import '../poll/pollStyle.css' import moment from 'moment'; import 'moment/locale/zh-cn'; import Modals from "../../modals/Modals"; - +import DownloadMessage from '../../modals/DownloadMessage'; const RadioGroup = Radio.Group; //GraduationTaskssetting.js @@ -1618,8 +1618,16 @@ class Trainingjobsetting extends Component { }else if(response.data.status&&response.data.status===-2){ if(response.data.messages === "100"){ // 已超出文件导出的上限数量(100 ),建议: + this.setState({ + DownloadType:false, + DownloadMessageval:100 + }) }else { //因附件资料超过500M + this.setState({ + DownloadType:false, + DownloadMessageval:500 + }) } }else { window.open(url, '_blank'); @@ -1629,7 +1637,12 @@ class Trainingjobsetting extends Component { }); } - + Downloadcal=()=>{ + this.setState({ + DownloadType:false, + DownloadMessageval:undefined + }) + } render() { @@ -1663,6 +1676,14 @@ class Trainingjobsetting extends Component { data={[]} issCancel={()=>this.hideshowmodel()} />:""} + +