diff --git a/src/glcc/interimReview/index.scss b/src/glcc/interimReview/index.scss index 3628ae54..2e03e031 100644 --- a/src/glcc/interimReview/index.scss +++ b/src/glcc/interimReview/index.scss @@ -71,6 +71,52 @@ .contentBox{ padding: 10px 11px 20px } + &.oneLine{ + margin-bottom: 10px; + input{ + width:55%; + } + .ant-form-item-label{ + width:74px; + } + } + &.labelW{ + .ant-form-item-label{ + width:77px; + } + } + &.isEmpower{ + height:20px; + line-height: 20px; + margin-left: 95px; + margin-bottom: 20px; + .ant-form-item-control{ + line-height: 20px; + } + .ant-checkbox-wrapper{ + font-weight: 500; + .ant-checkbox-inner{ + width: 12px; + height: 12px; + margin-top: -1px; + } + } + } + &.referTips{ + font-size: 14px; + color:#F52245; + margin-left: 95px; + margin-bottom: 30px; + font-weight: 500; + .ant-form-item-children{ + >p{ + line-height: 18px; + } + >p:last-child{ + margin-left:22px; + } + } + } } &.tutor{ border: none; diff --git a/src/glcc/interimReview/studentSubmit.jsx b/src/glcc/interimReview/studentSubmit.jsx index ff4619b2..df9030d7 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, Modal } from "antd"; +import React, { useEffect, useState, Fragment } from "react"; +import { Form, Upload, Input, Icon, Button, message, Modal, Checkbox } from "antd"; import { Link } from "react-router-dom"; import banner from '../img/banner-interim.png'; import banner1 from '../img/banner-interim1.png'; @@ -29,6 +29,8 @@ function StudentSubmit(props){ const [fileList, setFileList] = useState(undefined); // 学生提交信息之后按钮置灰(确保无重复提交) const [disabled, setDisabled] = useState(false); + // 是否授权主办方 + const [isAuthed, setIsAuthed] = useState(false); useEffect(()=>{ // 查询是否已经提交考核材料 @@ -58,6 +60,7 @@ function StudentSubmit(props){ taskId: checkedTaskId, studentRegId: studentRegId, round: currentRound, + isAuthed, term: period === "mediumExamine1" ? 1 : 2 } submitMedium(params).then(res=>{ @@ -85,7 +88,16 @@ function StudentSubmit(props){ function changeFileList(e) { const {file} = e; - file && file.status && setFileList([file]); + if(file && file.response && file.response.message && file.response.message == '文件上传失败'){ + message.error('文件上传失败,请重新上传'); + setFileList([]) + }else{ + file && file.status && setFileList([file]); + } + } + + function changeEmpower(e){ + setIsAuthed(e.target.checked); } // 检查文件上传是否符合规定 @@ -114,21 +126,53 @@ function StudentSubmit(props){ {period === "mediumExamine1" ? '中期' : '结项'}考核 {period === "mediumExamine1" && !detail ?
- - {getFieldDecorator('defenceVideoUrl', { - rules: [{ required: true, message: '请输入视频链接!'}, {pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/,message: "请正确输入链接"}], - })()} - - - {getFieldDecorator('codeOrPrUrl', { - rules: [{pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/,message: "请正确输入链接"}], - })()} - + { + period === "mediumExamine1"? + + + {getFieldDecorator('defenceVideoUrl', { + rules: [{ required: true, message: '请输入视频链接!'}, {pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/,message: "请正确输入链接"}], + })()} + + + + 授权主办方进行下载和剪辑,用作比赛宣传 + + + + {getFieldDecorator('codeOrPrUrl', { + rules: [{ required: true, message: '请输入视频链接!'},{pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/,message: "请正确输入链接"}], + })()} + + +

注: 按主办方要求,GLCC官方资助课题最终需要在Gitlink平台进行pr提交。

+

请和导师确认您的课题是否官方赞助,如为官方赞助,请确保终期考核的pr提交在Gitlink平台上进行,否则将会影响您的最终考核。

+
+
+ : + + + {getFieldDecorator('defenceVideoUrl', { + rules: [{ required: true, message: '请输入视频链接!'}, {pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/,message: "请正确输入链接"}], + })()} + + + {getFieldDecorator('codeOrPrUrl', { + rules: [{pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/,message: "请正确输入链接"}], + })()} + + + } {getFieldDecorator('pptAttachment', { rules: [{ required: true, message: '请上传PPT附件!' }], })( - )} + {period === "mediumExamine1"? + + : + + } + )}