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-01-22 19:18:37 +08:00
commit 8373a96229
30 changed files with 1455 additions and 1051 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/config/skinCode/foshan_01.js
View File

@ -98,6 +98,10 @@ class SkinCode extends defaultStyle {
logicalTextColor: '#FFFFFF', // 逻辑区段名称颜色 (未用)
invalidColor: '#A25100' // 区段ARB故障颜色
},
sectionMiddle: {
preResetColor: '#4169E1', // 区段计轴预复位
z: 2
},
speedLimit: { // 限速元素
z: 2,
width: 1, // 限速线的宽短

6
src/jmapNew/config/skinCode/fuzhou_01.js
View File

@ -6,7 +6,7 @@ class SkinCode extends defaultStyle {
super();
this.fontFamily = '宋体';
this[deviceType.Section] = {
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit'],
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit', 'sectionMiddle'],
active: {
routeColor: false // 进路触发颜色
},
@ -98,6 +98,10 @@ class SkinCode extends defaultStyle {
logicalTextColor: '#FFFFFF', // 逻辑区段名称颜色 (未用)
invalidColor: '#A25100' // 区段ARB故障颜色
},
sectionMiddle: {
preResetColor: '#00FFFF', // 区段计轴预复位
z: 2
},
speedLimit: { // 限速元素
z: 2,
width: 1, // 限速线的宽短

4
src/jmapNew/config/skinCode/haerbin_01.js
View File

@ -6,7 +6,7 @@ class SkinCode extends defaultStyle {
super();
this.fontFamily = '宋体';
this[deviceType.Section] = {
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'speedLimitName'],
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionMiddle', 'speedLimitName'],
active: {
routeColor: false // 进路触发颜色
},
@ -103,7 +103,7 @@ class SkinCode extends defaultStyle {
z: -1,
activeStroke: '#2EBFBF'
},
sectionBlock: {
sectionMiddle: {
z: 2
}, // 计轴
speedLimit: { // 限速元素

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

@ -6,7 +6,7 @@ class SkinCode extends defaultStyle {
super();
this.fontFamily = '宋体';
this[deviceType.Section] = {
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'separator', 'speedLimitName'],
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionMiddle', 'separator', 'speedLimitName'],
active: {
routeColor: false // 进路触发颜色
},
@ -89,7 +89,6 @@ class SkinCode extends defaultStyle {
unCommunicationOccupiedColor: '#A600A6', // 区段非通讯车占用颜色 紫色
routeLockColor: '#00FF00', // 区段路由锁定颜色 空闲且被进路征用
protectiveLockColor: '#9DFF6E', // 区段保护锁闭
blockColor: '#0010FF', // 区段封锁颜色 深蓝色
faultLockColor: '#9B4A0A', // 区段故障锁定颜色
@ -101,15 +100,17 @@ class SkinCode extends defaultStyle {
protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
logicalTextColor: '#FFFFFF' // 逻辑区段名称颜色 (未用)
},
sectionMiddle: {
blockColor: '#0010FF', // 区段封锁颜色 深蓝色
preResetColor: '#FFBEC9', // 区段计轴预复位
z: 2
},
lineBorder: { // 哈尔滨点击背景 元素
z: -1,
activeStroke: '#2EBFBF'
},
sectionBlock: {
z: 2
}, // 计轴
// 计轴
speedLimit: { // 限速元素
z: 2,
width: 1, // 限速线的宽短

3
src/jmapNew/shape/Section/EblockLines.js
View File

@ -16,6 +16,9 @@ export default class ELines extends Group {
this.model = model;
this.zlevel = model.zlevel;
this.z = model.z;
if (model.modelData.type === '01' && model.modelData.logicSectionCodeList && model.modelData.logicSectionCodeList.length) {
return;
}
this.create();
}

23
src/jmapNew/shape/Section/index.js
View File

@ -55,7 +55,7 @@ export default class Section extends Group {
'destinationText': ETextName, // 目的码名称
'line': ELines, // 创建区段
'lineBorder': ELines, // 哈尔滨线路点击背景色
'sectionBlock': EblockLines, // 哈尔滨线路区段（封锁显示）
'sectionMiddle': EblockLines, // 哈尔滨线路区段（封锁显示）
'stopRouteImg': EStopRouteImg, // 宁波三线路特有
'axle': EAxle, // 计轴 (西安二号线 )
'separator': ESeparator, // 分隔符
@ -88,8 +88,8 @@ export default class Section extends Group {
if (this.line) {
this.line.setCrossUnBlock();
this.line.stopAnimation(true);
this.sectionBlock && this.sectionBlock.hide(); // 因此特殊区段
this.sectionBlock && this.sectionBlock.stopAnimation();
this.sectionMiddle && this.sectionMiddle.hide(); // 因此特殊区段
this.sectionMiddle && this.sectionMiddle.stopAnimation();
if (this.model.type == '01' && this.model.parentCode) {
this.line.setStyle({stroke:'#5b5b5b'});
} else {
@ -189,10 +189,10 @@ export default class Section extends Group {
/** 封锁 06*/
block(routeLock) {
if (this.sectionBlock && this.model.type !== '03') {
this.sectionBlock.setStyle({stroke: this.style.Section.line.blockColor});
this.sectionBlock.show();
routeLock && this.style.Section.line.routeBlockFlashing && this.sectionBlock.animateStyle(true, [
if (this.sectionMiddle && this.model.type !== '03' && this.style.Section.sectionMiddle && this.style.Section.sectionMiddle.blockColor) {
this.sectionMiddle.setStyle({stroke: this.style.Section.line.blockColor});
this.sectionMiddle.show();
routeLock && this.style.Section.line.routeBlockFlashing && this.sectionMiddle.animateStyle(true, [
{ time: 500, styles: { stroke: this.style.backgroundColor } },
{ time: 1000, styles: { stroke: this.style.Section.line.blockColor } }
]);
@ -289,6 +289,13 @@ export default class Section extends Group {
this.line && this.line.setStyle({stroke: '#7F7F7F'});
this.name && this.name.setStyle({textFill: '#7F7F7f'});
}
/** 计轴预复位 */
preReset(blockade) {
if (this.style.Section.sectionMiddle && this.style.Section.sectionMiddle.preResetColor && !blockade) { // 南京二号线
this.sectionMiddle.setStyle({stroke: this.style.Section.sectionMiddle.preResetColor});
this.sectionMiddle.show();
}
}
// 南京二号线
setSwitchSectionColor(section1, section2) {
section1 && section1.instance && section1.instance.line.setStyle({ stroke: this.style.Switch.sectionAction.spareColor });
@ -354,6 +361,8 @@ export default class Section extends Group {
model.nctOccupied && this.unCommunicationOccupied();
/** 通信车占用状态 */
model.ctOccupied && this.communicationOccupied();
// 计轴预复位
model.preReset && this.preReset(model.blockade);
/** 区段切除*/
model.cutOff && this.sectionCutOff();
/** 是否限速*/

2
src/jmapNew/theme/components/utils/menuOperate.js
View File

@ -224,7 +224,7 @@ export const menuOperate = {
axlePreReset:{
// 计轴预复位
operation: OperationEvent.Switch.axlePreReset.menu.operation,
cmdType: CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET
},
hookLock:{
// 道岔钩锁

3
src/jmapNew/theme/foshan_01/menus/menuButton.vue
View File

@ -144,7 +144,7 @@
<button
id="mbm_14"
:style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"
@click="buttonDown('mbm_14')"
@click="buttonDown(Section.axlePreReset.button.operation)"
>
<span style="color: red">
<center>
@ -323,6 +323,7 @@ export default {
const operate = {
operation: operation
};
console.log(operate, '=====');
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下

24
src/jmapNew/theme/foshan_01/menus/menuSection.vue
View File

@ -27,6 +27,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import AllLineCancelLimit from './dialog/allLineCancelLimit';
import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
export default {
name: 'SectionMenu',
@ -143,6 +144,11 @@ export default {
} else {
this.doClose();
}
},
'$store.state.menuOperation.selectedCount': function(val) {
if (this.buttonOperation && this.$store.state.menuOperation.selected._type == 'Switch') {
this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected);
}
}
},
mounted() {
@ -186,6 +192,24 @@ export default {
this.$refs.popMenu.close();
}
},
operationHandler(buttonOperation, selectType) {
switch (buttonOperation) {
case OperationEvent.Section.fault.button.operation: {
// 事故解锁
if (!selectType.normalPosition && selectType.reversePosition) {
this.locate(selectType);
}
break;
}
case OperationEvent.Section.axlePreReset.button.operation: {
// 计轴复零
if (selectType.normalPosition && !selectType.reversePosition) {
this.reverse(selectType);
}
break;
}
}
},
loadSpare() {
commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
if (valid) {

2
src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
View File

@ -388,7 +388,7 @@ export default {
} else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
/** 道岔计轴复位*/
operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
operate.cmdType = CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET;
}
this.setMessage('');
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });

2
src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
View File

@ -82,7 +82,7 @@ export default {
{
label: '计轴预复位',
handler: this.axlePreReset,
cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
cmdType:CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET
},
{
label: this.$t('menu.menuSwitch.sectionResection'),

2
src/jmapNew/theme/fuzhou_01/operationConfig.js
View File

@ -577,7 +577,7 @@ export default {
{
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Axis_Pre_Reset',
operateType: 'Switch_Axle_Pre_Reset',
skinCode: '02',
trainingName: '道岔计轴预复位({7})',
trainingRemark: '道岔计轴预复位功能',

2
src/jmapNew/theme/fuzhou_01/operationConfigGlobal.js
View File

@ -512,7 +512,7 @@ export default {
{
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Axis_Pre_Reset',
operateType: 'Switch_Axle_Pre_Reset',
skinCode: '05',
trainingName: 'Turnout section axile pre reset({7})',
trainingRemark: 'Turnout section axile pre reset function',

2
src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue
View File

@ -388,7 +388,7 @@ export default {
} else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
/** 道岔计轴复位*/
operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
operate.cmdType = CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET;
}
this.setMessage('');
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });

2
src/jmapNew/theme/nanjing_02/menus/dialog/switchCmdControl.vue
View File

@ -388,7 +388,7 @@ export default {
} else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
/** 道岔计轴复位*/
operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
operate.cmdType = CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET;
}
this.setMessage('');
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });

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

@ -659,7 +659,6 @@ export default {
signalCode: this.route.startSignalCode
};
}
if (this.operate == OperationEvent.Signal.humanControl.menuButton.operation || this.operate == OperationEvent.Signal.atsAutoControl.menuButton.operation) {
const routeCodeList = [];
this.routeList.forEach(item => {
@ -738,7 +737,6 @@ export default {
operation: OperationEvent.Command.commandHaerbin.confirm.operation,
param: this.param
};
if (!this.securityCommand) {
step.over = true;
step.cmdType = this.cmdType;
@ -791,7 +789,6 @@ export default {
cmdType: this.cmdType,
operation: OperationEvent.Command.commandHaerbin.confrimCr2.operation
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.pushTempData([{ name: `${this.cmdType.label}成功` }]);
@ -1014,7 +1011,7 @@ export default {
{ name: '挤岔恢复', cmdType: '', operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '单独锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET, operate: OperationEvent.Switch.axlePreReset.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '封锁道岔', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '解封道岔', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '强行消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }

366
src/jmapNew/theme/ningbo_03/menus/menuBar.vue
View File

@ -256,7 +256,7 @@ export default {
Local: [
// {
// title: '窗口(W)',
// operate: OperationEvent.Command.mBar.system,
// operate: '',
// children: [
// {
// title: '报警',
@ -412,118 +412,139 @@ export default {
},
{
title: '线路(G)',
operate: '',
operate: OperationEvent.Command.commandNingBo.line,
children: [
{
title: '站台',
operate: '',
operate: OperationEvent.Command.commandNingBo.line_stand,
children: [
{
title: '开放/关闭',
click: this.standOpenOrClose
click: this.standOpenOrClose,
operate: OperationEvent.Command.commandNingBo.line_stand_openOrClose
},
{
title: '设置/取消扣车',
click: this.setStandDetain
click: this.setStandDetain,
operate: OperationEvent.Command.commandNingBo.line_stand_holdOrNot
},
{
title: '设置站间列车数量',
// click: this.setIntervalStopNumber
click: this.undeveloped
click: this.undeveloped,
operate: OperationEvent.Command.commandNingBo.line_stand_trainNum
},
{
title: '分配停站时间',
click: this.setAllocateTime
click: this.setAllocateTime,
operate: OperationEvent.Command.commandNingBo.line_stand_stopTime
},
{
title: '授权转移',
click: this.authorizeTransfer
click: this.authorizeTransfer,
operate: OperationEvent.Command.commandNingBo.line_stand_transfer
},
{
title: '显示',
click: this.showStandDetail
click: this.showStandDetail,
operate: OperationEvent.Command.commandNingBo.line_stand_detail
}
]
},
{
title: '道岔',
operate: '',
operate: OperationEvent.Command.commandNingBo.line_switch,
children: [
{
title: '命令',
title: '命令',
operate: OperationEvent.Command.commandNingBo.line_switch_cmd,
click: this.setSwitchCommand
},
{
title: '封锁',
title: '封锁',
operate: OperationEvent.Command.commandNingBo.line_switch_block,
click: this.setBlockSwitch
},
{
title: '解除封锁',
title: '解除封锁',
operate: OperationEvent.Command.commandNingBo.line_switch_unblock,
click: this.setUnblockSwitch
},
{
title: '请求动岔/请求或授权/取消',
title: '请求动岔/请求或授权/取消',
operate: OperationEvent.Command.commandNingBo.line_switch_empower,
click: this.setSwitchActive
},
{
title: '显示',
title: '显示',
operate: OperationEvent.Command.commandNingBo.line_switch_detail,
click: this.showSwitchDetail
}
]
},
{
title: '信号机',
operate: '',
operate: OperationEvent.Command.commandNingBo.line_signal,
children: [
{
title: '引导',
title: '引导',
operate: OperationEvent.Command.commandNingBo.line_signal_guide,
click: this.setSignalGuide
},
{
title: '取消允许锁闭',
title: '取消允许锁闭',
operate: OperationEvent.Command.commandNingBo.line_signal_lockOrNot,
click: this.setSignalCanBlock
},
{
title: '进路/命令',
title: '进路/命令',
operate: OperationEvent.Command.commandNingBo.line_signal_cmd,
click: this.setRouteCommand
},
{
title: '信号指示模式',
title: '信号指示模式',
operate: OperationEvent.Command.commandNingBo.line_signal_indicator,
click: this.setSignalModel
},
{
title: '封锁',
title: '封锁',
operate: OperationEvent.Command.commandNingBo.line_signal_block,
click: this.setSignalBlock
},
{
title: '解除封锁',
title: '解除封锁',
operate: OperationEvent.Command.commandNingBo.line_signal_unblock,
click: this.setSignalCancelBlock
},
{
title: '显示',
title: '显示',
operate: OperationEvent.Command.commandNingBo.line_signal_detail,
click: this.showSignalDetail
}
]
},
{
title: '轨道',
operate: '',
operate: OperationEvent.Command.commandNingBo.line_section,
children: [
{
title: '开放',
title: '开放',
operate: OperationEvent.Command.commandNingBo.line_section_open,
click: this.handleOpenSection
},
{
title: '关闭',
title: '关闭',
operate: OperationEvent.Command.commandNingBo.line_section_close,
click: this.handleCloseSection
},
{
title: '临时限速',
title: '临时限速',
operate: OperationEvent.Command.commandNingBo.line_section_limitSpeed,
click: this.handleLimitSpeed
},
{
title: '显示',
title: '显示',
operate: OperationEvent.Command.commandNingBo.line_section_detail,
click: this.handleSectionShow
}
]
@ -887,121 +908,142 @@ export default {
},
{
title: '线路(G)',
operate: '',
operate: OperationEvent.Command.commandNingBo.line,
children: [
{
{
title: '站台',
operate: '',
operate: OperationEvent.Command.commandNingBo.line_stand,
children: [
{
title: '开放/关闭',
click: this.standOpenOrClose
click: this.standOpenOrClose,
operate: OperationEvent.Command.commandNingBo.line_stand_openOrClose
},
{
title: '设置/取消扣车',
click: this.setStandDetain
click: this.setStandDetain,
operate: OperationEvent.Command.commandNingBo.line_stand_holdOrNot
},
{
title: '设置站间列车数量',
click: this.setIntervalStopNumber
click: this.undeveloped,
operate: OperationEvent.Command.commandNingBo.line_stand_trainNum
},
{
title: '分配停站时间',
click: this.setAllocateTime
click: this.setAllocateTime,
operate: OperationEvent.Command.commandNingBo.line_stand_stopTime
},
{
title: '授权转移',
click: this.authorizeTransfer
click: this.authorizeTransfer,
operate: OperationEvent.Command.commandNingBo.line_stand_transfer
},
{
title: '显示',
click: this.showStandDetail
click: this.showStandDetail,
operate: OperationEvent.Command.commandNingBo.line_stand_detail
}
]
},
{
title: '道岔',
operate: '',
operate: OperationEvent.Command.commandNingBo.line_switch,
children: [
{
title: '命令',
title: '命令',
operate: OperationEvent.Command.commandNingBo.line_switch_cmd,
click: this.setSwitchCommand
},
{
title: '封锁',
title: '封锁',
operate: OperationEvent.Command.commandNingBo.line_switch_block,
click: this.setBlockSwitch
},
{
title: '解除封锁',
title: '解除封锁',
operate: OperationEvent.Command.commandNingBo.line_switch_unblock,
click: this.setUnblockSwitch
},
{
title: '请求动岔/请求或授权/取消',
title: '请求动岔/请求或授权/取消',
operate: OperationEvent.Command.commandNingBo.line_switch_empower,
click: this.setSwitchActive
},
{
title: '显示',
title: '显示',
operate: OperationEvent.Command.commandNingBo.line_switch_detail,
click: this.showSwitchDetail
}
]
},
{
{
title: '信号机',
operate: '',
operate: OperationEvent.Command.commandNingBo.line_signal,
children: [
{
title: '引导',
title: '引导',
operate: OperationEvent.Command.commandNingBo.line_signal_guide,
click: this.setSignalGuide
},
{
title: '取消允许锁闭',
title: '取消允许锁闭',
operate: OperationEvent.Command.commandNingBo.line_signal_lockOrNot,
click: this.setSignalCanBlock
},
{
title: '进路/命令',
title: '进路/命令',
operate: OperationEvent.Command.commandNingBo.line_signal_cmd,
click: this.setRouteCommand
},
{
title: '信号指示模式',
title: '信号指示模式',
operate: OperationEvent.Command.commandNingBo.line_signal_indicator,
click: this.setSignalModel
},
{
title: '封锁',
title: '封锁',
operate: OperationEvent.Command.commandNingBo.line_signal_block,
click: this.setSignalBlock
},
{
title: '解除封锁',
title: '解除封锁',
operate: OperationEvent.Command.commandNingBo.line_signal_unblock,
click: this.setSignalCancelBlock
},
{
title: '显示',
title: '显示',
operate: OperationEvent.Command.commandNingBo.line_signal_detail,
click: this.showSignalDetail
}
]
},
{
{
title: '轨道',
operate: '',
operate: OperationEvent.Command.commandNingBo.line_section,
children: [
{
title: '开放',
title: '开放',
operate: OperationEvent.Command.commandNingBo.line_section_open,
click: this.handleOpenSection
},
{
title: '关闭',
title: '关闭',
operate: OperationEvent.Command.commandNingBo.line_section_close,
click: this.handleCloseSection
},
{
title: '临时限速',
title: '临时限速',
operate: OperationEvent.Command.commandNingBo.line_section_limitSpeed,
click: this.handleLimitSpeed
},
{
title: '显示',
title: '显示',
operate: OperationEvent.Command.commandNingBo.line_section_detail,
click: this.handleSectionShow
}
]
},
},
{
title: '闭塞区段',
operate: '',
@ -1234,7 +1276,7 @@ export default {
return true;
},
initMenu(menu) {
const type = State2SimulationMap[this.$store.state.training.prdType];
const type = State2SimulationMap[this.$store.state.training.prdType];
this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode);
this.clickEvent();
this.closeMenu(true);
@ -1335,10 +1377,10 @@ export default {
EventBus.$emit('closeMenu');
});
},
handleArrangeRoute() {
handleArrangeRoute(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1348,10 +1390,10 @@ export default {
}
});
},
handleTrainDistributionRunLine() {
handleTrainDistributionRunLine(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1361,10 +1403,10 @@ export default {
}
});
},
handleTrainDistributionClass() {
handleTrainDistributionClass(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1374,10 +1416,10 @@ export default {
}
});
},
handleTrainDistributionBack() {
handleTrainDistributionBack(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1388,10 +1430,10 @@ export default {
});
},
// 站台开放/关闭
standOpenOrClose() {
standOpenOrClose(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1402,10 +1444,10 @@ export default {
});
},
// 站台扣车
setStandDetain() {
setStandDetain(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1415,10 +1457,10 @@ export default {
}
});
},
setIntervalStopNumber() {
setIntervalStopNumber(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1429,10 +1471,10 @@ export default {
});
},
// 停站时间
setAllocateTime() {
setAllocateTime(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1443,10 +1485,10 @@ export default {
});
},
// 控制权转移
authorizeTransfer() {
authorizeTransfer(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1456,10 +1498,10 @@ export default {
}
});
},
showStandDetail() {
showStandDetail(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1469,10 +1511,10 @@ export default {
}
});
},
setSwitchCommand() {
setSwitchCommand(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1483,10 +1525,10 @@ export default {
});
},
// 道岔封锁
setBlockSwitch() {
setBlockSwitch(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Switch.block.button.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1498,10 +1540,10 @@ export default {
});
},
// 道岔解除封锁
setUnblockSwitch() {
setUnblockSwitch(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Switch.unblock.button.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1512,10 +1554,10 @@ export default {
});
},
// 道岔授权
setSwitchActive() {
setSwitchActive(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) =>{
if (valid) {
@ -1526,10 +1568,10 @@ export default {
});
},
// 道岔显示详情
showSwitchDetail() {
showSwitchDetail(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1540,10 +1582,10 @@ export default {
});
},
// 信号引导
setSignalGuide() {
setSignalGuide(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1554,10 +1596,10 @@ export default {
}
});
},
setSignalCanBlock() {
setSignalCanBlock(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1569,10 +1611,10 @@ export default {
});
},
// 进路指令
setRouteCommand() {
setRouteCommand(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1582,10 +1624,10 @@ export default {
}
});
},
handleOpenSection() {
handleOpenSection(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Section.unlock.menu.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1595,10 +1637,10 @@ export default {
}
});
},
handleCloseSection() {
handleCloseSection(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Section.lock.menu.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1608,10 +1650,10 @@ export default {
}
});
},
handleLimitSpeed() {
handleLimitSpeed(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1621,10 +1663,10 @@ export default {
}
});
},
handleSectionShow() {
handleSectionShow(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1634,10 +1676,10 @@ export default {
}
});
},
handleLock() {
handleLock(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1647,10 +1689,10 @@ export default {
}
});
},
handleUnLock() {
handleUnLock(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1660,10 +1702,10 @@ export default {
}
});
},
handleRestoration() {
handleRestoration(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1673,10 +1715,10 @@ export default {
}
});
},
handleSectionRestoration() {
handleSectionRestoration(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1686,10 +1728,10 @@ export default {
}
});
},
setSignalModel() {
setSignalModel(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1699,10 +1741,10 @@ export default {
}
});
},
handleSectionStopShow() {
handleSectionStopShow(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1712,10 +1754,10 @@ export default {
}
});
},
setSignalBlock() {
setSignalBlock(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Signal.lock.menu.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1725,10 +1767,10 @@ export default {
}
});
},
setSignalCancelBlock() {
setSignalCancelBlock(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Signal.unlock.menu.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1738,10 +1780,10 @@ export default {
}
});
},
showSignalDetail() {
showSignalDetail(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1751,10 +1793,10 @@ export default {
}
});
},
setCbtcMode() {
setCbtcMode(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Command.mBar.cbtcMode.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1764,10 +1806,10 @@ export default {
}
});
},
setReserveMode() {
setReserveMode(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Command.mBar.reserveMode.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1777,10 +1819,10 @@ export default {
}
});
},
setSystemDetain() {
setSystemDetain(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1791,10 +1833,10 @@ export default {
}
});
},
setRunningInterval() {
setRunningInterval(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1804,10 +1846,10 @@ export default {
}
});
},
adjustStrategy() {
adjustStrategy(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1817,10 +1859,10 @@ export default {
}
});
},
setTrainDepart() {
setTrainDepart(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Train.setTrainDeparture.menu.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1830,10 +1872,10 @@ export default {
}
});
},
breakAway() {
breakAway(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Train.breakAwayPlan.menu.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1843,10 +1885,10 @@ export default {
}
});
},
setTrainReset() {
setTrainReset(item) {
const operate = {
type: 'bar',
operation: OperationEvent.Train.setTrainReset.menu.operation
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1856,10 +1898,10 @@ export default {
}
});
},
setJumpStop() {
setJumpStop(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1869,10 +1911,10 @@ export default {
}
});
},
cancelDeviation() {
cancelDeviation(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1882,10 +1924,10 @@ export default {
}
});
},
updateDeviation() {
updateDeviation(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1895,10 +1937,10 @@ export default {
}
});
},
cancelCbtcRoute() {
cancelCbtcRoute(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1908,10 +1950,10 @@ export default {
}
});
},
setIdAssociated() {
setIdAssociated(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1921,10 +1963,10 @@ export default {
}
});
},
setOccupancyCorrelation() {
setOccupancyCorrelation(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1934,10 +1976,10 @@ export default {
}
});
},
modifyTrainNumber() {
modifyTrainNumber(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1947,10 +1989,10 @@ export default {
}
});
},
setRunType() {
setRunType(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1960,10 +2002,10 @@ export default {
}
});
},
showTrainDetail() {
showTrainDetail(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
@ -1973,10 +2015,10 @@ export default {
}
});
},
showAllTrainDetail() {
showAllTrainDetail(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
@ -1986,10 +2028,10 @@ export default {
}
});
},
showRouteDetail() {
showRouteDetail(item) {
const operate = {
type: 'bar',
operation: ''
operation: item.operation
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {

90
src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue
View File

@ -1,48 +1,50 @@
<template>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="600px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row>
<el-table
ref="singleTable"
:data="filterSignalList"
highlight-current-row
height="350px"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="信号机" />
<el-table-column prop="status" label="信号机封锁状态">
<template slot-scope="scope">
<span>{{ getSignalStatus(scope.row.code) }}</span>
</template>
</el-table-column>
<el-table-column prop="blockProcess" label="设置封锁进程">
<template slot-scope="scope">
<span>{{ getProcess(scope.row.code, 'lock') }}</span>
</template>
</el-table-column>
<el-table-column prop="unblockProcess" label="解除封锁进程">
<template slot-scope="scope">
<span>{{ getProcess(scope.row.code, 'unlock') }}</span>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
<signal-block ref="signalBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" />
</el-dialog>
<div>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="600px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row>
<el-table
ref="singleTable"
:data="filterSignalList"
highlight-current-row
height="350px"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="信号机" />
<el-table-column prop="status" label="信号机封锁状态">
<template slot-scope="scope">
<span>{{ getSignalStatus(scope.row.code) }}</span>
</template>
</el-table-column>
<el-table-column prop="blockProcess" label="设置封锁进程">
<template slot-scope="scope">
<span>{{ getProcess(scope.row.code, 'lock') }}</span>
</template>
</el-table-column>
<el-table-column prop="unblockProcess" label="解除封锁进程">
<template slot-scope="scope">
<span>{{ getProcess(scope.row.code, 'unlock') }}</span>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog>
<signal-block ref="signalBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" />
</div>
</template>
<script>

82
src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
View File

@ -1,44 +1,46 @@
<template>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row>
<el-table
ref="singleTable"
:data="signalList"
highlight-current-row
height="300px"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="信号机" />
<el-table-column prop="blockStatus" label="允许锁闭">
<template slot-scope="scope">
<span>{{ getSignalBlock(scope.row.code) }}</span>
</template>
</el-table-column>
<el-table-column prop="blockProcess" label="同意取消">否</el-table-column>
<el-table-column prop="unblockProcess" label="取消进程">
<template slot-scope="scope">
<span>{{ getProcess(scope.row.code) }}</span>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
<signal-can-block ref="signalCanBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" />
</el-dialog>
<div>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row>
<el-table
ref="singleTable"
:data="signalList"
highlight-current-row
height="300px"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="信号机" />
<el-table-column prop="blockStatus" label="允许锁闭">
<template slot-scope="scope">
<span>{{ getSignalBlock(scope.row.code) }}</span>
</template>
</el-table-column>
<el-table-column prop="blockProcess" label="同意取消">否</el-table-column>
<el-table-column prop="unblockProcess" label="取消进程">
<template slot-scope="scope">
<span>{{ getProcess(scope.row.code) }}</span>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog>
<signal-can-block ref="signalCanBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" />
</div>
</template>
<script>

30
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
View File

@ -122,21 +122,21 @@ export default {
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose = false) {
// const operate = {
// cmdType: this.command ? CMD.Signal.CMD_SIGNAL_BLOCK : CMD.Signal.CMD_SIGNAL_UNBLOCK,
// operation: this.command ? OperationEvent.Signal.lock.confirm1.operation : OperationEvent.Signal.unlock.confirm1.operation,
// over: true,
// param: {signalCode: this.selected.code}
// };
// this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
// if (valid) {
// isClose && this.doClose();
// this.$emit('commandSuccess', this.selected.code);
// }
// }).catch(() => {
// isClose && this.doClose();
// this.$refs.noticeInfo.doShow();
// });
const operate = {
cmdType: this.command ? CMD.Signal.CMD_SIGNAL_BLOCK : CMD.Signal.CMD_SIGNAL_UNBLOCK,
operation: this.command ? OperationEvent.Signal.lock.confirm1.operation : OperationEvent.Signal.unlock.confirm1.operation,
over: true,
param: {signalCode: this.selected.code}
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code);
}
}).catch(() => {
isClose && this.doClose();
this.$refs.noticeInfo.doShow();
});
},
handleCurrentChange(val) {
this.$refs.singleTable.setCurrentRow(this.selected);

21
src/jmapNew/theme/ningbo_03/menus/menuSection.vue
View File

@ -8,6 +8,7 @@
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
<set-fault ref="setFault" pop-class="ningbo-01__systerm" />
<train-add-plan ref="trainAddPlan" pop-class="ningbo-01__systerm" />
<load-spare-train ref="loadSpareTrain" pop-class="foshan-01__systerm" />
</div>
</template>
@ -25,6 +26,8 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
export default {
name: 'SectionMenu',
@ -36,7 +39,8 @@ export default {
AlxeEffective,
NoticeInfo,
TrainAddPlan,
SetFault
SetFault,
LoadSpareTrain
},
props: {
selected: {
@ -110,6 +114,11 @@ export default {
label: this.$t('menu.menuSection.cancelFault'),
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '设置备用车',
handler: this.loadSpare,
cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
}
]
};
@ -268,7 +277,15 @@ export default {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
}
});
}
},
// 新建备用车
loadSpare() {
commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
if (valid) {
this.$refs.loadSpareTrain.doShow(operate, this.selected);
}
});
}
}
};
</script>

