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:
fan 2021-05-17 16:14:17 +08:00
commit 9554643f05
4 changed files with 88 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/theme/nanjing_02/menus/menuBar.vue
View File

@ -179,6 +179,7 @@
<script>
import { mapGetters } from 'vuex';
import { EventBus } from '@/scripts/event-bus';
// import { TrainingMode } from '@/scripts/ConstDic';
import voiceOpen from '@/assets/voiceOpen.png';
import voiceClose from '@/assets/voiceClose.png';
import BuzzerAudio from '@/assets/buzzer.mp3';

19
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -545,7 +545,13 @@ export default {
initCentralizedStationList(list) {
const stationContorl = this.stationContorl;
this.menuCmdList = new Array(15).fill({});
list.forEach((el, index) => {
const lists = list.filter(el => {
if (el.isShow && !el.isShow(this.oldClickObj.roadType)) {
return false;
}
return el;
});
lists.forEach((el, index) => {
if (el.disabledCb && stationContorl) {
el.disabled = el.disabledCb(stationContorl);
}
@ -1257,7 +1263,15 @@ export default {
{ name: '强解区段', commandTip: '解锁进路中的轨道区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
{ name: '预复位', commandTip: '预重置计轴区段', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
{ name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
{ name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
{ name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Section.CMD_SECTION_1, operate: OperationEvent.Section.turnBackDTO.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '取消折返', commandTip: '取消折返', cmdType: CMD.Section.CMD_SECTION_2, operate: OperationEvent.Section.CancelTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '自动折返', commandTip: '自动折返', cmdType: CMD.Section.CMD_SECTION_3, operate: OperationEvent.Section.AutoTurnBack.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '换上至下', commandTip: '换上至下', cmdType: CMD.Section.CMD_SECTION_4, operate: OperationEvent.Section.PutUpTheDown.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type == 'RIGHT' },
{ name: '换下至上', commandTip: '换下至上', cmdType: CMD.Section.CMD_SECTION_5, operate: OperationEvent.Section.PutDownTheUp.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type != 'RIGHT' },
{ name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Section.CMD_SECTION_6, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type == 'RIGHT' },
{ name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Section.CMD_SECTION_7, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (type) => type != 'RIGHT' }
];
this.switchParamList = [
{ name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},
@ -1596,7 +1610,6 @@ export default {
margin-top: 10px;
padding: 10px;
}
.station_updateStatus{}
.station_command{
float: right;
}

17
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -160,7 +160,22 @@ export default {
/** 轨道开放 */
CMD_SECTION_OPEN: {value: 'Section_Open', label: '轨道开放'},
/** 轨道关闭 */
CMD_SECTION_CLOSE: {value: 'Section_Close', label: '轨道关闭'}
CMD_SECTION_CLOSE: {value: 'Section_Close', label: '轨道关闭'},
/** 折返 DTO */
CMD_SECTION_1: {value: 'Section_1', label: '折返 DTO'},
/** 取消折返 */
CMD_SECTION_2: {value: 'Section_2', label: '取消折返'},
/** 自动折返 */
CMD_SECTION_3: {value: 'Section_3', label: '自动折返'},
/** 换上至下 */
CMD_SECTION_4: {value: 'Section_4', label: '换上至下'},
/** 换下至上 */
CMD_SECTION_5: {value: 'Section_5', label: '换下至上'},
/** 上行终止站停 */
CMD_SECTION_6: {value: 'Section_6', label: '上行终止站停'},
/** 下行终止站停 */
CMD_SECTION_7: {value: 'Section_7', label: '下行终止站停'}
},
// 站台

55
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -2102,6 +2102,61 @@ export const OperationEvent = {
operation: '415',
domId: '_Tips-Section-Load-Spare-Train'
}
},
menuButton: {
menuButton: {
operation: '416',
domId: '_Tips-Section-Load-Spare-Train'
}
},
// 折返 DTO
turnBackDTO: {
menuButton: {
operation: '417',
domId: '_Tips-Section-turn-Back-DTO-menu-Button'
}
},
// 取消折返
CancelTurnBack: {
menuButton: {
operation: '418',
domId: '_Tips-Section-Cancel-Turn-Back-menu-Button'
}
},
// 自动折返
AutoTurnBack: {
menuButton: {
operation: '419',
domId: '_Tips-Section-Auto-Turn-Back-menu-Button'
}
},
// 换上至下
PutUpTheDown: {
menuButton: {
operation: '420',
domId: '_Tips-Section-Put-Up-The-Down-menu-Button'
}
},
// 换下至上
PutDownTheUp: {
menuButton: {
operation: '421',
domId: '_Tips-Section-Put-Down-The-Up-menu-Button'
}
},
// 上行终止站停
PutUpStop: {
menuButton: {
operation: '422',
domId: '_Tips-Section-Put-Up-Stop-menu-Button'
}
},
// 下行终止站停
PutDownStop: {
menuButton: {
operation: '423',
domId: '_Tips-Section-Put-Down-Stop-menu-Button'
}
}
},