diff --git a/.env b/.env index 4b28872..2bbd71a 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -REACT_APP_WS_URL=192.168.1.115:8080/ws -# REACT_APP_WS_URL=127.1.1.0:8080/ws \ No newline at end of file +# REACT_APP_WS_URL=192.168.1.115:8080/ws +REACT_APP_WS_URL=127.1.1.0:8080/ws \ No newline at end of file diff --git a/package.json b/package.json index e1f52a2..8f85e35 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "outline", "version": "0.1.0", "private": true, - "proxy": "http://192.168.1.115:8080", + "proxy": "http://127.0.0.1:8080", "dependencies": { "@ant-design/icons": "^6.0.0", "@babel/core": "^7.16.0", diff --git a/src/pages/measure/components/MeasureConfig - 副本.tsx b/src/pages/measure/components/MeasureConfig-old.tsx similarity index 100% rename from src/pages/measure/components/MeasureConfig - 副本.tsx rename to src/pages/measure/components/MeasureConfig-old.tsx diff --git a/src/pages/measure/components/MeasureConfig.tsx b/src/pages/measure/components/MeasureConfig.tsx index 8a1acd4..8854c68 100644 --- a/src/pages/measure/components/MeasureConfig.tsx +++ b/src/pages/measure/components/MeasureConfig.tsx @@ -1,6 +1,6 @@ /* eslint-disable array-callback-return */ import { Button, Form, Input, message, Select, InputNumber, Cascader, Row, Col } from "antd"; -import { useEffect, useState } from "react"; +import { useEffect, useRef, useState } from "react"; import { useNavigate } from "react-router"; import { saveMeasurement_new } from "../../../services/measure/analysis"; import { useAppSelector } from "../../../utils/hooks"; @@ -9,8 +9,7 @@ import { dictionaryListService, queryStationData } from "../../../services/ktj/org"; -import { useAppDispatch } from "../../../utils/hooks"; -import { setOrgData } from "../../../store/ktj/orgState"; +import type { InputRef } from 'antd/es/input'; import type { OrgItem, GwdDicItem, @@ -41,12 +40,17 @@ export default function MeasureConfig() { const [xbCodeOptions, setXbCodeOptions] = useState() const [unitTypeList, setUnitTypeList] = useState([]) const [unitType, setUnitType] = useState() - + const inputRef = useRef(null); useEffect(()=>{ queryDictionaryList() resetRailTypes() resetDataSource() queryRailData() + setTimeout(() => { + if(inputRef.current){ + inputRef.current.focus() + } + }, 100) }, []) @@ -331,7 +335,7 @@ export default function MeasureConfig() { name="name" rules={[{ required: true, message: "请输入测量名称" }]} > - +