1652
src/jmapNew/theme/ningbo_03/operationConfig.js
View File

File diff suppressed because it is too large Load Diff

2
src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue
View File

@ -390,7 +390,7 @@ export default {
} else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
/** 道岔计轴复位*/
operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
operate.cmdType = CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET;
}
this.setMessage('');
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });

2
src/jmapNew/theme/xian_01/menus/menuSwitch.vue
View File

@ -81,7 +81,7 @@ export default {
{
label: '计轴预复位',
handler: this.axlePreReset,
cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
cmdType:CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET
},
{
label: '区段切除',

2
src/jmapNew/theme/xian_01/operationConfig.js
View File

@ -545,7 +545,7 @@ export default {
{
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Axis_Pre_Reset',
operateType: 'Switch_Axle_Pre_Reset',
skinCode: '02',
trainingName: '道岔区段计轴预复位({7})',
trainingRemark: '道岔区段计轴预复位功能',

6
src/jmapNew/theme/xian_02/menus/menuStation.vue
View File

@ -363,7 +363,7 @@ export default {
},
setStationControl() {
// 请求站控
commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.selected.code]}, 0).then(({valid, operate})=>{
commitOperate(menuOperate.StationControl.requestStationControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/pushRequestList', {
@ -377,7 +377,7 @@ export default {
},
setCenterControl() {
// 请求中控
commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.selected.code]}, 0).then(({valid, operate})=>{
commitOperate(menuOperate.StationControl.requestCentralControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/pushRequestList', {
@ -391,7 +391,7 @@ export default {
},
setEmergencyControl() {
// 紧急站控
commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.selected.code]}, 0).then(({valid, operate})=>{
commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/pushRequestList', {

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

@ -17,7 +17,7 @@ export default {
/** 取消临时限速 */
CMD_SWITCH_CANCEL_LIMIT_SPEED: {value:'Switch_Cancel_Limit_Speed', label: '取消临时限速'},
/** 计轴预复位 */
CMD_SWITCH_AXIS_PRE_RESET: {value:'Switch_Axis_Pre_Reset', label: '计轴预复位'},
CMD_SWITCH_AXLE_PRE_RESET: {value:'Switch_Axle_Pre_Reset', label: '计轴预复位'},
/** 故障解锁 */
CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
/** 强解道岔*/

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

@ -39,7 +39,8 @@ export const deviceFaultType = {
{label: '失表', value: 'SPLIT'},
{label: '定位失表', value: 'NORMAL_SPLIT'},
{label: '反位失表', value: 'REVERSE_SPLIT'},
{label: '挤岔', value: 'SQUEEZE'}
{label: '挤岔', value: 'SQUEEZE'},
{label: '计轴故障', value: 'AXLE_FAULT'}
// {label: '道岔区段计轴故障', value: 'AXLE_FAULT'}
],
StationStand: [

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

@ -234,7 +234,8 @@ export const OperationEvent = {
operation: '0082',
domId: '_Tips-commandHaerbin-confirmCr2{BOTTOM}'
}
},
},
// 西安
commandXian: {
confirm: {
operation: '009',
@ -248,7 +249,145 @@ export const OperationEvent = {
operation: '0092',
domId: '_Tips-commandXian-requestBar{TOP}'
}
}
},
// 宁波三
commandNingBo: {
//线路
line: {
operation: '00a',
domId: '_Tips-ningBo-line{TOP}'
},
//站台
line_stand: {
operation: '00a0',
domId: '_Tips-ningBo-line-stand{TOP}'
},
//开放或关闭
line_stand_openOrClose: {
operation: '00a01',
domId: '_Tips-ningBo-line-stand-openOrClose{TOP}'
},
//设置或取消扣车
line_stand_holdOrNot: {
operation: '00a02',
domId: '_Tips-ningBo-line_stand_holdOrNote{TOP}'
},
//设置站间列车数量
line_stand_trainNum: {
operation: '00a03',
domId: '_Tips-ningBo-line_stand_trainNum{TOP}'
},
//设置站间停站时间
line_stand_stopTime: {
operation: '00a04',
domId: '_Tips-ningBo-line_stand_stopTime{TOP}'
},
//授权转移
line_stand_transfer: {
operation: '00a05',
domId: '_Tips-ningBo-line_stand_transfer{TOP}'
},
//显示
line_stand_detail: {
operation: '00a06',
domId: '_Tips-ningBo-line_stand_detail{TOP}'
},
//道岔
line_switch: {
operation: '00a1',
domId: '_Tips-ningBo-line-switch{TOP}'
},
//命令
line_switch_cmd: {
operation: '00a11',
domId: '_Tips-ningBo-line-switch-cmd{TOP}'
},
//封锁
line_switch_block: {
operation: '00a12',
domId: '_Tips-ningBo-line-switch-block{TOP}'
},
//解除封锁
line_switch_unblock: {
operation: '00a13',
domId: '_Tips-ningBo-line-switch-unblock{TOP}'
},
//请求动岔/请求/授权
line_switch_empower: {
operation: '00a14',
domId: '_Tips-ningBo-line-switch-empower{TOP}'
},
//显示
line_switch_detail: {
operation: '00a15',
domId: '_Tips-ningBo-line-switch-detail{TOP}'
},
//信号机
line_signal: {
operation: '00a2',
domId: '_Tips-ningBo-line-signal{TOP}'
},
//引导
line_signal_guide: {
operation: '00a21',
domId: '_Tips-ningBo-line-signal-guide{TOP}'
},
//取消允许锁闭
line_signal_lockOrNot: {
operation: '00a22',
domId: '_Tips-ningBo-line-signal-lockOrNot{TOP}'
},
//进路
line_signal_cmd: {
operation: '00a23',
domId: '_Tips-ningBo-line-signal-cmd{TOP}'
},
//信号指示模式
line_signal_indicator: {
operation: '00a24',
domId: '_Tips-ningBo-line-signal-indicator{TOP}'
},
//封锁
line_signal_block: {
operation: '00a25',
domId: '_Tips-ningBo-line-signal-block{TOP}'
},
//解封
line_signal_unblock: {
operation: '00a26',
domId: '_Tips-ningBo-line-signal-unblock{TOP}'
},
//显示
line_signal_detail: {
operation: '00a27',
domId: '_Tips-ningBo-line-signal-detail{TOP}'
},
//轨道
line_section: {
operation: '00a3',
domId: '_Tips-ningBo-line-section{TOP}'
},
//开放
line_section_open: {
operation: '00a31',
domId: '_Tips-ningBo-line-section-open{TOP}'
},
//关闭
line_section_close: {
operation: '00a32',
domId: '_Tips-ningBo-line-section-close{TOP}'
},
//临时限速
line_section_limitSpeed: {
operation: '00a33',
domId: '_Tips-ningBo-line-section-limitSpeed{TOP}'
},
//显示
line_section_detail: {
operation: '00a34',
domId: '_Tips-ningBo-line-section-detail{TOP}'
}
}
},
// 站台概要表
StandTable: {
@ -2597,6 +2736,8 @@ export const OperationEvent = {
};
console.log(OperationEvent);
import { MapDeviceType } from './Config.js';
class OperationHandler {

4
src/utils/baseUrl.js
View File

@ -2,10 +2,10 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://api.joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.8.107:9000'; // 袁琪
// BASE_API = 'http://192.168.8.129:9000'; // 旭强
// BASE_API = 'http://192.168.8.119:9000'; // 张赛
BASE_API = 'http://192.168.8.119:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康