Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m35s

This commit is contained in:
joylink_fanyuhong 2024-10-08 16:18:18 +08:00
commit 562279a2fe
2 changed files with 5 additions and 5 deletions

View File

@ -627,11 +627,11 @@ const options = [
value: 2, value: 2,
}, },
{ {
label: '列车驾驶台', label: '取消连接',
value: 3, value: 3,
}, },
{ {
label: '取消连接', label: '列车驾驶台',
value: 4, value: 4,
}, },
{ {
@ -645,9 +645,9 @@ function doTrainOperation(option: { label: string; value: number }) {
setTrain(); setTrain();
} else if (option.value == 2) { } else if (option.value == 2) {
linkTrain(); linkTrain();
} else if (option.value == 3) {
openTccDialog();
} else if (option.value == 4) { } else if (option.value == 4) {
openTccDialog();
} else if (option.value == 3) {
cancelTrainLink(); cancelTrainLink();
} else if (option.value == 5) { } else if (option.value == 5) {
clearTrain(); clearTrain();

View File

@ -719,8 +719,8 @@ const TrainOperateMenu: ContextMenu = ContextMenu.init({
items: [ items: [
TrainParam, TrainParam,
TrainLink, TrainLink,
DrivingCabConfig,
CancelLink, CancelLink,
DrivingCabConfig,
removeTrainConfig, removeTrainConfig,
], ],
}, },