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(
{ + this.setState({ + DownloadType:false, + DownloadMessageval:undefined + }) + } render(){ let {tab,visible,Commonheadofthetestpaper}=this.state; const isAdmin =this.props.isAdmin(); @@ -166,6 +182,12 @@ class Testpapersettinghomepage extends Component{ return(
+
{/* 公用的提示弹框 */} {this.state.Modalstype===true?{ + this.setState({ + DownloadType:false, + DownloadMessageval:undefined + }) + } render() { // console.log("Listofworks.js000") @@ -1379,7 +1396,13 @@ class Listofworks extends Component { issCancel={() => this.hideshowmodel()} updatas={() => this.isupdatas()} /> : ""} - + + {visibles === true ?
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index de7aab180..2d2babb09 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -3,7 +3,8 @@ import CoursesListType from '../coursesPublic/CoursesListType'; import {WordsBtn,ActionBtn} from 'educoder'; import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal'; import HomeworkModal from "../coursesPublic/HomeworkModal"; -import NoneData from '../coursesPublic/NoneData' +import NoneData from '../coursesPublic/NoneData'; +import DownloadMessage from '../../modals/DownloadMessage'; import { Form, Select, @@ -465,8 +466,17 @@ class ShixunStudentWork 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'); @@ -476,7 +486,12 @@ class ShixunStudentWork extends Component { }); } - + Downloadcal=()=>{ + this.setState({ + DownloadType:false, + DownloadMessageval:undefined + }) + } render() { let { data, @@ -566,6 +581,13 @@ class ShixunStudentWork extends Component { issCancel={()=>this.hideshowmodel()} updatas={()=>this.getupdata()} />:""} + + {/*立即发布*/} { + this.setState({ + DownloadType:false, + DownloadMessageval:undefined + }) + } render() { let{data} =this.state; let category_id=data===undefined?"":data.category.category_id; @@ -108,7 +124,12 @@ class ShixunWorkReport extends Component { {data&&data.username}

- +

{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()} />:""} + + + {/*立即发布*/} { + this.setState({ + DownloadType:false, + DownloadMessageval:undefined + }) + } render() { const dateFormat = 'YYYY-MM-DD HH:mm:ss'; let { @@ -366,6 +373,12 @@ class Workquestionandanswer extends Component { issCancel={() => this.hideshowmodel()} updatas={() => this.isupdatas()} /> : ""} + {/*立即发布*/} { + this.props.modalCancel(); + window.open(`/users/${this.props.user.login}/private_messages`) + } +render() { + + return( + +
+ {this.props.value===500?

+

因附件资料超过500M,您可以通过检索分批下载

+

或者通过微信或者QQ联系管理员辅助您打包下载

+

:this.props.value===100? +

+

已超出文件导出的上限数量( 100 ),建议:

+

1.通过检索分批次下载

+

2.联系管理员辅助下载

+

+ :""} + +
+
+ ) + } +} + +export default DownloadMessage; \ No newline at end of file