diff --git a/config/routes.ts b/config/routes.ts index 184bb4c..cb6808a 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -14,6 +14,8 @@ export default [ { path: '/admin', redirect: '/admin/dutyinfo' }, { path: '/admin/dutyinfo', name: '值班信息', component: './Admin/DutyInfo' }, { path: '/admin/dutytable', name: '值班表管理', component: './Admin/DutyTable' }, + { path: '/admin/report', name: '反馈信息', component: './Admin/Report' }, + { path: '/admin/logs', name: '日志', component: './Admin/Logs' }, ], }, { @@ -25,7 +27,6 @@ export default [ { path: '/leader/conclusion', name: '值班总结', component: './Leader/Conclusion' }, ], }, - { name: '日志', icon: 'clockCircle', path: '/logs', component: './Logs' }, { name: '关于我们', icon: 'thunderbolt', path: '/about', component: './About' }, { path: '/', redirect: '/welcome' }, { path: '*', layout: false, component: './404' }, diff --git a/mock/reportlist.json b/mock/reportlist.json index 4b68943..7ab8c61 100644 --- a/mock/reportlist.json +++ b/mock/reportlist.json @@ -1,60 +1,70 @@ [ { "name": "晓洋", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333333", "time": "2024-03-07T17:52:48.523303", "text": "你们为什么修不好天选3的PD充电？" }, { "name": "晓洋1", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333334", "time": "2024-03-07T17:53:48.523303", "text": "你们为什么修不好天选4的PD充电？" }, { "name": "晓洋2", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333335", "time": "2024-03-07T17:54:48.523303", "text": "你们为什么修不好天选5的PD充电？" }, { "name": "晓洋3", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333336", "time": "2024-03-07T17:55:48.523303", "text": "你们为什么修不好天选6的PD充电？" }, { "name": "晓洋4", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333337", "time": "2024-03-07T17:56:48.523303", - "text": "你们为什么修不好天选7的PD充电？" + "text": "你们为什么修不好天选7的PD充电？我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了我要气死了" }, { "name": "晓洋5", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333338", "time": "2024-03-07T17:57:48.523303", "text": "你们为什么修不好天选8的PD充电？" }, { "name": "晓洋6", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333339", "time": "2024-03-07T17:58:48.523303", "text": "你们为什么修不好天选9的PD充电？" }, { "name": "晓洋7", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333330", "time": "2024-03-07T17:59:48.523303", "text": "你们为什么修不好天选0的PD充电？" }, { "name": "晓洋8", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333331", "time": "2024-03-07T18:52:48.523303", "text": "你们为什么修不好天选1的PD充电？" }, { "name": "晓洋9", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", "phone": "13333333332", "time": "2024-03-07T19:52:48.523303", "text": "你们为什么修不好天选2的PD充电？" diff --git a/src/pages/Logs/index.tsx b/src/pages/Admin/Logs/index.tsx similarity index 98% rename from src/pages/Logs/index.tsx rename to src/pages/Admin/Logs/index.tsx index 021082f..46d1cc8 100644 --- a/src/pages/Logs/index.tsx +++ b/src/pages/Admin/Logs/index.tsx @@ -54,7 +54,7 @@ const Logs: React.FC = () => { }, }, actions: { - render: (text, row) => [ + render: () => [ 查看 , diff --git a/src/pages/Logs/logItem.ts b/src/pages/Admin/Logs/logItem.ts similarity index 100% rename from src/pages/Logs/logItem.ts rename to src/pages/Admin/Logs/logItem.ts diff --git a/src/pages/Admin/Report/index.tsx b/src/pages/Admin/Report/index.tsx new file mode 100644 index 0000000..57b69b4 --- /dev/null +++ b/src/pages/Admin/Report/index.tsx @@ -0,0 +1,66 @@ +import { PageContainer, ProList } from '@ant-design/pro-components'; +import { Card, Space, Tag } from 'antd'; +import moment from 'moment'; +import request from 'umi-request'; +import { ReportItem } from './reportItem'; + +const Logs: React.FC = () => { + return ( + + + + search={{ + filterType: 'light', + }} + rowKey="name" + headerTitle="反馈列表" + request={async (params = {} as Record) => + request<{ + data: ReportItem[]; + }>('/admin/reportlist', { + params, + }) + } + pagination={{ + pageSize: 10, + }} + metas={{ + title: { + dataIndex: 'name', + title: '用户', + }, + avatar: { + dataIndex: 'avatar', + search: false, + }, + subTitle: { + dataIndex: 'phone', + render: (_, row) => { + return ( + + + {row.phone} + + + ); + }, + title: '联系方式', + }, + description: { + dataIndex: 'text', + search: false, + }, + extra: { + dataIndex: 'time', + render: (_, row) => { + return
{moment(row.time).format('YYYY-M-D HH:mm:ss')}
; + }, + search: false, + }, + }} + /> + + + ); +}; +export default Logs; diff --git a/src/pages/Admin/Report/reportItem.ts b/src/pages/Admin/Report/reportItem.ts new file mode 100644 index 0000000..5f5012a --- /dev/null +++ b/src/pages/Admin/Report/reportItem.ts @@ -0,0 +1,6 @@ +export type ReportItem = { + name: string; + phone: string; + time: string; + text: string; +}; diff --git a/src/services/typings.d.ts b/src/services/typings.d.ts index cc9e8ad..c4df2ba 100644 --- a/src/services/typings.d.ts +++ b/src/services/typings.d.ts @@ -1,4 +1,4 @@ -import { LogsItem } from '@/pages/Logs/logItem'; +import { LogsItem } from '@/pages/Admin/Logs/logItem'; declare namespace API { type CurrentUser = {