Browse Source

fix:基础轨形显示

master
guoapeng 2 months ago
parent
commit
90f3566ce7
  1. 7
      src/components/konva/MeasurementCanvas.tsx
  2. 44
      src/pages/Measure.tsx

7
src/components/konva/MeasurementCanvas.tsx

@ -182,6 +182,7 @@ const MeasurementCanvas = forwardRef<MeasurementCanvasRef, MeasurementCanvasProp
setMeasurementDataState([]); setMeasurementDataState([]);
}, },
setBenchmarkData: (data: BenchmarkShape[]) => { setBenchmarkData: (data: BenchmarkShape[]) => {
console.log(data)
setBenchmarkData(data); setBenchmarkData(data);
}, },
setMeasurementDataLeft: (data: Point[]) => { setMeasurementDataLeft: (data: Point[]) => {
@ -301,6 +302,10 @@ const MeasurementCanvas = forwardRef<MeasurementCanvasRef, MeasurementCanvasProp
} }
}; };
useEffect(() => {
console.log('showBenchmark', showBenchmark)
}, [showBenchmark]);
const handlePointerUp = (e: any) => { const handlePointerUp = (e: any) => {
const pointerId = e.evt.pointerId; const pointerId = e.evt.pointerId;
pointersRef.current.delete(pointerId); pointersRef.current.delete(pointerId);
@ -485,6 +490,8 @@ const MeasurementCanvas = forwardRef<MeasurementCanvasRef, MeasurementCanvasProp
} }
return null; return null;
}); });
console.log( 'bk', bk)
console.log('benchmarkData', benchmarkData)
return bk; return bk;
}; };

44
src/pages/Measure.tsx

@ -70,12 +70,26 @@ export default function Measure() {
if (res.success) { if (res.success) {
dispatch(updateRailPoints(res.data)); dispatch(updateRailPoints(res.data));
drawRailBaseLine(res.data.points!); drawRailBaseLine(res.data.points!);
console.log(r.points)
} else { } else {
Toast.show(res.message); Toast.show(res.message);
} }
}); });
} }
}, [baseState.railTypes, dispatch, railId]);
}, [baseState.railTypes, dispatch, railId, measureState.measureFinishData]);
useEffect(() => {
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(() => { useEffect(() => {
@ -91,14 +105,24 @@ export default function Measure() {
}, [measureState.rightPoints]); }, [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(() => { useEffect(() => {
if(measureState.measureStatus === 'FINISH_RECORD'){ if(measureState.measureStatus === 'FINISH_RECORD'){
@ -305,7 +329,7 @@ export default function Measure() {
right_end: 'done', right_end: 'done',
}); });
// 测量完成,显示基线 // 测量完成,显示基线
setShowStandard(true)
break; break;
default: default:
setState({ setState({

Loading…
Cancel
Save