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

glcc报名修改

This commit is contained in:
何童崇 2022-06-02 11:19:43 +08:00
parent af75705d03
commit 56f74c747b
5 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/glcc/index.jsx
View File

@ -74,7 +74,7 @@ const Glcc = (propsF) => {
data[item.taskId] = item.id;
})
setApplyTaskId(data);
setCancelCount(Number(response.data.cancelCount));
response.data&&setCancelCount(Number(response.data.cancelCount));
}
})
},[studentInfoReset, current_user])

9
src/glcc/project/taskList/index.jsx
View File

@ -24,9 +24,10 @@ function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDial
const columns = [
{ title: '序号', dataIndex: 'index', align: 'center', className:"taskTableColumns", width: '6%', render: (text, item, index) => <span>{(current-1)*pageSize+index + 1}</span> },
{ title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '28%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}}>{text}</span></Tooltip> },
{ title: '项目名称', dataIndex: 'projectName', className:"taskTableColumns", width: '28%', ellipsis: true, render: (text) => <Tooltip title={text} placement="topLeft">{text}</Tooltip> },
{ title: '课题奖金', dataIndex: 'taskReward', className:"taskTableColumns", ellipsis: true, width: `${isStudentApplyDate || studentApplyEnd ? '15%' : ''}`, render: (text) => <Tooltip title={text} placement="topLeft"><span>{text}</span></Tooltip> },
{ title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '22%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}}>{text}</span></Tooltip> },
{ title: '课题类型', dataIndex: 'projectType', className:"taskTableColumns", width: '10%', ellipsis: true, },
{ title: '项目名称', dataIndex: 'projectName', className:"taskTableColumns", width: '22%', ellipsis: true, render: (text) => <Tooltip title={text} placement="topLeft">{text}</Tooltip> },
{ title: '课题奖金', dataIndex: 'taskReward', className:"taskTableColumns", ellipsis: true, width: `${isStudentApplyDate || studentApplyEnd ? '18%' : ''}`, render: (text) => <Tooltip title={text} placement="topLeft"><span>{text}</span></Tooltip> },
{
title: '操作', dataIndex: 'action', align: 'center', className:"actionColumns taskTableColumns", render: ((text, item, index) => {
return (
@ -43,7 +44,7 @@ function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDial
]
function deleteItem(id){
if(cancelCount==1){
if(cancelCount==2){
showNotification("您的取消报名次数已用光，请联系导师处理相关报名审核信息");
}else{
setDeleteTaskId(id);

5
src/glcc/project/taskList/index.scss
View File

@ -77,7 +77,7 @@ tr:hover .actionColumns .cancelApply{
.tipTask{
color:#666666;
font-size:14px;
margin: 30px 0 30px 86px !important;
margin: 10px 0 10px 37px!important;
}
.tipTaskTime{
font-size: 36px;
@ -99,6 +99,9 @@ tr:hover .actionColumns .cancelApply{
color: #df0002;}
}
}
.ant-btn-default{
margin-left:43px;
}
}
}
.task.search{

33
src/glcc/student/index.jsx
View File

@ -119,12 +119,17 @@ function Apply(props) {
}]);
}
initTaskList.push({
id: item.id,
memo: item.memo,
memoAttachmentId: item.memoAttachmentId,
taskId: item.taskId,
});
if(item.enrollFirst){
applyInfo.enrollFirst=i;
}
initTaskList.push(item);
// initTaskList.push({
// id: item.id,
// memo: item.memo,
// memoAttachmentId: item.memoAttachmentId,
// taskId: item.taskId,
// });
}
setMyTaskList(initTaskList);
@ -172,8 +177,14 @@ function Apply(props) {
validateFieldsAndScroll((err, values) => {
if (!err) {
setLoading(true);
if(myTaskList.length===2){
myTaskList[values.enrollFirst].enrollFirst=true;
if (myTaskList.length === 2) {
if(values.enrollFirst==1){
myTaskList[1].enrollFirst = true;
myTaskList[0].enrollFirst = false;
}else{
myTaskList[1].enrollFirst = false;
myTaskList[0].enrollFirst = true;
}
}
const params = {
grade: values.grade,
@ -450,11 +461,17 @@ function Apply(props) {
{
myTaskList.map((item, i) => {
console.log(item )
return (
<Fragment key={item.taskId + '' + i}>
<h4 className="item-tit">课题信息（<span className="item-tit-num">{i + 1}</span>/2)
{/* {myTaskList.length > 1 && <span className="delete" onClick={() => { deleteTask(i) }}><i className="iconfont icon-shanchu mr5"></i>删除</span>} */}
</h4>
{item.status == 1 && item.auditRemark && <div className="reject-reason">
<div className="mb5"><i className="iconfont icon-shanchudiao"></i>欢迎您报名CCF GitLink开源编程夏令营，感谢您对GLCC项目及课题的关注和支持！本次您的报名信息未通过初审，原因如下：</div>
<div className="mb5 ml20" dangerouslySetInnerHTML={{__html:item.auditRemark}}></div>
<div className="mb5 ml20">希望您尽快修改并重新提交报名信息，我们将再次审核，万分感谢！</div>
</div>}
{helper('课题名称',
'',
'taskId' + i,

29
src/glcc/student/index.scss
View File

@ -294,7 +294,7 @@
.glcc_info_form .ant-row.ant-form-item.priority {
display: block;
width: 100%;
padding-top:5px;
padding-top: 5px;
border-top: 1px dashed #bec5d5;
.ant-col {
width: 100%;
@ -307,17 +307,37 @@
font-size: 14px;
}
.ant-radio-checked::after{
.ant-radio-checked::after {
border: 1px solid #466aff;
}
.ant-radio-checked .ant-radio-inner{
.ant-radio-checked .ant-radio-inner {
border-color: #466aff;
}
.ant-radio-inner::after{
.ant-radio-inner::after {
background-color: #466aff;
}
}
}
.reject-reason {
width: 100%;
min-height: 45px;
line-height: 42px;
background-color: rgba(242, 216, 216, 0.63);
border: 1px solid #df4c4c;
color: #595e82;
font-size: 15px;
padding-left:22px;
margin-bottom: 30px;
.icon-shanchudiao{
position: relative;
top:1px;
color: #e21b1b;
margin-right: 5px;
font-weight: 600;
}
}
.glcc-banner {
width: 100%;
}
@ -333,7 +353,6 @@
background-color: #e9efff;
}
}
}
.glcc_select
.ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled) {