fix:登录提示, 保存命名

src/index.css

@@ -3,6 +3,7 @@
 @tailwind utilities;
 
 body {
+	user-select: none;
 	margin: 0;
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans",
 		"Droid Sans", "Helvetica Neue", sans-serif;

src/pages/login/Login.tsx

@@ -25,7 +25,12 @@ export default function Login() {
 				localStorage.setItem("user", JSON.stringify(res.data));
 				navigate("/measure/action");
 			}
-		});
+		}).catch(() => {
+			messageApi.open({
+				type: "error",
+				content: "服务未启动, 请稍后重试",
+			});
+		})
 	};
 
 	return (

src/pages/measure/components/MeasureConfig.tsx

@@ -114,6 +114,7 @@ export default function MeasureConfig() {
   }
 
   const setForm = (mfInfo: any) => {
+    console.log('mfInfo---', mfInfo)
     let kilometre = 0
     let meters = 0
     if(mfInfo.mileage){
@@ -141,7 +142,8 @@ export default function MeasureConfig() {
       stationCode = mfInfo.stationCode
     }
     let label = labels.join('-')
-    let name = `${label}-${ymd.now}${(Number(todayNumber) + 1).toString().padStart(4, '0') }`
+    // let name = `${label}-${ymd.now}${(Number(todayNumber) + 1).toString().padStart(4, '0') }`
+    let name = mfInfo?.name
     setKilMet({
       kilometre,
       meters
@@ -234,7 +236,7 @@ export default function MeasureConfig() {
       xmCode
     }
     queryStationData(params).then(res => {
-      if(res && res.data.length){
+      if(res && res.data?.length){
         setStationList(res.data)
       }else{
         setStationList([])
@@ -579,7 +581,7 @@ export default function MeasureConfig() {
                     rules={[{ required: true, message: "请输入" }]}
                   >
                     <div style={{display:"flex",alignItems:"center"}}>
-                      <InputNumber className="label-vh  w-[16vw]" defaultValue={kilMet.kilometre} placeholder="公里" />千米
+                      <InputNumber className="label-vh  w-[16vw]" defaultValue={kilMet.kilometre === 'undefined' ? '' : kilMet.kilometre} placeholder="公里" />千米
                     </div>
                   </Form.Item>
                   <Form.Item
@@ -588,7 +590,7 @@ export default function MeasureConfig() {
                     rules={[{ required: true, message: "请输入" }]}
                   >
                     <div style={{display:"flex",alignItems:"center"}}>
-                      <InputNumber className="label-vh  w-[18vw]" defaultValue={kilMet.meters}  placeholder="百米" />米
+                      <InputNumber className="label-vh  w-[18vw]" defaultValue={kilMet.meters === 'undefined' ? '' : kilMet.meters}  placeholder="百米" />米
                     </div>
                   </Form.Item>
               </>

src/pages/measure/components/MeasureDetail.tsx

@@ -69,7 +69,7 @@ export default function MeasureDetail() {
 			title: '当天测量序号',
 			dataIndex: 'todayNumber',
 			render: (_, record) => (
-				padNumber(record.todayNumber, 4)
+				padNumber(record.todayNumber || 0, 4)
 			)
 		},
 		{

src/pages/system/Setting.tsx

@@ -144,11 +144,11 @@ export default function Setting(){
 
   const queryConfig = () => {
     getDeviceConfig().then((res: any) => {
-      const standbyMinutes = res.data.standbyMinutes
+      const standbyMinutes = res.data?.standbyMinutes
       if (standbyMinutes ) {
         setStandbyMinutes(standbyMinutes)
       }
-      setTodayNumberFlag(res.data.todayNumberFlag)
+      setTodayNumberFlag(res.data?.todayNumberFlag)
     })
   }
 

src/services/socket.ts

@@ -7,7 +7,7 @@ class WebSocketClient {
 	private ws: WebSocket | null = null;
 	private url: string;
 	private reconnectAttempts: number = -1;
-	private maxReconnectAttempts: number = 5;
+	private maxReconnectAttempts: number = 5000;
 	private reconnectInterval: number = 3000;
 
 	private dataSub = new Subject<Datagram>();

src/utils/index.ts

@@ -97,8 +97,9 @@ export function exportFile(blob: Blob, fileName: string) {
 }
 
 export function padNumber(num: number, length: number) {
+	console.log(num, length)
     // 将数字转换为字符串
-    let str = num.toString();
+    let str = num?.toString();
     // 当字符串长度小于指定长度时，在前面补0
     while (str.length < length) {
         str = '0' + str;