diff --git a/mock/conclusionlist.json b/mock/conclusionlist.json index 5a9706f..98a0d93 100644 --- a/mock/conclusionlist.json +++ b/mock/conclusionlist.json @@ -1,83 +1,82 @@ [ - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:48.523303", - "week": "2", - "shift": "3", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:49.523303", - "week": "2", - "shift": "1", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:50.523303", - "week": "2", - "shift": "2", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "晓洋", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:51.523303", - "week": "7", - "shift": "3", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:52.523303", - "week": "7", - "shift": "1", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:53.523303", - "week": "2", - "shift": "3", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:54.523303", - "week": "2", - "shift": "3", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:55.523303", - "week": "2", - "shift": "3", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:56.523303", - "week": "2", - "shift": "3", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - }, - { - "op": "宇航员", - "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", - "time": "2024-03-07T19:52:57.523303", - "week": "2", - "shift": "3", - "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" - } - ] - \ No newline at end of file + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:48.523303", + "week": "2", + "shift": "3", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:49.523303", + "week": "2", + "shift": "1", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:50.523303", + "week": "2", + "shift": "2", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "晓洋", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:51.523303", + "week": "7", + "shift": "3", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:52.523303", + "week": "7", + "shift": "1", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:53.523303", + "week": "2", + "shift": "3", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:54.523303", + "week": "2", + "shift": "3", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:55.523303", + "week": "2", + "shift": "3", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:56.523303", + "week": "2", + "shift": "3", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + }, + { + "op": "宇航员", + "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png", + "time": "2024-03-07T19:52:57.523303", + "week": "2", + "shift": "3", + "detail": "收到电脑 n 台,维修成功 m 台,已取回 x 台,有 y 台正在维修交接给下一班" + } +] diff --git a/mock/sheetlist.json b/mock/sheetlist.json index 679943d..f70c2d7 100644 --- a/mock/sheetlist.json +++ b/mock/sheetlist.json @@ -1,260 +1,258 @@ -{ - "current": 514, - "list": [ +[ + { + "name": "2024 春学期值班表", + "createdTime": "2024-03-07T19:52:48.523303", + "id": 114, + "isSelect": true, + "sheet": [ { - "name": "2024 春学期值班表", - "createdTime": "2024-03-07T19:52:48.523303", - "id": 114, - "sheet": [ - { - "weekday": 1, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 1, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 1, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 2, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 2, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 2, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 3, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 3, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 3, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 4, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 4, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 4, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 5, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 5, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 5, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 6, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 6, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 6, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 7, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 7, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - } - ] + "weekday": 1, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" }, { - "name": "2024 秋学期值班表", - "createdTime": "2024-03-07T11:45:14.523303", - "id": 514, - "sheet": [ - { - "weekday": 1, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 1, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 1, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 2, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 2, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 2, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 3, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 3, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 3, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 4, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 4, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 4, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 5, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 5, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 5, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 6, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 6, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 6, - "shift": 3, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 7, - "shift": 1, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - }, - { - "weekday": 7, - "shift": 2, - "workers": ["123423", "31424", "31242"], - "leader": "3902487" - } - ] + "weekday": 1, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 1, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 2, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 2, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 2, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 3, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 3, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 3, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 4, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 4, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 4, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 5, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 5, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 5, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 6, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 6, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 6, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 7, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 7, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + } + ] + }, + { + "name": "2024 秋学期值班表", + "createdTime": "2024-03-07T11:45:14.523303", + "id": 514, + "isSelect": false, + "sheet": [ + { + "weekday": 1, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 1, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 1, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 2, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 2, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 2, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 3, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 3, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 3, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 4, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 4, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 4, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 5, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 5, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 5, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 6, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 6, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 6, + "shift": 3, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 7, + "shift": 1, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" + }, + { + "weekday": 7, + "shift": 2, + "workers": ["123423", "31424", "31242"], + "leader": "3902487" } ] } - \ No newline at end of file +] diff --git a/src/pages/Admin/DutyTable.tsx b/src/pages/Admin/DutyTable.tsx deleted file mode 100644 index d6a98d1..0000000 --- a/src/pages/Admin/DutyTable.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { Todo } from '@/components'; -import { PageContainer } from '@ant-design/pro-components'; -import { Card } from 'antd'; - -const Logs: React.FC = () => { - return ( - - - - - - ); -}; -export default Logs; \ No newline at end of file diff --git a/src/pages/Admin/DutyTable/dutyTableItem.tsx b/src/pages/Admin/DutyTable/dutyTableItem.tsx new file mode 100644 index 0000000..01aa0b9 --- /dev/null +++ b/src/pages/Admin/DutyTable/dutyTableItem.tsx @@ -0,0 +1,6 @@ +export type DutyTableItem = { + name: string; + isSelect: boolean; + time: string; + id: number; +}; diff --git a/src/pages/Admin/DutyTable/index.tsx b/src/pages/Admin/DutyTable/index.tsx new file mode 100644 index 0000000..ff8f1af --- /dev/null +++ b/src/pages/Admin/DutyTable/index.tsx @@ -0,0 +1,71 @@ +import { PageContainer, ProList } from '@ant-design/pro-components'; +import { Card, Space, Tag } from 'antd'; +import moment from 'moment'; +import request from 'umi-request'; +import { DutyTableItem } from './dutyTableItem'; + +const DutyTable: React.FC = () => { + return ( + + + + search={{ + filterType: 'light', + }} + rowKey="op" + headerTitle="值班表列表" + request={async (params = {} as Record) => + request<{ + data: DutyTableItem[]; + }>('/admin/sheet/list', { + params, + }) + } + pagination={{ + pageSize: 10, + }} + metas={{ + title: { + dataIndex: 'name', + title: '值班表', + }, + subTitle: { + dataIndex: ['isSelect'], + render: (_, row) => { + return row.isSelect ? ( + + 当前 + + ) : ( +
+ ); + }, + title: '值班时间', + search: false, + }, + extra: { + dataIndex: 'time', + render: (_: React.ReactNode, row: DutyTableItem) => { + return ( +
+ {moment(row.time).format('YYYY-M-D HH:mm:ss')} +
+ ); + }, + search: false, + }, + actions: { + render: () => [ + + 查看 + , + ], + search: false, + }, + }} + /> +
+
+ ); +}; +export default DutyTable;