fix:保存时缓存上一次的记录

src/App.tsx

@@ -34,7 +34,7 @@ function App() {
   // 监听推送消息，更新store
   useEffect(() => {
     const subscription = bridgeOb.subscribe((datagram) => {
-      console.log('datagram.type--', datagram.type)
+      // console.log('datagram.type--', datagram.type)
       if (datagram.type === 'measure-event') {
         dispatch(updateTaskState(datagram.data));
       } else if (datagram.type === 'measure-point') {

src/components/CustomNavBar.scss

@@ -13,7 +13,6 @@
     .bg-color {
         position: absolute;
         height: 100%;
-        width: 50%;
         left: 0;
         border-radius: 4px;
         z-index: 1;

src/components/CustomNavBar.tsx

@@ -18,9 +18,9 @@ export default function CustomNavBar({ title }: { title: string }) {
         className="absolute h-[30px] w-full bg-white border border-[#D8D8D8] flex items-center gap-2 px-2"
         style={{ top: device.connected && showDetail ? '100%' : 0, transition: 'top 300ms' }}
       >
-        <span className="flex-1">温度: {device.temperature.toFixed(1)}°C</span>
-        <span className="flex-1">X轴倾斜: {device.inclinatorX.toFixed(2)}</span>
-        <span className="flex-1">Y轴倾斜: {device.inclinatorY.toFixed(2)}</span>
+        <span className="flex-1">温度: {device.temperature?.toFixed(1)}°C</span>
+        <span className="flex-1">X轴倾斜: {device.inclinatorX?.toFixed(2)}</span>
+        <span className="flex-1">Y轴倾斜: {device.inclinatorY?.toFixed(2)}</span>
       </div>
       {/** 导航栏 */}
       <div className="absolute left-0 top-0 w-full h-full flex items-center px-3 bg-white">
@@ -42,9 +42,9 @@ export default function CustomNavBar({ title }: { title: string }) {
                     }}
                 />
                 <div className="bluetooth-battery">
-                    <div className="bg-color" style={{ width: `${device.power}%`, backgroundColor: device.flag ? '#1dbb1d' : device.power > 20 ? '#3e63cb' : 'red' }}></div>
-                    <div className={'power-head'} style={{ backgroundColor: device.flag ? '#1dbb1d' : device.power > 20 ? '#3e63cb' : 'red' }}></div>
-                    <span className="power-num">{device.power}</span>
+                    <div className="bg-color" style={{ width: `${device.power || 0}%`, backgroundColor: device.flag ? '#1dbb1d' : device.power > 20 ? '#3e63cb' : 'red' }}></div>
+                    <div className={'power-head'} style={{ backgroundColor: device.flag && device.power === 100? '#1dbb1d' : device.power === 100 ? '#3e63cb' : 'rgba(0,0,0,0.3)' }}></div>
+                    <span className="power-num">{device.power || 0}</span>
                     {device.flag === 1 && <img src={power_icon} alt=""/>}
                 </div>
 

src/components/MeasurementItem.tsx

@@ -25,6 +25,7 @@ export default function MeasurementItem({
       )}
       <main className="flex-1">
         <header className="flex items-center gap-2">
+          <span className="text-sm text-[#606266]">{item.todayNumber}.</span>
           <h1 className="text-[15px] font-medium ">{item.name}</h1>
           {item.syncStatus === 'finish' && <span className="text-[#04CA17] text-xs">已上传</span>}
         </header>

src/components/konva/MeasurementCanvas.tsx

@@ -400,13 +400,13 @@ const MeasurementCanvas = forwardRef<MeasurementCanvasRef, MeasurementCanvasProp
             for (let x = logicalExtent.minX; x <= logicalExtent.maxX; x += dynamicXInterval) {
                 const pos = transform({ x, y: 0 });
                 texts.push(
-                    <Text key={`coord-x-${x}`} x={pos.x - 10} y={height - 20} text={x.toFixed(0)} fontSize={12} fill="black" />
+                    <Text key={`coord-x-${x}`} x={pos.x - 10} y={height - 20} text={x?.toFixed(0)} fontSize={12} fill="black" />
                 );
             }
             for (let y = logicalExtent.minY; y <= logicalExtent.maxY; y += dynamicYInterval) {
                 const pos = transform({ x: 0, y });
                 texts.push(
-                    <Text key={`coord-y-${y}`} x={5} y={pos.y - 6} text={y.toFixed(0)} fontSize={12} fill="black" />
+                    <Text key={`coord-y-${y}`} x={5} y={pos.y - 6} text={y?.toFixed(0)} fontSize={12} fill="black" />
                 );
             }
             return texts;

src/pages/Measure.tsx

@@ -191,11 +191,12 @@ export default function Measure() {
   });
   const [status, setStatus] = useState(0)
   useEffect(() => {
+    console.log(measureState.taskState)
     switch (measureState.taskState) {
       case 'WAITING_FOR_RECORD_THE_1ST_SIDE':
         setStatus(1);
         setState({
-          left_ready: 'none',
+          left_ready: 'ongoing',
           right_ready: 'none',
           left_begin: 'none',
           right_begin: 'none',
@@ -282,7 +283,7 @@ export default function Measure() {
           right_end: 'none',
         });
     }
-  }, [measureState.taskState, status]);
+  }, [measureState.taskState]);
 
   function railName() {
     return baseState.railTypes.find((r) => r.id === railId[0])?.name || '';

src/pages/MeasureRecord.tsx

@@ -40,7 +40,7 @@ export default function MeasureRecord() {
   }
 
   function drawMeasurePoints(leftPoints: string, rightPoints: string) {
-    if (canvasRef.current) {
+    if (canvasRef.current && leftPoints && rightPoints) {
       canvasRef.current.setMeasurementDataLeft(JSON.parse(leftPoints));
       canvasRef.current.setMeasurementDataRight(JSON.parse(rightPoints));
     }

src/pages/MeasureSave.tsx

@@ -1,7 +1,7 @@
 import { NavBar, Picker, Toast } from 'antd-mobile';
 import { useNavigate } from 'react-router';
 import icon_arr_r from '../assets/icon_arr_s_r.svg';
-import { ChangeEvent, useEffect, useState } from 'react';
+import {ChangeEvent, useCallback, useEffect, useState} from 'react';
 import { useAppDispatch, useAppSelector } from '../utils/hooks';
 import { DATA_SOURCE, LINE_CLASSIFY, UNIT_TYPES, XB_CODES } from '../utils/constant';
 import { ExtraDesc, MeasurementDTO } from '../services/apiTypes';
@@ -19,6 +19,32 @@ export default function MeasureSave() {
   const measureState = useAppSelector((state) => state.measure);
   const orgTextArr = useAppSelector(selectOrgTextArr);
 
+
+  const loadData = useCallback(() => {
+    Bridge.getRecordList({ pageNum: 1, size: 1 }).then((res) => {
+      if (res.success && res.data.list.length) {
+        const data = res.data.list[0]?.records?.[0]
+        console.log(data)
+        setName(data?.name)
+        setBatch(data?.batch)
+        setMile(data?.mileage?.split('+')?.[0])
+        setMeter(data?.mileage?.split('+')?.[1])
+        setLineClassCode([data?.lineClassify])
+        setDataSourceCode([data?.dataSource])
+        setDirectionCode([data?.xbCode])
+        setUnitType([data?.unitType])
+        setTurnoutNum(Number(data?.turnoutNum || 1))
+        setSleeperNum(Number(data?.sleeperNum || 1))
+        setStationCode([data?.stationCode])
+        document.getElementById('name-id')?.focus()
+      }
+    });
+  }, []);
+  useEffect(() => {
+    loadData();
+  }, [loadData]);
+
+
   const [name, setName] = useState('');
   const [batch, setBatch] = useState('');
   const [mile, setMile] = useState('10');
@@ -110,8 +136,8 @@ export default function MeasureSave() {
       stationCode: stationCode.length > 0 ? stationCode[0] : '',
       lineClassify: lineClassCode[0],
       dataSource: dataSourceCode[0],
-      turnoutNum: turnoutNum.toFixed(),
-      sleeperNum: sleeperNum.toFixed(),
+      turnoutNum: turnoutNum?.toFixed(),
+      sleeperNum: sleeperNum?.toFixed(),
       unitType: unitType[0],
       mileage: `${mile}+${meter.padStart(3, '0')}`,
       radius: '',
@@ -149,6 +175,7 @@ export default function MeasureSave() {
             <div className="h-12 flex items-center border-b border-[#eee]">
               <span>测量名称</span>
               <input
+                  id='name-id'
                 type="text"
                 name="name"
                 value={name}

src/services/apiTypes.ts

@@ -2,6 +2,7 @@ export type ReqStatus = 'idle' | 'loading' | 'succeeded' | 'failed';
 
 export type Measurement = MeasurementDTO & {
   id: number;
+  todayNumber: string;
   createTime: string; // Date;
   leftPoints: string; // json: 坐标数组
   rightPoints: string; // json: 坐标数组

src/store/features/contextSlice.ts

@@ -35,7 +35,7 @@ const initialState: ContextState = {
   device: {
     flag: 0,
     connected: true, //是否已连接蓝牙
-    power: 60, //电量
+    power: 0, //电量
     inclinatorX: 0.276, //x轴倾斜
     inclinatorY: 3.019, //y轴倾斜
     temperature: 32.026, //温度