diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index e2177f657..393abfc53 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -395,6 +395,7 @@ class Detail extends Component { forked_count: result.data.forked_count, defaultBranch: result.data.default_branch }) + document.title = `${result.data.author.name}/${result.data.name}${result.data.description?':'+result.data.description:''}`; } }).catch((error) => { }) } diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index cae6e5c90..704fd65c1 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -136,6 +136,7 @@ class Infos extends Component { isSpin: false, undo_events:e }); + document.title = result.data.username+'('+ username +')'; }) .catch((error) => { this.setState({ diff --git a/src/managements/achievement/index.scss b/src/managements/achievement/index.scss index 15cd549ca..cdc786eb3 100644 --- a/src/managements/achievement/index.scss +++ b/src/managements/achievement/index.scss @@ -12,9 +12,7 @@ border-bottom: 1px solid #e5e5e5; } -.notice-form .edit-input{ - max-width:450px; -} + .my-search-button{ margin-top:4px; diff --git a/src/managements/achievement/noticeEdit/index.jsx b/src/managements/achievement/noticeEdit/index.jsx index c25352a48..fe1706204 100644 --- a/src/managements/achievement/noticeEdit/index.jsx +++ b/src/managements/achievement/noticeEdit/index.jsx @@ -287,7 +287,7 @@ const NoticeEdit = Form.create()(({ form, match, history, showNotification }) => "成果名称:", "title", [{ required: true, message: "请输入成果名称" }, - { max: 50, message: '长度不能超过50个字符' }], + { max: 255, message: '长度不能超过255个字符' }], "发布单位:", "publisher", [{ required: true, message: "请输入发布单位" }, - { max: 50, message: '长度不能超过50个字符' }], + { max: 255, message: '长度不能超过255个字符' }], {helper( "联系人:", "achievementIntro", - [{ max: 50, message: '长度不能超过50个字符' }], - )} @@ -323,8 +323,8 @@ const NoticeEdit = Form.create()(({ form, match, history, showNotification }) => "联系方式:", "contactInfo", [{ max: 5000, message: '长度不能超过5000个字符' }], - )} @@ -343,7 +343,7 @@ const NoticeEdit = Form.create()(({ form, match, history, showNotification }) => className="commentStyle" load={UploadFunc} size={100} - ShowNotification={ShowNotification} + showNotification={ShowNotification} actionUrl={actionUrl} fileList={fileList} number={1} diff --git a/src/managements/achievement/noticeList/index.jsx b/src/managements/achievement/noticeList/index.jsx index f86fadf27..063ba1b70 100644 --- a/src/managements/achievement/noticeList/index.jsx +++ b/src/managements/achievement/noticeList/index.jsx @@ -120,7 +120,13 @@ const NoticeList = Form.create()(forwardRef(({ form, match, history, current_use const columns = [ - + { + title: '序号', + dataIndex: "index", + render: (text, record, index) => { + return index + 1 + (curPage - 1) * pageSize + } + }, { title: '成果来源', key: 'achievementSource', @@ -149,7 +155,6 @@ const NoticeList = Form.create()(forwardRef(({ form, match, history, current_use key: 'publisher', width: '20%' }, - { title: '创建时间', key: 'createdAt', @@ -161,7 +166,7 @@ const NoticeList = Form.create()(forwardRef(({ form, match, history, current_use render: (text, record) => ( {record.status == 2 && } - 详情 + 详情 {admin && record.status == 1 && record.isChecked == 2 && } {(admin || (record.isChecked != 1)) && < Button className="mr5 font-12" type="danger" size="small" onClick={() => { deletItem(record.id) }}>删除} @@ -181,51 +186,101 @@ const NoticeList = Form.create()(forwardRef(({ form, match, history, current_use key: 'requestViewCount', dataIndex: 'requestViewCount', render: (text, record) => { - return 0 ? 'link' : ''}`} onClick={() => { text > 0 && history.push(`/managements/achievement/detail/${record.id}`) }}>{text}; + return 0 ? 'link' : ''}`} onClick={() => { text > 0 && history.push(`/managements/achievement/reader/${record.id}`) }}>{text}; } }); } - let exportColumn = [...columns]; - exportColumn.splice(4, 0, { - title: '成果描述', - key: 'text', - dataIndex: 'text', - render: (text, record) => { - return