Zgna
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glcc issue修改

This commit is contained in:
谢思 2022-10-08 11:20:26 +08:00
parent bc6a03926c
commit 8b6a83309a
5 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/glcc/img/resultBanner3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 895 KiB

After

Width:  |  Height:  |  Size: 896 KiB

2
src/glcc/index.jsx
View File

@ -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数组

53
src/glcc/interimReview/studentSubmit.jsx
View File

@ -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){
<div className="navBox font-16"><Link to={`/glcc`} className="linkBox">开源夏令营 / </Link>提交结项考核材料</div>
<div className="tipBox mt30">
<div className="font-15 spanBox">材料提交说明:</div>
<div>1、请各位学生<a href={`${main_site_url.indexOf("gitlink") !== -1 ? '/api/attachments/392565' : httpUrl+'/busiAttachments/download/169'}`} className="blueSpan">下载PPT模板</a> ，根据课题开发进展，按照PPT模板要求填写课题学习调研方案、开发进度及开发成果等考核材料；</div>
<div>1、请各位学生<a href={httpUrl+`/busiAttachments/download/${main_site_url.indexOf("gitlink") === -1 ? '211' : '743'}`} className="blueSpan">下载PPT模板</a> ，根据课题开发进展，按照PPT模板要求填写课题学习调研方案、开发进度及开发成果等考核材料；</div>
<div>2、欢迎各位学生录制本课题答辩视频，将视频链接填写至下方视频介绍填写栏；</div>
<div>3、学生提交考核材料的时间为<span className="spanBox">2022年10月1日8点至2022年10月14日24点</span>，请在截止时间前提交；</div>
<div>4、若导师已给出评分，各位学生可在此页面查看自己的结项考核成绩。对考核成绩有异议的学生请及时联系您的导师。</div>
@ -116,6 +128,7 @@ function StudentSubmit(props){
</div>
{!detail && <div className="nullDateTip font-15">很遗憾，您在指定时间内未提交考核材料</div>}
{detail && lookTime && !detail.glccTutorEvaluation && <div className="font-15 nullDateTip">您的课题导师暂未评分，请提醒导师尽快提交结项考核评分</div>}
{detail && new Date().getTime() > new Date('2022/10/24 10:0').getTime() && !detail.glccTutorEvaluation && <div className="font-15 nullDateTip">很遗憾，您的导师尚未评分，您未通过结项考核</div>}
{detail && detail.glccTutorEvaluation && <div className="tutorRes">
<div>您的课题导师对您的结项考核评价如下，如有异议，请及时联系导师进行更改。</div>
<div className="mt10 mb10 smallTil">

2
src/glcc/interimReview/tutorReview.jsx
View File

@ -179,7 +179,7 @@ function TutorReview(props){
{detail.glccTutorEvaluation && !isEdit && <Button style={{width: '100px', height: '36px'}} className="mt20" type="primary" onClick={()=>{setIsEdit(true);setDisabled(false);}}>修改</Button>}
</Form.Item>}
</Form>
</div>:<Nodata _html="该课题学生暂未提交中期考核材料，请提醒学生尽快提交"/>}
</div>:<Nodata _html="该课题学生暂未提交结项考核材料，请提醒学生尽快提交"/>}
</div>
</div>
</div>

2
src/home/Index.scss
View File

@ -958,7 +958,7 @@ body{
display: flex!important;
padding:10px 2px;
align-items: center;
justify-content: space-between;
justify-content: center;
a{
background: #FFFFFF;
box-shadow: 0px 1px 8px 1px rgba(0, 0, 0, 0.06);