From 9065a4d68300d01905cb40b82a990cfa4976b04c Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Wed, 16 Apr 2025 17:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E9=87=8F=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                           |  2 +-
 package.json                                   |  2 +-
 src/pages/measure/components/MeasureAction.tsx | 19 +++++++++----------
 src/pages/system/Setting.tsx                   | 16 +++++++++-------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.env b/.env
index 7a40b39..bcf6e24 100644
--- a/.env
+++ b/.env
@@ -1 +1 @@
-REACT_APP_WS_URL=192.168.1.146:8080/ws
+REACT_APP_WS_URL=127.1.1.0:8080/ws
diff --git a/package.json b/package.json
index 1322ac4..15bb757 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "outline",
   "version": "0.1.0",
   "private": true,
-  "proxy": "http://192.168.1.146:8080",
+  "proxy": "http://127.1.1.0:8080",
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
     "@babel/core": "^7.16.0",
diff --git a/src/pages/measure/components/MeasureAction.tsx b/src/pages/measure/components/MeasureAction.tsx
index b105948..e0a03ee 100644
--- a/src/pages/measure/components/MeasureAction.tsx
+++ b/src/pages/measure/components/MeasureAction.tsx
@@ -34,8 +34,7 @@ export default function MeasureAction() {
 	const navigate = useNavigate();
 	const deviceInfo = useAppSelector(store => store.context.device);
 	const measureState = useAppSelector((store) => store.measureState);
-	const [gxCode, setGxCode] = useState<string>(GX_CODE)
-	
+	const [railSize, setRailSize] = useState<string>(GX_CODE)
 	const STEP_COLOR_GREEN = "green";
 	const STEP_COLOR_BLUE = "blue";
 	const STEP_COLOR_GREY = "grey";
@@ -81,17 +80,17 @@ export default function MeasureAction() {
 	};
 
 	useEffect(()=>{
-		setGxCode(measureState.gxCode)
+		setRailSize(measureState.gxCode || GX_CODE)
 	}, [measureState])
 	
 
 	// 分析按钮点击事件
 	const onAnalysisBtnClick = () => {
-		if (analysisReport) {
-			setOpenDrawer(true);
-			return;
-		}
-		fetchAnalysisReport(gxCode).then(res => {
+		// if (analysisReport) {
+		// 	setOpenDrawer(true);
+		// 	return;
+		// }
+		fetchAnalysisReport(railSize).then(res => {
 			if (res.success) {
 				const report: AnalysisReport = res.data;
 				console.log(report);
@@ -333,7 +332,7 @@ export default function MeasureAction() {
 
 	/** ----------------------- 页面加载获取基础图形数据 -------基线---------------- **/
 	useEffect(() => {
-		queryBasePoints(gxCode)
+		queryBasePoints(railSize)
 		//获取轨型
 		getTrackDataList()
 	}, []);
@@ -377,7 +376,7 @@ export default function MeasureAction() {
 
 
 	//当前选择的轨型 默认"GX-60"
-	const [railSize, setRailSize] = useState<string>(GX_CODE)
+	
 	const onTrackChange = (value: string) => {
 		setRailSize(value)
 		queryBasePoints(value)
diff --git a/src/pages/system/Setting.tsx b/src/pages/system/Setting.tsx
index 1c90e45..bf3d109 100644
--- a/src/pages/system/Setting.tsx
+++ b/src/pages/system/Setting.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { Button, Cascader, Input, message } from 'antd';
 import {
   LoadingOutlined,
@@ -127,15 +127,16 @@ export default function Setting(){
     }
   }
 
-  let newAccountInfo = {
+  let newAccountInfo = useRef({
     name:'',
-    value: ''
-  }
+    value:''
+  })
   function onSaveAccount(){
+    console.log('newAccountInfo---', newAccountInfo)
     const accountParams = {
       code:"UPLOAD_USERNAME", 
       name:accountInfo.name,
-      value:newAccountInfo.value,
+      value:newAccountInfo.current.value,
       id:accountInfo.id
     }
     sysSet(accountParams, "PUT").then(res=>{
@@ -147,8 +148,9 @@ export default function Setting(){
   }
 
   function onAccountChange(accountValue:string){
-    newAccountInfo.name = accountInfo.name || '';
-    newAccountInfo.value = accountValue;
+    newAccountInfo.current.name = accountInfo.name || '';
+    newAccountInfo.current.value = accountValue;
+    console.log('newAccountInfo--22-', newAccountInfo)
   }
 
   function convertToCascaderData(data:OrgItem[]) {