From 2ea56ed08b58386f0612635101b1acd51cd4a44c Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 29 Apr 2020 18:06:45 +0800
Subject: [PATCH] 浏览日志，操作日志；用户中心(个人信息)；用户管理(用户中心)
---
src/components/page/AnnouncementPage/index.jsx | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/components/page/AnnouncementPage/index.jsx b/src/components/page/AnnouncementPage/index.jsx
index 6022bdc..c9dd074 100644
--- a/src/components/page/AnnouncementPage/index.jsx
+++ b/src/components/page/AnnouncementPage/index.jsx
@@ -9,6 +9,8 @@
import TableView from '../../common/TableView';
import SearchFormView from '../../common/SearchFormView';
import moment from 'moment';
+import { Modal } from 'antd';
+import FindAlreadyReadOrNotView from '../../common/FindAlreadyReadOrNotView';
import './index.scss';
@@ -26,6 +28,7 @@
page: 1,
size: 10,
},
+ visible: false//modal的可视化状态
};
}
@@ -33,19 +36,26 @@
componentDidMount() { }
- cancle = (id) => {
+ link = (id) => {
console.log(id)
- // // this.props.history.push("/document/create?id=" + id);
- this.props.history.push({ pathname: "/document/create/" + id });
+ this.props.history.push({ pathname: "/document/detail/" + id });
+ }
+
+ emoveTAG = (str) => {
+ return str.replace(/<[^>]+>/g, "");
}
renderColumns = () => {
return [
{ title: '标题', dataIndex: 'documentTitle' },
- { title: '通知内容', dataIndex: 'documentContent' },
- { title: '接受情况', dataIndex: 'groupType', render: (cur, item) => <span>{item.readNumber || 0}/{item.noticeNumber || 0}</span> },
+ {
+ title: '通知内容', dataIndex: 'documentContent', ellipsis: true, width: '40%', render: (cur, item) => {
+ return this.emoveTAG(cur)
+ }
+ },
+ { title: '接受情况', dataIndex: 'groupType', render: (cur, item) => <a onClick={() => { this.setState({ visible: true, documentId: item.id, curItem: item }) }}><span>{item.readNumber || 0}/{item.noticeNumber || 0}</span></a> },
{ title: '通知时间', dataIndex: 'createTime', render: (cur, item) => cur !== "" && cur != null ? moment(cur).format("YYYY-MM-DD HH:mm") : "" },
- { title: '操作', render: (text, record) => <a onClick={() => this.cancle(record.id)}>查看</a> }
+ { title: '操作', render: (text, record) => <a onClick={() => this.link(record.id)}>查看</a> }
];
}
@@ -57,7 +67,7 @@
}
render() {
- const { formData } = this.state;
+ const { formData, documentId, visible, curItem } = this.state;
let tableParams = {
url: `api/document/getNotice`,
@@ -71,6 +81,20 @@
}
return (
<div className="rules-list-main">
+ <Modal
+ visible={visible}
+ onCancel={() => this.setState({ visible: false })}
+ footer={null}
+ title={<div>
+ {curItem ? curItem.documentTitle : '接受情况'}
+ </div>}
+ >
+ {
+ documentId &&
+ <FindAlreadyReadOrNotView key={documentId} documentId={documentId} />
+ }
+
+ </Modal>
<SearchFormView
formData={formData}
setFormData={this.setFormData}
--
Gitblit v1.8.0