diff --git a/src/components/konva/MeasurementCanvas.tsx b/src/components/konva/MeasurementCanvas.tsx index 6b3b643..64fd553 100644 --- a/src/components/konva/MeasurementCanvas.tsx +++ b/src/components/konva/MeasurementCanvas.tsx @@ -182,6 +182,7 @@ const MeasurementCanvas = forwardRef { + console.log(data) setBenchmarkData(data); }, setMeasurementDataLeft: (data: Point[]) => { @@ -301,6 +302,10 @@ const MeasurementCanvas = forwardRef { + console.log('showBenchmark', showBenchmark) + }, [showBenchmark]); + const handlePointerUp = (e: any) => { const pointerId = e.evt.pointerId; pointersRef.current.delete(pointerId); @@ -485,6 +490,8 @@ const MeasurementCanvas = forwardRef { + if (canvasRef.current && measureState.measureFinishData.length) { + setTimeout(() => { + setShowStandard(true) + }, 100); + canvasRef.current?.setMeasurementCalibrationData(measureState.measureFinishData); + setShowMeasureFinish(true) + setCaloading(false) + + + } + }, [baseState.railTypes, measureState.measureFinishData, railId]); // 绘制测量坐标线 useEffect(() => { @@ -91,14 +105,24 @@ export default function Measure() { }, [measureState.rightPoints]); // 左右两测量完成,转换后的测量线(两线合一线) - useEffect(() => { - if (canvasRef.current && measureState.measureFinishData.length) { - canvasRef.current?.setMeasurementCalibrationData(measureState.measureFinishData); - // setshowCalibration(true); - setShowMeasureFinish(true) - setCaloading(false) - } - }, [measureState.measureFinishData]) + // useEffect(() => { + // const points = baseState.railTypes.find((r) => r.id === railId[0]) + // console.log(1111, points) + // + // if (canvasRef.current && measureState.measureFinishData.length) { + // setTimeout(() => { + // const points = baseState.railTypes.find((r) => r.code === railId[0])?.points + // drawRailBaseLine(points || '[]') + // setShowStandard(true) + // }, 100); + // canvasRef.current?.setMeasurementCalibrationData(measureState.measureFinishData); + // // setshowCalibration(true); + // setShowMeasureFinish(true) + // setCaloading(false) + // + // + // } + // }, [measureState.measureFinishData]) useEffect(() => { if(measureState.measureStatus === 'FINISH_RECORD'){ @@ -305,7 +329,7 @@ export default function Measure() { right_end: 'done', }); // 测量完成,显示基线 - setShowStandard(true) + break; default: setState({