diff --git a/.env b/.env index de133cd..7a40b39 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -REACT_APP_WS_URL=127.0.0.1:8080/ws +REACT_APP_WS_URL=192.168.1.146:8080/ws diff --git a/build.zip b/build.zip index 9da004f..e9a7519 100644 Binary files a/build.zip and b/build.zip differ diff --git a/package.json b/package.json index 34c06cd..3b92eaf 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "outline", "version": "0.1.0", "private": true, - "proxy": "http://127.0.0.1:8080", + "proxy": "http://192.168.1.146:8080", "dependencies": { "@babel/core": "^7.16.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", diff --git a/src/components/Header.tsx b/src/components/Header.tsx index 5a17d9a..1f61e28 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -59,7 +59,6 @@ export default function Header() { let [bluetoothList, setbluetoothList] = useState(list); //获取mock数据 useEffect(() => { - console.log('userInfo------', userInfo) if (userInfo.nickname || userInfo.account) { setNickname(userInfo.nickname || userInfo.account); } else { @@ -69,7 +68,7 @@ export default function Header() { setNickname(userData.nickname); } } - }, [userInfo.nickname]); + }, [userInfo.nickname, userInfo.account]); //同步科天健基础数据 const [isShowModal, setIsShowModal] = useState(false) diff --git a/src/components/SideMenu.tsx b/src/components/SideMenu.tsx index 8aef6cc..a4156f5 100644 --- a/src/components/SideMenu.tsx +++ b/src/components/SideMenu.tsx @@ -45,15 +45,15 @@ const items: MenuItem[] = [ label: '任务列表' }] }, - // { - // key: "system", - // label: "系统设置", - // icon: , - // children: [{ - // key: '/system', - // label: '系统设置' - // }] - // }, + { + key: "system", + label: "系统设置", + icon: , + children: [{ + key: '/system', + label: '系统设置' + }] + }, ]; export default function SideMenu() { diff --git a/src/pages/rail/AddTrack.tsx b/src/pages/rail/AddTrack.tsx index 635a459..cabbf68 100644 --- a/src/pages/rail/AddTrack.tsx +++ b/src/pages/rail/AddTrack.tsx @@ -1,16 +1,18 @@ import React, { useState } from'react'; import { Button, Form, Input, Radio } from 'antd'; +import { useNavigate } from 'react-router'; import { CloseSquareOutlined } from '@ant-design/icons'; import "./track.scss" +import { addTrack } from '../../services/track/trackShape'; const { Item } = Form; const { Group } = Radio; const AddTrack = () => { const [formList, setFormList] = useState([{ type: 'arc' }]); const [form] = Form.useForm(); - + const navigate = useNavigate() const addArcForm = () => { setFormList([...formList, { type: 'arc' }]); }; @@ -71,6 +73,10 @@ const AddTrack = () => { } }); console.log(result); + addTrack({points:result}).then(res => { + console.log("res=======添加成功==", res) + }) + }) .catch((error) => { console.error('表单校验失败:', error); @@ -78,6 +84,10 @@ const AddTrack = () => { }; + const onCancel = () => { + navigate(-1) + } + return (
@@ -143,10 +153,10 @@ const AddTrack = () => { rules={[{ required: true }]} > - - - - + + + +
@@ -154,7 +164,7 @@ const AddTrack = () => {

直线

-
+
onDel(index)}/>
{ +
); diff --git a/src/pages/rail/track.scss b/src/pages/rail/track.scss index 9249e1e..61e92bc 100644 --- a/src/pages/rail/track.scss +++ b/src/pages/rail/track.scss @@ -43,6 +43,6 @@ margin-top: 20px; } -.ant-form-item { - line-height: 0.5; /* 可根据需求调整行高倍数,也可用具体像素值,如30px */ -} \ No newline at end of file +// .ant-form-item { +// height: 15px; +// } \ No newline at end of file diff --git a/src/services/track/trackShape.ts b/src/services/track/trackShape.ts index de04f27..b3c11dd 100644 --- a/src/services/track/trackShape.ts +++ b/src/services/track/trackShape.ts @@ -27,4 +27,12 @@ export function delTrackShape(params:{ids: string}) { }); } - +//删除轨型 +export function addTrack(params:{points: string}) { + return httpRequest({ + url: `/api/TrackShape`, + method: "POST", + params + }); + } +