joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute

Browse Source
This commit is contained in:
fan 2021-01-20 16:26:32 +08:00
parent 2e4cdc698e
commit 5a36ce69fe
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/shape/Text/index.js
View File

@ -62,7 +62,6 @@ export default class Text2 extends Group {
return;
}
const showConditions = this.model.showConditions;
console.log(showMode, showConditions);
if (!showConditions || showConditions === '01' || showMode === showConditions) {
this.text && this.text.show();
} else {

51
src/views/system/configLine/config.vue
View File

@ -77,9 +77,52 @@ export default {
height: 800,
roadData: [],
focus: false,
booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'guideNeedRouteSettingFirst', 'signalOpenAfterParking', 'standHoldCloseLogicLight', 'atsAutoHandleManualFrontTurnBack', 'doNotSetRouteWhenSectionOccupied', 'routeSettingNoFail', 'signalBlockRouteSettable'],
booleanList: [
'upRight',
'lockFirst',
'switchSingleHandle',
'switchNRTurnChain',
'switchSingleLockChain',
'switchLossChain',
'signalForceCancelRoute',
'initSingleLockSwitch',
'ctcOverlapOnlyTurnBackStationLock',
'guideNeedRouteSettingFirst',
'signalOpenAfterParking',
'standHoldCloseLogicLight',
'atsAutoHandleManualFrontTurnBack',
'doNotSetRouteWhenSectionOccupied',
'routeSettingNoFail',
'signalBlockRouteSettable',
'cancelAtsControlOfAllRoutesWhenCancelRoute',
'signalHumanControlBeforeSetAtsControlOrCIAutoTrigger'
],
selectList: ['runMode'],
generalConfig: ['lockFirst', 'switchSingleHandle', 'upRight', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM', 'rmAtpSpeed', 'urmAtpSpeed', 'guideNeedRouteSettingFirst', 'signalOpenAfterParking', 'standHoldCloseLogicLight', 'atsAutoHandleManualFrontTurnBack', 'doNotSetRouteWhenSectionOccupied', 'routeSettingNoFail', 'signalBlockRouteSettable'],
generalConfig: [
'lockFirst',
'switchSingleHandle',
'upRight',
'switchNRTurnChain',
'switchSingleLockChain',
'switchLossChain',
'signalForceCancelRoute',
'runMode',
'initSingleLockSwitch',
'ctcOverlapOnlyTurnBackStationLock',
'noParkingSM',
'parkingSM',
'rmAtpSpeed',
'urmAtpSpeed',
'guideNeedRouteSettingFirst',
'signalOpenAfterParking',
'standHoldCloseLogicLight',
'atsAutoHandleManualFrontTurnBack',
'doNotSetRouteWhenSectionOccupied',
'routeSettingNoFail',
'signalBlockRouteSettable',
'cancelAtsControlOfAllRoutesWhenCancelRoute',
'signalHumanControlBeforeSetAtsControlOrCIAutoTrigger'
],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
numberList: [],
@ -107,7 +150,9 @@ export default {
atsAutoHandleManualFrontTurnBack:'ATS是否自动处理人工设置的站前折返自动更新车次',
doNotSetRouteWhenSectionOccupied: '当进路的区段占用时不排列进路',
routeSettingNoFail:'进路办理不失败',
signalBlockRouteSettable:'信号封锁下进路是否可以办理'
signalBlockRouteSettable:'信号封锁下进路是否可以办理',
cancelAtsControlOfAllRoutesWhenCancelRoute: '当取消进路/人解进路时，将该进路始端信号机下所有进路设为自排关',
signalHumanControlBeforeSetAtsControlOrCIAutoTrigger: '在设置自排开或自动触发之前，信号机需处于人工控状态'
}
};
},