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:
joylink_cuiweidong 2021-06-29 10:33:32 +08:00
commit 835e638a31
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,6 +242,9 @@ export default {
faultType: this.form.faultType
}
};
if (this.selected._type === 'Switch' && this.form.faultType === 'ARB') {
setp.param.code = this.selected.sectionParentCode;
}
this.sendCommand(setp);
},
sendInstructions() { // 发送指令
@ -253,6 +256,9 @@ export default {
faultType: this.form.faultType
}
};
if (this.selected._type === 'Switch' && this.form.faultType === 'ARB') {
setp.param.code = this.selected.sectionParentCode;
}
this.sendCommand(setp);
},
handleCollocation() { // 设置托管

10
src/scripts/cmdPlugin/Config.js
View File

@ -31,7 +31,7 @@ export const deviceFaultType = {
Section: [
{label: '计轴故障', value: 'FAULT'},
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
{label: 'ARB', value: 'ARB'}
{label: '橙光带故障', value: 'ARB'}
// {label: '计轴干扰', value: 'DISTURBANCE'}
],
Signal: [
@ -43,7 +43,8 @@ export const deviceFaultType = {
{label: '反位失表', value: 'REVERSE_SPLIT'},
{label: '挤岔', value: 'SQUEEZE'},
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
{label: '计轴故障', value: 'AXLE_FAULT'}
{label: '计轴故障', value: 'AXLE_FAULT'},
{label: '橙光带故障', value: 'ARB'}
// {label: '道岔区段计轴故障', value: 'AXLE_FAULT'}
],
StationStand: [
@ -70,7 +71,7 @@ export const deviceFaultMap = {
Section: {
FAULT: '计轴故障',
CBTC_OCCUPIED_FAULT: '通信车占用',
ARB: 'ARB'
ARB: '橙光带故障'
},
Signal: {
MAIN_FILAMENT_BROKEN: '熔断'
@ -81,7 +82,8 @@ export const deviceFaultMap = {
REVERSE_SPLIT: '反位失表',
SQUEEZE: '挤岔',
CBTC_OCCUPIED_FAULT: '通信车占用',
AXLE_FAULT: '计轴故障'
AXLE_FAULT: '计轴故障',
ARB: '橙光带故障'
},
StationStand: {
PSD_CANNOT_BE_CLOSED: '屏蔽门无法关闭',