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

Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server

This commit is contained in:
caishi 2022-05-27 16:04:52 +08:00
parent 20171244fc e87fb6080c
commit 2be33ed9d1
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/glcc/index.scss
View File

@ -21,7 +21,10 @@
.icon-bangzhuzhongxinicon, .icon-bangzhuzhongxinicon1{color:#ffffff}
}
}
.qqChatBox .ant-popover-arrow{display: none;}
.qqChatBox{
position: fixed;
.ant-popover-arrow{display: none;}
}
.qqChat{
margin: -12px -16px;
background-image:linear-gradient(180deg,#f8faff 0%,#dee7ff 100%);

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

@ -150,7 +150,7 @@ function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDial
<div className="list">
<div className='search task'>
{current_user && current_user.login ? <Checkbox onChange={(e)=>{setCurrent(1);setApply(e.target.checked)}}>已报名</Checkbox> : <div></div>}
<Search className='taskSearch' placeholder='请输入课题名称进行搜索' allowClear enterButton onSearch={(value) => { setCurrent(1); setKeyword(value) }} />
<Search className='taskSearch' placeholder='请输入课题/项目名称进行搜索' allowClear enterButton onSearch={(value) => { setCurrent(1); setKeyword(value) }} />
<div></div>
</div>
<Table

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

@ -21,7 +21,7 @@ const gradeList = [
{ id: '研二', name: '研二' },
{ id: '研三', name: '研三' }];
function Apply(props) {
const { form, current_user, showNotification, match,history, setStudentInfoReset } = props;
const { form, current_user, showNotification, match, history, setStudentInfoReset } = props;
const taskId = Number(match.params.taskId);
// 可用于开发时不同账号报名
// current_user && (current_user.user_id = 6)
@ -364,7 +364,7 @@ function Apply(props) {
<div className="head_content">5、提交申请后，请耐心等待，我们会在2022年7月1日公布入围结果。如有任何问题，请添加开源夏令营QQ群进行咨询</div>
</div>
<div className="main-tit">
<img src={studentSvg} alt=''/><span className="tit-text">学生报名</span>
<img src={studentSvg} alt='' /><span className="tit-text">学生报名</span>
</div>
<div className="form-content">
<div className="form-tit">申请课题</div>
@ -394,7 +394,7 @@ function Apply(props) {
{getFieldDecorator("location", {
rules: []
})(
<Cascader expandTrigger="hover" popupClassName="glcc_cascader" placeholder="请选择省份城市" options={locData} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} />
<Cascader expandTrigger="hover" popupClassName="glcc_cascader" placeholder="请选择省份城市" options={locData} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} />
)}
</Form.Item>
{helper('所在年级',
@ -438,7 +438,7 @@ function Apply(props) {
onChange={handleChange}
>
{imageUrl ? <img src={imageUrl} alt="avatar" style={{ maxWidth: '100px', maxHeight: '100px' }} /> : userApplyInfo && userApplyInfo.proveAttachmentId ?
<div><img src={`${getUrl()}/api/attachments/${userApplyInfo.proveAttachmentId}`} alt='' style={{maxWidth: '100px'}}/></div> : <div>
<div><img src={`${getUrl()}/api/attachments/${userApplyInfo.proveAttachmentId}`} alt='' style={{ maxWidth: '100px' }} /></div> : <div>
<i className='iconfont icon-tianjiadaohang font-30'></i>
<div className="ant-upload-text font-13">请上传学生证明</div>
</div>}
@ -468,11 +468,18 @@ function Apply(props) {
</Select>
)}
<div className='introArea'>{helper('自荐书',
<div className="memoExtra">自荐书示例：<a href="https://forum.gitlink.org.cn/forums/7299/detail" target="_black">https://forum.gitlink.org.cn/forums/7299/detail</a></div>,
<div className="memoExtra">如何写课题申请书：<a href="https://forum.gitlink.org.cn/forums/7299/detail" target="_black">https://forum.gitlink.org.cn/forums/7299/detail</a></div>,
'memo' + i,
[{ required: true, message: "请正确输入自荐书" },
{ max: 500, message: '超出限制长度500位字符，请重新编辑' }],
<TextArea placeholder="请填写你的优势和能力，不超过500字" onBlur={(e) => { verify("memo" + i); changeTaskItem("memo", e.currentTarget.value, i) }} rows={4} className={editable ? "memoText" : "memoText disabledInput"} />
<TextArea placeholder="自荐书可按如下结构填写：
1、申请书概要：说重点让导师打起精神看下去；
2、社区的贡献：告诉社区你能为他们做哪些贡献；
3、课题实施方案：详细阐述对课题的理解，如果有技术架构图更好；
4、课题实施规划：课题实施拆解、工作规划以及时间安排；
5、个人简介：编程技能、过往经验；
6、提示：文本框表达内容有限，建议您提供内容的pdf或url链接方式展示更精彩的陈述"
onBlur={(e) => { verify("memo" + i); changeTaskItem("memo", e.currentTarget.value, i) }} rows={7} className={editable ? "memoText" : "memoText disabledInput"} />
)}</div>
<div className='introArea'>{helper('附件',