Merge remote-tracking branch 'origin/test'

This commit is contained in:
fan 2021-06-17 18:43:42 +08:00
commit fabe73382d

View File

@ -894,13 +894,13 @@ const map = {
const device = state.mapDevice[status.code]; const device = state.mapDevice[status.code];
if ((device.stationHoldTrain || device.centerHoldTrain) && holdIndex < 0) { if ((device.stationHoldTrain || device.centerHoldTrain) && holdIndex < 0) {
state.holdStandList.push(device.code); state.holdStandList.push(device.code);
} else if (!(device.stationHoldTrain && device.centerHoldTrain) && holdIndex > -1) { } else if (!(device.stationHoldTrain || device.centerHoldTrain) && holdIndex > -1) {
state.holdStandList.splice(holdIndex, 1); state.holdStandList.splice(holdIndex, 1);
} }
state.holdStatus = state.holdStandList.length > 0; state.holdStatus = state.holdStandList.length > 0;
if ((device.assignSkip || device.allSkip) && jumpIndex < 0) { if ((device.assignSkip || device.allSkip) && jumpIndex < 0) {
state.jumpStandList.push(device.code); state.jumpStandList.push(device.code);
} else if (!(device.assignSkip && device.allSkip) && jumpIndex > -1) { } else if (!(device.assignSkip || device.allSkip) && jumpIndex > -1) {
state.jumpStandList.splice(jumpIndex, 1); state.jumpStandList.splice(jumpIndex, 1);
} }
state.jumpStatus = state.jumpStandList.length > 0; state.jumpStatus = state.jumpStandList.length > 0;