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

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

Browse Source
This commit is contained in:
joylink_fanyuhong 2020-02-11 15:59:18 +08:00
commit 3692668b35
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmapNew/constant/deviceState.js
View File

@ -70,7 +70,8 @@ deviceState[deviceType.Signal] = {
deviceState[deviceType.Station] = {
/** 是否故障*/
fault: false, /** 非故障*/
controlMode: 'Center' // Center 中控 Local 站控 Emergency 紧急站控 Interlock 联锁控
controlMode: 'Center'
// controlMode: 'Local' // Center 中控 Local 站控 Emergency 紧急站控 Interlock 联锁控
};
deviceState[deviceType.Psd] = {

4
src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
View File

@ -47,12 +47,12 @@ export default {
{
label: '单操到定位',
handler: this.locate,
cmdType: CMD.Switch.CMD_SWITCH_TURN
cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
},
{
label: '单操到反位',
handler: this.reverse,
cmdType: CMD.Switch.CMD_SWITCH_TURN
cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
},
{
label: '道岔单锁',

5
src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
View File

@ -55,12 +55,12 @@ export default {
{
label: '单操到定位',
handler: this.locate,
cmdType: CMD.Switch.CMD_SWITCH_TURN
cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
},
{
label: '单操到反位',
handler: this.reverse,
cmdType: CMD.Switch.CMD_SWITCH_TURN
cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
},
{
label: '道岔单锁',
@ -147,7 +147,6 @@ export default {
},
initMenu() {
// 编辑模式菜单列表
debugger;
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {

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

@ -29,7 +29,11 @@ export default {
/** 强扳 */
CMD_SWITCH_FORCE_TURN: {value:'Switch_Force_Turn', label: '强扳'},
/** 确认计轴有效 */
CMD_SWITCH_COMFIRMATION_AXLE:{value:'Switch_Comfirmation_Axle', label: '确认计轴有效'}
CMD_SWITCH_COMFIRMATION_AXLE:{value:'Switch_Comfirmation_Axle', label: '确认计轴有效'},
/** 定位（定操） */
CMD_SWITCH_NORMAL_POSITION:{value:'Switch_Normal_Position',label:'单操到定位'},
/** 反位（反操） */
CMD_SWITCH_REVERSE_POSITION:{value:'Switch_Reverse_Position',label:'单操到反位'},
},
// 控制模式操作