diff --git a/src/glcc/img/resultBanner3.png b/src/glcc/img/resultBanner3.png index b44d0f34..cb93c7b3 100644 Binary files a/src/glcc/img/resultBanner3.png and b/src/glcc/img/resultBanner3.png differ diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx index bd7d0cba..353583b8 100644 --- a/src/glcc/index.jsx +++ b/src/glcc/index.jsx @@ -89,7 +89,7 @@ const Glcc = (propsF) => { const checkTime1 = new Date().getTime() > new Date('2022/10/01 8:0').getTime(); // 导师结项考核时间 const checkTime2 = new Date().getTime() > new Date('2022/10/01 8:0').getTime() && new Date().getTime() < new Date('2022/10/23 24:0').getTime(); - // 结项考核结果公示8月26日0点 + // 结项考核结果公示 const checkTime3 = new Date().getTime() > new Date('2022/10/24 10:0').getTime(); // 用户已报名课题id数组 diff --git a/src/glcc/interimReview/studentSubmit.jsx b/src/glcc/interimReview/studentSubmit.jsx index 5cc8009c..932dfefe 100644 --- a/src/glcc/interimReview/studentSubmit.jsx +++ b/src/glcc/interimReview/studentSubmit.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { Form, Upload, Input, Icon, Button, message } from "antd"; +import { Form, Upload, Input, Icon, Button, message, Modal } from "antd"; import { Link } from "react-router-dom"; import banner from '../img/banner-interim.png'; import img1 from '../img/img1.png'; @@ -19,7 +19,7 @@ function StudentSubmit(props){ // 学生提交材料时间 const submitTime = new Date().getTime() < new Date('2022/10/14 24:0').getTime(); // 学生提醒导师评分时间 - const lookTime = new Date().getTime() > new Date('2022/10/15 0:0').getTime() && new Date().getTime() < new Date('2022/10/20 24:0').getTime(); + const lookTime = new Date().getTime() > new Date('2022/10/15 0:0').getTime() && new Date().getTime() < new Date('2022/10/23 24:0').getTime(); useEffect(()=>{ if(!checkTime1){ @@ -42,32 +42,44 @@ function StudentSubmit(props){ e.preventDefault(); validateFieldsAndScroll((err, values) => { if(!err){ - const {pptAttachment, defenceVideoUrl, codeOrPrUrl} = values; - const pptAttachmentId = pptAttachment.file.response.data.id; - const params = { - pptAttachmentId, - codeOrPrUrl, - defenceVideoUrl, - taskId: checkedTaskId, - studentRegId: studentRegId, - term: 2 - } - submitMedium(params).then(res=>{ - if(res && res.message === "success"){ - if(!res.data){ - setReload(Math.random()); - }else if(res.data.code === '-1'){ - message.error('不可重复提交'); + Modal.confirm({ + title: "确认提交结项考核材料?", + content: "提交后将无法修改考核材料,请进行二次确认", + onOk: ()=>{ + const {pptAttachment, defenceVideoUrl, codeOrPrUrl} = values; + const pptAttachmentId = pptAttachment.file.response.data.id; + const params = { + pptAttachmentId, + codeOrPrUrl, + defenceVideoUrl, + taskId: checkedTaskId, + studentRegId: studentRegId, + term: 2 } + submitMedium(params).then(res=>{ + if(res && res.message === "success"){ + if(!res.data){ + setReload(Math.random()); + }else if(res.data.code === '-1'){ + message.error('不可重复提交'); + } + }else{ + setDisabled(false); + } + }) + }, + onCancel:()=>{ + setDisabled(false); } }) + }else{ + setDisabled(false); } }) } // 检查文件上传是否符合规定 function changeFileList(e) { const {fileList} = e; - console.log('fileList', fileList, e); const lastFile = fileList.splice(fileList.length-1, fileList.length); setFileList(lastFile); } @@ -79,7 +91,7 @@ function StudentSubmit(props){