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-01-15 13:34:35 +08:00
commit 93eaaacd96
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/config/skinCode/nanjing_02.js
View File

@ -90,7 +90,7 @@ class SkinCode extends defaultStyle {
invalidColor: '#ff0000', // 计轴故障
undefinedColor: '#0071C1', // 区段未定义颜色
protectionLockedColor: '#FEFF00', // 保护区段锁闭(未用)
blockColor: '#000080', // 区段封锁颜色 深蓝色
blockColor: '#0010FF', // 区段封锁颜色 深蓝色
atcExcisionColor: '#A0522D', // 区段atc切除颜色
atsExcisionColor: '#A0522D', // 区段ats切除颜色
timeReleaseColor: '#ffff00', // 区段延时释放颜色

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

@ -442,7 +442,7 @@ export default {
$menuItemPadding: 5px;
#menuBar {
z-index: 37;
z-index: 16;
position: absolute;
width: inherit;
}

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

@ -875,7 +875,7 @@ export default {
{ name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, show: false, securityCommand: true },
{ name: '轨区消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, show: false, securityCommand: true },
{ name: '强行消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, show: false, securityCommand: true },
{ name: '强解区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
{ name: '强解区段', cmdType: CMD.Section.CMD_SECTION_FORCE_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
{ name: '预复位', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.cancelSpeed.menuButton, show: false, securityCommand: true },
{ name: '封锁区段', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, show: false },
{ name: '解封区段', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, show: false, securityCommand: true }
@ -885,7 +885,7 @@ export default {
{ name: '岔区消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, show: false, securityCommand: true },
{ name: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.locate.menuButton, show: false },
{ name: '强行转岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.locate.menuButton, show: false, securityCommand: true },
{ name: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
{ name: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
{ name: '挤岔恢复', cmdType: '', operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true },
{ name: '单独锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, show: false },
{ name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, show: false, securityCommand: true },

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

@ -19,7 +19,9 @@ export default {
/** 计轴预复位 */
CMD_SWITCH_AXIS_PRE_RESET: {value:'Switch_Axis_Pre_Reset', label: '计轴预复位'},
/** 故障解锁 */
CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
/** 强解道岔*/
CMD_SWITCH_FORCE_UNLOCK: {value:'', label: '强解道岔'},
/** 转动 */
CMD_SWITCH_TURN: {value:'Switch_Turn', label: '转动'},
/** 强扳 */
@ -131,7 +133,9 @@ export default {
/** 故障解锁 */
CMD_SECTION_FAULT_UNLOCK: {value:'Section_Fault_Unlock', label: '故障解锁'},
/** 取消临时限速 */
CMD_SECTION_CANCEL_LIMIT_SPEED:{value:'Section_Cancel_Limit_Speed', label: '取消临时限速'},
CMD_SECTION_CANCEL_LIMIT_SPEED:{value:'Section_Cancel_Limit_Speed', label: '取消临时限速'},
/** 强解区段*/
CMD_SECTION_FORCE_UNLOCK: {value: 'Section_Force_Unlock', label: '强解区段'},
/** 确认计轴有效 */
CMD_SECTION_COMFIRMATION_AXLE:{value:'Section_Confirm_Axis_Valid', label: '确认计轴有效'},
/** 详情 */