Browse Source

优化轨型管理

feat_upload_server_url_0416
LiLongLong 4 months ago
parent
commit
579bb188ca
  1. 2
      .env
  2. BIN
      build.zip
  3. 2
      package.json
  4. 5
      src/components/Header.tsx
  5. 10
      src/pages/rail/AddTrack.tsx
  6. 4
      src/pages/rail/track.scss
  7. 2
      src/store/features/contextSlice.ts

2
.env

@ -1 +1 @@
REACT_APP_WS_URL=192.168.1.199:8080/ws
REACT_APP_WS_URL=127.0.0.1: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://192.168.1.199:8080",
"proxy": "http://127.0.0.1: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",

5
src/components/Header.tsx

@ -59,8 +59,9 @@ export default function Header() {
let [bluetoothList, setbluetoothList] = useState(list); let [bluetoothList, setbluetoothList] = useState(list);
//获取mock数据 //获取mock数据
useEffect(() => { useEffect(() => {
if (userInfo.nickname) {
setNickname(userInfo.nickname);
console.log('userInfo------', userInfo)
if (userInfo.nickname || userInfo.account) {
setNickname(userInfo.nickname || userInfo.account);
} else { } else {
const user = localStorage.getItem("user"); const user = localStorage.getItem("user");
if (user) { if (user) {

10
src/pages/rail/AddTrack.tsx

@ -8,7 +8,7 @@ const { Item } = Form;
const { Group } = Radio; const { Group } = Radio;
const AddTrack = () => { const AddTrack = () => {
const [formList, setFormList] = useState<any>([]);
const [formList, setFormList] = useState<any>([{ type: 'arc' }]);
const [form] = Form.useForm(); const [form] = Form.useForm();
const addArcForm = () => { const addArcForm = () => {
@ -28,6 +28,12 @@ const AddTrack = () => {
}, },
}; };
const onDel = (index:number) => {
let list = [...formList]
list.splice(index, 1);
setFormList(list)
}
const onSave = () => { const onSave = () => {
form.validateFields().then((values) => { form.validateFields().then((values) => {
@ -94,7 +100,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
name={`startX_${index}`} name={`startX_${index}`}

4
src/pages/rail/track.scss

@ -41,4 +41,8 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 20px; margin-top: 20px;
}
.ant-form-item {
line-height: 0.5; /* 可根据需求调整行高倍数,也可用具体像素值,如30px */
} }

2
src/store/features/contextSlice.ts

@ -9,7 +9,7 @@ interface ContextSlice {
device: DeviceStatus["data"]; device: DeviceStatus["data"];
} }
const initialState: ContextSlice = { const initialState: ContextSlice = {
user: { loginFlag: false, loginUser: { nickname: "", userRole: "User" } },
user: { loginFlag: false, loginUser: { nickname: "", userRole: "User", account: "" } },
newMeasureAfterSave: false, newMeasureAfterSave: false,
device: { device: {
isConnected: true, //是否链接 isConnected: true, //是否链接

Loading…
Cancel
Save