From ad9b5d0d1fd7c8729170df32cf82c3b029207cdd Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Mon, 06 Apr 2020 17:48:35 +0800
Subject: [PATCH] 修改规章制度列表
---
src/index.js | 6 +-
src/pages/index/System.jsx | 14 +---
src/pages/index/workbench.jsx | 2
src/components/page/index/rulesList/index.scss | 14 ++++
src/components/page/index/workbench/index.jsx | 6 +-
src/components/common/TopListTableView/index.jsx | 7 ++
src/components/page/index/workbench/index.scss | 0
src/components/page/index/rulesList/index.jsx | 85 ++++++++++++++++++++++++++++
src/components/page/SystemPage/index.jsx | 5 -
9 files changed, 119 insertions(+), 20 deletions(-)
diff --git a/src/components/common/TopListTableView/index.jsx b/src/components/common/TopListTableView/index.jsx
index 0b8423b..859bf83 100644
--- a/src/components/common/TopListTableView/index.jsx
+++ b/src/components/common/TopListTableView/index.jsx
@@ -8,6 +8,8 @@
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import { Table, Row, Col } from 'antd';
import { tagList } from './tagList';
+import fetch from '../../../api/request';
+
import './index.scss';
@@ -22,6 +24,11 @@
}
componentWillMount() {
+ fetch({
+ url: `api/merits/queryMerits`
+ }).then(res => {
+ console.log('res', res);
+ })
this.setState({
topList: tagList
})
diff --git a/src/components/page/SystemPage/index.jsx b/src/components/page/SystemPage/index.jsx
index 84a2988..12f5090 100644
--- a/src/components/page/SystemPage/index.jsx
+++ b/src/components/page/SystemPage/index.jsx
@@ -6,9 +6,9 @@
/** Happy Coding */
import React, { ReactNode, ReactEventHandler, Component } from 'react';
-// import { Link } from 'react-router-dom';
import moment from 'moment'
import { DatePicker, Table, Card, Row, Col, Icon, Form, Input, Button, Select, message } from 'antd';
+
import './index.scss';
import fetch from '../../../api/request';
@@ -33,9 +33,6 @@
}
};
}
-
-
-
componentWillMount() { }
diff --git a/src/components/page/index/rulesList/index.jsx b/src/components/page/index/rulesList/index.jsx
new file mode 100644
index 0000000..219f7bf
--- /dev/null
+++ b/src/components/page/index/rulesList/index.jsx
@@ -0,0 +1,85 @@
+/* eslint-disable */
+/**柯礼钦
+ * 4/6/2020, 5:17:40 PM
+ * doc comment for the file goes here
+ */
+
+/** 工作制度 */
+import React, { ReactNode, ReactEventHandler, Component } from 'react';
+import TableView from '../../../common/TableView';
+import SearchFormView from '../../../common/SearchFormView';
+import moment from 'moment';
+
+import './index.scss';
+
+
+export default class RulesList extends Component {
+ constructor(props) {
+ super(props);
+ this.config = {
+ };
+ this.state = {
+ formData: {
+ __key: Date.now(),
+ type: '',
+ title: '',
+ page: 1,
+ size: 10,
+ },
+ };
+ }
+
+ componentWillMount() { }
+
+ componentDidMount() { }
+
+ renderColumns = () => {
+ return [
+ { title: '通知标题', dataIndex: 'documentItle;' },
+ { title: '通知内容', dataIndex: 'documentContent' },
+ { title: '接受情况', dataIndex: 'groupType', render: (cur, item) => <span>{item.readNumber || 0}/{item.noticeNumber || 0}</span> },
+ { title: '通知时间', dataIndex: 'createTime', render: (cur, item) => cur !== "" && cur != null ? moment(cur).format("YYYY-MM-DD HH:mm") : "" },
+ ];
+ }
+
+ setFormData = data => {
+ console.log('form', data);
+ this.setState({
+ formData: data,
+ });
+ }
+
+ render() {
+ const { formData } = this.state;
+
+ let tableParams = {
+ url: `api/document/getNotice`,
+ formData,
+ key: formData.__key,
+ columns: this.renderColumns(),
+ extraFromData: {
+ type: '',
+ },
+ setFormData: this.setFormData
+ }
+ return (
+ <div className="rules-list-main">
+ <SearchFormView
+ formData={formData}
+ setFormData={this.setFormData}
+ data={[
+ { type: 'input', name: '标题', label: '标题', key: 'title' },
+ {
+ type: 'rangePicker',
+ label: '发布时间',
+ name: JSON.stringify(['开始时间', '结束时间']),
+ key: JSON.stringify(['startTime', 'endTime']),
+ keylistName: 'rangeTimelist',
+ },
+ ]} />
+ <TableView {...tableParams} />
+ </div>
+ )
+ }
+}
+
diff --git a/src/components/page/index/rulesList/index.scss b/src/components/page/index/rulesList/index.scss
new file mode 100644
index 0000000..e1f7b64
--- /dev/null
+++ b/src/components/page/index/rulesList/index.scss
@@ -0,0 +1,14 @@
+/* eslint-disable */
+/**liuwh
+ * 4/6/2020, 5:17:40 PM
+ * doc comment for the file goes here
+ */
+
+/** Happy Coding */
+.rules-list {
+ &-main {
+ background: #fff;
+ margin: 20px;
+ padding: 20px;
+ }
+}
diff --git a/src/components/page/workbench/index.jsx b/src/components/page/index/workbench/index.jsx
similarity index 71%
rename from src/components/page/workbench/index.jsx
rename to src/components/page/index/workbench/index.jsx
index 733a1f1..4ffbf82 100644
--- a/src/components/page/workbench/index.jsx
+++ b/src/components/page/index/workbench/index.jsx
@@ -6,9 +6,9 @@
/** 首页--工作台 */
import React, { ReactNode, ReactEventHandler, Component } from 'react';
-import NotifyList from '../../common/NotifyList'; //通知列表
-import TopListTableView from '../../common/TopListTableView'; //榜单列表
-import HotListTableView from '../../common/HotListTableView'; //行业热点知识库
+import NotifyList from '../../../common/NotifyList'; //通知列表
+import TopListTableView from '../../../common/TopListTableView'; //榜单列表
+import HotListTableView from '../../../common/HotListTableView'; //行业热点知识库
import './index.scss';
diff --git a/src/components/page/workbench/index.scss b/src/components/page/index/workbench/index.scss
similarity index 100%
rename from src/components/page/workbench/index.scss
rename to src/components/page/index/workbench/index.scss
diff --git a/src/index.js b/src/index.js
index 5d29e21..6a201b6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -51,17 +51,17 @@
{/* 新建文档 */}
<Route path="/document/create" component={DocumentEdit} />
-
{/* 全部通知 */}
<Route path="/index/workbench/announcement" component={Announcement} />
+ {/* 规章制度 */}
+ <Route path="/index/rules" component={System} />
{/* 首页 */}
<Route path="/index" component={Workbench} />
- {/* 规章制度 */}
- <Route path="/index/rules" component={System} />
<Route path="/login" component={Login} />
+ <Route path="/" component={Workbench} />
{/* 路由的页面重定向 */}
<Redirect to="/" component={Workbench} />
</Switch>
diff --git a/src/pages/index/System.jsx b/src/pages/index/System.jsx
index 8b12334..44d395b 100644
--- a/src/pages/index/System.jsx
+++ b/src/pages/index/System.jsx
@@ -8,6 +8,7 @@
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import BreadcrumbView from '../../components/common/BreadcrumbView';
import SystemPage from '../../components/page/SystemPage'
+import RulesList from '../../components/page/index/rulesList'
export default class System extends Component {
constructor(props) {
@@ -27,16 +28,11 @@
render() {
return (
<div className="System-main">
- <BreadcrumbView data={[{ name: '工作制度'}]} />
- <SystemPage />
+ <BreadcrumbView data={[{ name: '工作制度' }]} />
+ {/* <SystemPage /> */}
+ <RulesList {...this.prosp} />
</div>
)
}
}
-//export default function System({ }) {
-// return (
-// <div className="System-main">
-//
-// </div>
-// )
-//}
+
diff --git a/src/pages/index/workbench.jsx b/src/pages/index/workbench.jsx
index 52203d1..a7661a3 100644
--- a/src/pages/index/workbench.jsx
+++ b/src/pages/index/workbench.jsx
@@ -7,7 +7,7 @@
/** 首页 -- 工作台 */
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import BreadcrumbView from '../../components/common/BreadcrumbView';
-import WorkbenchPage from '../../components/page/workbench'
+import WorkbenchPage from '../../components/page/index/workbench'
export default class Workbench extends Component {
constructor(props) {
--
Gitblit v1.8.0