diff --git a/.env b/.env index 3fe5fcb..de133cd 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -REACT_APP_WS_URL=192.168.1.199:8080/ws +REACT_APP_WS_URL=127.0.0.1:8080/ws diff --git a/build.zip b/build.zip new file mode 100644 index 0000000..9da004f Binary files /dev/null and b/build.zip differ diff --git a/package.json b/package.json index 9fb44b0..34c06cd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "outline", "version": "0.1.0", "private": true, - "proxy": "http://192.168.1.199:8080", + "proxy": "http://127.0.0.1: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 356b5b3..5a17d9a 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -59,8 +59,9 @@ export default function Header() { let [bluetoothList, setbluetoothList] = useState(list); //获取mock数据 useEffect(() => { - if (userInfo.nickname) { - setNickname(userInfo.nickname); + console.log('userInfo------', userInfo) + if (userInfo.nickname || userInfo.account) { + setNickname(userInfo.nickname || userInfo.account); } else { const user = localStorage.getItem("user"); if (user) { diff --git a/src/pages/rail/AddTrack.tsx b/src/pages/rail/AddTrack.tsx index 562beff..635a459 100644 --- a/src/pages/rail/AddTrack.tsx +++ b/src/pages/rail/AddTrack.tsx @@ -8,7 +8,7 @@ const { Item } = Form; const { Group } = Radio; const AddTrack = () => { - const [formList, setFormList] = useState([]); + const [formList, setFormList] = useState([{ type: 'arc' }]); const [form] = Form.useForm(); const addArcForm = () => { @@ -28,6 +28,12 @@ const AddTrack = () => { }, }; + const onDel = (index:number) => { + let list = [...formList] + list.splice(index, 1); + setFormList(list) + } + const onSave = () => { form.validateFields().then((values) => { @@ -94,7 +100,7 @@ const AddTrack = () => {

圆弧

-
+
onDel(index)}/>