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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
zyy 2021-08-25 11:09:58 +08:00
commit 455e102696
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jmapNew/theme/components/menus/dialog/setFault.vue
View File

@ -208,6 +208,22 @@ export default {
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
{label: '计轴故障', value: 'AXLE_FAULT'}
];
} else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') {
this.faultList = [
{label: '红光带故障', value: 'FAULT'},
{label: '粉光带故障', value: 'CBTC_OCCUPIED_FAULT'},
{label: '橙光带故障', value: 'ARB'}
];
} else if (selected._type === 'Switch' && this.popClass === 'xian-01__systerm' ) {
this.faultList = [
{label: '失表', value: 'SPLIT'},
{label: '定位失表', value: 'NORMAL_SPLIT'},
{label: '反位失表', value: 'REVERSE_SPLIT'},
{label: '挤岔', value: 'SQUEEZE'},
{label: '粉光带故障', value: 'CBTC_OCCUPIED_FAULT'},
{label: '红光带故障', value: 'AXLE_FAULT'},
{label: '橙光带故障', value: 'ARB'}
];
}
if (this.faultList && this.faultList.length) {
this.form.faultType = this.faultList[0].value;

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

@ -112,7 +112,8 @@ export default {
'noARB',
'checkDirectionWhenSetHead',
'transferRouteCanOnlyFaultUnlock',
'setManualWhenHeadTrainArriveTarget'
'setManualWhenHeadTrainArriveTarget',
'routeDefaultCheckConflict'
],
selectList: ['runMode'],
generalConfig: [
@ -157,7 +158,8 @@ export default {
'noARB',
'checkDirectionWhenSetHead',
'transferRouteCanOnlyFaultUnlock',
'setManualWhenHeadTrainArriveTarget'
'setManualWhenHeadTrainArriveTarget',
'routeDefaultCheckConflict'
],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -207,7 +209,8 @@ export default {
noARB: '没有ARB判定',
checkDirectionWhenSetHead: '设置头码车时检查方向',
transferRouteCanOnlyFaultUnlock: '转换轨进路只能通过故障解锁来取消',
setManualWhenHeadTrainArriveTarget: '头码车抵达目的地后变为人工车'
setManualWhenHeadTrainArriveTarget: '头码车抵达目的地后变为人工车',
routeDefaultCheckConflict: '进路默认开启冲突检测'
}
};
},