From 40f5ec65bd0abd9a0e21d0c3353d07229cfb08ab Mon Sep 17 00:00:00 2001 From: zhangjiming Date: Wed, 9 Apr 2025 22:18:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=81=93=E5=B2=94=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E6=9E=95=E6=9C=A8=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/MeasureRecord.tsx | 9 +++++++++ src/pages/MeasureSave.tsx | 40 ++++++++++++++++++++++++++++++++++++++-- src/services/apiTypes.ts | 2 ++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/src/pages/MeasureRecord.tsx b/src/pages/MeasureRecord.tsx index f77d993..1ea4257 100644 --- a/src/pages/MeasureRecord.tsx +++ b/src/pages/MeasureRecord.tsx @@ -123,6 +123,15 @@ export default function MeasureRecord() {

数据来源

{measure.extraDescObj?.dataSource} + {measure.dataSource === 'DCDC' && ( + <> +

道岔号

+ {measure.turnoutNum} +

枕木号

+ {measure.sleeperNum} + + )} +

线路分类

{measure.extraDescObj?.lineClassify} diff --git a/src/pages/MeasureSave.tsx b/src/pages/MeasureSave.tsx index c587882..b5395a2 100644 --- a/src/pages/MeasureSave.tsx +++ b/src/pages/MeasureSave.tsx @@ -22,6 +22,8 @@ export default function MeasureSave() { const [batch, setBatch] = useState(''); const [mile, setMile] = useState(10); const [meter, setMeter] = useState(10); + const [turnoutNum, setTurnoutNum] = useState(1); + const [sleeperNum, setSleeperNum] = useState(1); const [railPickerVisible, setRailPickerVisible] = useState(false); const [dataSourcePickerVisible, setDataSourcePickerVisible] = useState(false); const [lineClassPickerVisible, setLineClassPickerVisible] = useState(false); @@ -47,6 +49,14 @@ export default function MeasureSave() { if (/^\d*$/.test(evt.target.value)) { setMeter(+evt.target.value); } + } else if (evt.target.name === 'turnoutNum') { + if (/^\d*$/.test(evt.target.value)) { + setTurnoutNum(+evt.target.value); + } + } else if (evt.target.name === 'sleeperNum') { + if (/^\d*$/.test(evt.target.value)) { + setSleeperNum(+evt.target.value); + } } }; const onSaveBtnClick = () => { @@ -84,6 +94,8 @@ export default function MeasureSave() { stationCode: stationCode[0], lineClassify: lineClassCode[0], dataSource: dataSourceCode[0], + turnoutNum: turnoutNum.toFixed(), + sleeperNum: sleeperNum.toFixed(), unitType: unitType[0], mileage: `${mile}+${meter.toString().padStart(3, '0')}`, radius: '', @@ -135,7 +147,7 @@ export default function MeasureSave() {
里程 公里+ arr
+ {dataSourceCode[0] === 'DCDC' && ( + <> +
+ 道岔号 + +
+
+ 枕木号 + +
+ + )}
setStationPickerVisible(true)} diff --git a/src/services/apiTypes.ts b/src/services/apiTypes.ts index 667edc2..191518d 100644 --- a/src/services/apiTypes.ts +++ b/src/services/apiTypes.ts @@ -44,6 +44,8 @@ export type MeasurementDTO = { stationCode: string; dataType: string; // 采集方式 dataSource: string; + turnoutNum: string; + sleeperNum: string; railSize: string; // 轨型 lineClassify: string; // 线路分类 batch: string;