Browse Source

完善添加轨型

feat_upload_server_url_0416
LiLongLong 4 months ago
parent
commit
7a33784f41
  1. 2
      .env
  2. BIN
      build.zip
  3. 2
      package.json
  4. 3
      src/components/Header.tsx
  5. 18
      src/components/SideMenu.tsx
  6. 25
      src/pages/rail/AddTrack.tsx
  7. 6
      src/pages/rail/track.scss
  8. 8
      src/services/track/trackShape.ts

2
.env

@ -1 +1 @@
REACT_APP_WS_URL=127.0.0.1:8080/ws
REACT_APP_WS_URL=192.168.1.146:8080/ws

BIN
build.zip

2
package.json

@ -2,7 +2,7 @@
"name": "outline", "name": "outline",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"proxy": "http://127.0.0.1:8080",
"proxy": "http://192.168.1.146:8080",
"dependencies": { "dependencies": {
"@babel/core": "^7.16.0", "@babel/core": "^7.16.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",

3
src/components/Header.tsx

@ -59,7 +59,6 @@ export default function Header() {
let [bluetoothList, setbluetoothList] = useState(list); let [bluetoothList, setbluetoothList] = useState(list);
//获取mock数据 //获取mock数据
useEffect(() => { useEffect(() => {
console.log('userInfo------', userInfo)
if (userInfo.nickname || userInfo.account) { if (userInfo.nickname || userInfo.account) {
setNickname(userInfo.nickname || userInfo.account); setNickname(userInfo.nickname || userInfo.account);
} else { } else {
@ -69,7 +68,7 @@ export default function Header() {
setNickname(userData.nickname); setNickname(userData.nickname);
} }
} }
}, [userInfo.nickname]);
}, [userInfo.nickname, userInfo.account]);
//同步科天健基础数据 //同步科天健基础数据
const [isShowModal, setIsShowModal] = useState(false) const [isShowModal, setIsShowModal] = useState(false)

18
src/components/SideMenu.tsx

@ -45,15 +45,15 @@ const items: MenuItem[] = [
label: '任务列表' label: '任务列表'
}] }]
}, },
// {
// key: "system",
// label: "系统设置",
// icon: <img src={icon_task} alt=""/>,
// children: [{
// key: '/system',
// label: '系统设置'
// }]
// },
{
key: "system",
label: "系统设置",
icon: <img src={icon_task} alt=""/>,
children: [{
key: '/system',
label: '系统设置'
}]
},
]; ];
export default function SideMenu() { export default function SideMenu() {

25
src/pages/rail/AddTrack.tsx

@ -1,16 +1,18 @@
import React, { useState } from'react'; import React, { useState } from'react';
import { Button, Form, Input, Radio } from 'antd'; import { Button, Form, Input, Radio } from 'antd';
import { useNavigate } from 'react-router';
import { import {
CloseSquareOutlined CloseSquareOutlined
} from '@ant-design/icons'; } from '@ant-design/icons';
import "./track.scss" import "./track.scss"
import { addTrack } from '../../services/track/trackShape';
const { Item } = Form; const { Item } = Form;
const { Group } = Radio; const { Group } = Radio;
const AddTrack = () => { const AddTrack = () => {
const [formList, setFormList] = useState<any>([{ type: 'arc' }]); const [formList, setFormList] = useState<any>([{ type: 'arc' }]);
const [form] = Form.useForm(); const [form] = Form.useForm();
const navigate = useNavigate()
const addArcForm = () => { const addArcForm = () => {
setFormList([...formList, { type: 'arc' }]); setFormList([...formList, { type: 'arc' }]);
}; };
@ -71,6 +73,10 @@ const AddTrack = () => {
} }
}); });
console.log(result); console.log(result);
addTrack({points:result}).then(res => {
console.log("res=======添加成功==", res)
})
}) })
.catch((error) => { .catch((error) => {
console.error('表单校验失败:', error); console.error('表单校验失败:', error);
@ -78,6 +84,10 @@ const AddTrack = () => {
}; };
const onCancel = () => {
navigate(-1)
}
return ( return (
<div className='track'> <div className='track'>
<div className='track_btn'> <div className='track_btn'>
@ -143,10 +153,10 @@ const AddTrack = () => {
rules={[{ required: true }]} rules={[{ required: true }]}
> >
<Group> <Group>
<Radio value=""></Radio>
<Radio value=""></Radio>
<Radio value=""></Radio>
<Radio value=""></Radio>
<Radio value="up"></Radio>
<Radio value="down"></Radio>
<Radio value="left"></Radio>
<Radio value="right"></Radio>
</Group> </Group>
</Form.Item> </Form.Item>
</div> </div>
@ -154,7 +164,7 @@ const AddTrack = () => {
<div key={index} className='arc_item'> <div key={index} className='arc_item'>
<div className="flex"> <div className="flex">
<h3>线</h3> <h3>线</h3>
<div className='ml-[auto]'><CloseSquareOutlined /></div>
<div className='ml-[auto]'><CloseSquareOutlined onClick={()=>onDel(index)}/></div>
</div> </div>
<Form.Item <Form.Item
@ -196,6 +206,9 @@ const AddTrack = () => {
<Button type="primary" onClick={onSave}> <Button type="primary" onClick={onSave}>
</Button> </Button>
<Button onClick={onCancel} className="ml-[20px]">
</Button>
</div> </div>
</div> </div>
); );

6
src/pages/rail/track.scss

@ -43,6 +43,6 @@
margin-top: 20px; margin-top: 20px;
} }
.ant-form-item {
line-height: 0.5; /* 可根据需求调整行高倍数,也可用具体像素值,如30px */
}
// .ant-form-item {
// height: 15px;
// }

8
src/services/track/trackShape.ts

@ -27,4 +27,12 @@ export function delTrackShape(params:{ids: string}) {
}); });
} }
//删除轨型
export function addTrack(params:{points: string}) {
return httpRequest<BaseResponse>({
url: `/api/TrackShape`,
method: "POST",
params
});
}
Loading…
Cancel
Save