diff --git a/.env b/.env index 93da990..7fd9e5c 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -REACT_APP_WS_URL=192.168.1.200:8080/ws +REACT_APP_WS_URL=192.168.1.201:8080/ws diff --git a/package.json b/package.json index 56424a1..e0d4d7b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "outline", "version": "0.1.0", "private": true, - "proxy": "http://192.168.1.200:8080", + "proxy": "http://192.168.1.201:8080", "dependencies": { "@babel/core": "^7.16.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", diff --git a/src/assets/menu/icon_rail.svg b/src/assets/menu/icon_rail.svg new file mode 100644 index 0000000..91068be --- /dev/null +++ b/src/assets/menu/icon_rail.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/SideMenu.tsx b/src/components/SideMenu.tsx index 94648e0..494b52e 100644 --- a/src/components/SideMenu.tsx +++ b/src/components/SideMenu.tsx @@ -2,7 +2,7 @@ import type { MenuProps } from "antd"; import { Menu } from "antd"; import icon_logo from "../assets/icon_logo.svg"; import icon_measure from "../assets/menu/icon_measure.svg"; -import icon_substrate from "../assets/menu/icon_substrate.svg"; +import icon_rail from "../assets/menu/icon_rail.svg"; import { useNavigate, useLocation } from "react-router-dom"; import "./SideMenu.scss"; @@ -25,15 +25,15 @@ const items: MenuItem[] = [ } ], }, - // { - // key: "rail", - // label: "轨形管理", - // icon: , - // children: [{ - // key: '/rail/config', - // label: '轨形配置' - // }] - // } + { + key: "rail", + label: "轨形管理", + icon: , + children: [{ + key: '/rail/config', + label: '轨形配置' + }] + } ]; export default function SideMenu() { diff --git a/src/pages/rail/railConfig.tsx b/src/pages/rail/railConfig.tsx index 1e778e8..ff97eff 100644 --- a/src/pages/rail/railConfig.tsx +++ b/src/pages/rail/railConfig.tsx @@ -1,10 +1,97 @@ import "./rail.scss"; - +import { Button, Pagination, Table, TableColumnsType } from 'antd' +import {useState} from 'react' export default function RailManage() { + type RailItem = { + id: number; + name: string; + } + let [loading, setLoading] = useState() + + const [selectionType, setSelectionType] = useState<'checkbox'>('checkbox'); + const [selectRows, setSelectedRow] = useState([]) + const [selectedRowKeys, setSelectedRowKeys] = useState([]); + const rowSelection = { + selectedRowKeys, + onChange: (selectedRowKeys: React.Key[], selectedRows: RailItem[]) => { + console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); + setSelectedRow(selectedRows) + setSelectedRowKeys(selectedRowKeys) + }, + getCheckboxProps: (record:RailItem) => ({ + name: record.name, + }), + }; + + const [pageNum, setPageNum] = useState(1) + const [pageSize, setPageSize] = useState(5) + const onPageChange = (pageNumValue:number, pageSizeValue:number) => { + setPageNum(pageNumValue) + setPageSize(pageSizeValue) + let params = { + pageSize:pageSizeValue, + pageNum:pageNumValue, + } + } + + const onShowDetail = (recordData:RailItem) => { + + } + + let [total, setTotal] = useState() + let [tableData, setTableData] = useState([]) + const columns: TableColumnsType = [{ + title: '序号', + dataIndex: 'seq', + render:(_, record, index)=>{ + return index + 1 + } + }, + { + title: '轨型名称', + dataIndex: 'name', + }, + { + title: '创建者', + dataIndex: 'createName', + },{ + title: '时间', + dataIndex: 'createtTime', + },{ + title: '操作', + dataIndex: 'op', + render:(_, record)=>{ + return
+ +
+ } + }] return (
-
12
+
+ + +
+ +
+ ({ ...item, key: item.name }))} + pagination={false} + scroll={{ y: 500 }} + + /> +
+ +
+ );