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 
# Conflicts:
#	src/jmapNew/shape/Station/index.js
This commit is contained in:
joylink_cuiweidong 2021-02-23 16:39:48 +08:00
commit 6bcdc9993d
37 changed files with 431 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/jmap/map.js
View File

@ -264,3 +264,10 @@ export function getSectionListByStationCode(id, stationCode) {
method: 'get'
});
}
/** 查询地图下所有的区段 */
export function getSectionListByMapId(id) {
return request({
url: `/api/map/${id}/sections`,
method: 'get'
});
}

4
src/api/simulation.js
View File

@ -221,9 +221,9 @@ export function executeScriptNew(group) {
}
/** 处理ibp盘事件 */
export function handlerIbpEvent(group, button, stationCode) {
export function handlerIbpEvent(group, button, stationCode, buttonCode) {
return request({
url: `/simulation/${group}/ibp/${button}?stationCode=${stationCode}`,
url: `/simulation/${group}/ibp/${button}?stationCode=${stationCode}&buttonCode=${buttonCode}`,
method: 'put'
});
}

6
src/jmapNew/shape/Station/index.js
View File

@ -495,6 +495,7 @@ export default class Station extends Group {
this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.text.fontColor);
this.interconnectedControl && this.interconnectedControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.interconnectedControl && this.interconnectedControl.setTextColor(this.style.Station.StationControl.text.fontColor);
this.controlPreReset && this.controlPreReset.setColor(this.style.Station.StationControl.lamp.grayColor);
this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
@ -524,6 +525,7 @@ export default class Station extends Group {
// //
// }
// console.log(model.controller, model.centralized, '5555555555555');
model.preResetValidDuration && this.handlePreResetLamp();
model.controller && this.handleComplexControl(model.controller);
if (this.style.Station.syncCentralizeStation && (model.controlMode || model.controller) && model.centralized) {
model.chargeStationCodeList.forEach(item => {
@ -547,7 +549,9 @@ export default class Station extends Group {
});
}
}
handlePreResetLamp() {
this.controlPreReset && this.controlPreReset.setColor('#f00');
}
handleComplexControl(controller) {
// const controller = model.controller;
const memberData = store.state.training.memberData;

56
src/jmapNew/shape/StationTurnBack/index.js
View File

@ -13,11 +13,11 @@ export default class StationTurnBack extends Group {
this.zlevel = model.zlevel;
this.z = 40;
this.model = model;
this.style = style;
this.lineCode = lineCode;
this.style = style;
this.lineCode = lineCode;
this.isShowShape = true;
this.create();
this.createMouseEvent();
this.createMouseEvent();
this.setState(model);
this.setShowMode();
}
@ -75,7 +75,7 @@ export default class StationTurnBack extends Group {
textVerticalAlign: 'bottom'
}
});
this.add(this.text);
this.add(this.text);
}
let turnName = '按计划执行';
if (this.lineCode == '03') {
@ -114,11 +114,11 @@ export default class StationTurnBack extends Group {
}
}
createMouseEvent() {
createMouseEvent() {
if (this.style.LcControl.mouseOverStyle) {
this.mouseEvent = new EMouse(this);
this.mouseEvent = new EMouse(this);
this.add(this.mouseEvent);
this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
}
}
@ -158,28 +158,28 @@ export default class StationTurnBack extends Group {
}
}
setAshShow() {
this.control && this.control.setStyle({fill:'#FFF'});
}
setAshShow() {
this.control && this.control.setStyle({fill:'#FFF'});
}
// 设置状态
setState(model, tbStrategyId = null) {
if (!this.isShowShape) return;
this.recover();
this.recover();
// 只响应前端自定义类型的状态变化
if (model._free) {
this.setAshShow()
} else {
if (tbStrategyId) {
model.tbStrategyId = tbStrategyId;
model.optionList.forEach(item => {
if (item.id == tbStrategyId) {
this.handleStatus(item.label);
}
});
}
}
// 只响应前端自定义类型的状态变化
if (model._free) {
this.setAshShow();
} else {
if (tbStrategyId) {
model.tbStrategyId = tbStrategyId;
model.optionList.forEach(item => {
if (item.id == tbStrategyId) {
this.handleStatus(item.label);
}
});
}
}
}
getShapeTipPoint() {
const rect = this.control.getBoundingRect();
@ -213,7 +213,11 @@ export default class StationTurnBack extends Group {
return this.model.position;
}
getBoundingRect() {
return this.strategyText.getBoundingRect()||this.control.getBoundingRect();
getBoundingRect() {
if (this.strategyText && this.strategyText.getBoundingRect()) {
return this.strategyText.getBoundingRect();
} else if (this.control && this.control.getBoundingRect()) {
return this.control.getBoundingRect();
}
}
}

8
src/jmapNew/theme/chengdu_03/operationConfig.js
View File

@ -138,7 +138,6 @@ export default {
{ deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
]
},
/** 暂不生成实训 */
{
maxDuration: 15,
minDuration: 8,
@ -152,10 +151,9 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【办理引导进路】' },
{ deviceType: '04', orderNum: 2, operateCode: '308', tip: '输入密码123，点击【确定】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '3086', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
{ deviceType: '04', orderNum: 4, operateCode: '3082', tip: '鼠标左键点击【确认】按钮' }
{ deviceType: '04', orderNum: 4, operateCode: '3082', tip: '鼠标左键点击【执行】按钮' }
]
},
/** 暂不生成实训 */
{
maxDuration: 15,
minDuration: 8,
@ -212,7 +210,7 @@ export default {
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【总人解】' },
{ deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮', val: '{6}' },
{ deviceType: '04', orderNum: 3, operateCode: '3051', tip: '输入密码123456，点击【确定】按钮' }
{ deviceType: '04', orderNum: 3, operateCode: '3051', tip: '输入密码123，点击【执行】按钮' }
]
},
{ // 不生成实训
@ -226,7 +224,7 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' },
{ deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' },
{ deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '3050', tip: '鼠标左键点击【{5}】', val: '{6}' }
]
},

2
src/jmapNew/theme/factory.js
View File

@ -32,7 +32,7 @@ class Theme {
'11': 'all',
'12': 'all',
'13':'all',
'14':'all'
'14':'ecStation'
};
}

6
src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue
View File

@ -58,7 +58,11 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.cancelGuide.menu.domId : '';
if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) {
return OperationEvent.Signal.cancelGuide.menu.domId
} else if (this.operate == OperationEvent.Signal.guide.menu.operation) {
return OperationEvent.Signal.guide.menu.domId
}
},
title() {
if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) {

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

@ -715,7 +715,7 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
]
},
{ // 暂不生成实训
{
maxDuration: 8,
minDuration: 5,
operateType:CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value,

3
src/jmapNew/theme/haerbin_01/model.js
View File

@ -33,7 +33,8 @@ class Model {
this['private'][deviceType.Signal] = {
nameShow: true, // 信号机名称显示
linkageAutoRouteShow: true, // 联锁自动进路表示灯显示
atsAutoTriggerShow: true // ATS自动触发表示灯显示
atsAutoTriggerShow: true, // ATS自动触发表示灯显示
aliasCodes: [] // 信号机别名列表
};
this['private'][deviceType.Train] = {
};

8
src/jmapNew/theme/haerbin_01/operationConfig.js
View File

@ -783,7 +783,9 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL'},
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
{ deviceType: '04', orderNum: 3, operateCode: '3087', tip: '鼠标左键点击【引导进路】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -815,7 +817,9 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL'},
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
{ deviceType: '04', orderNum: 3, operateCode: '3087', tip: '鼠标左键点击【引导进路】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{

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

@ -1100,7 +1100,7 @@ export default {
{ name: '追踪单开', commandTip: '设置单架信号机处于联锁自动排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch }, // || stationControl.ciControl
{ name: '追踪单关', commandTip: '取消单架信号机处于联锁自动排列进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch }, // || !stationControl.ciControl
{ name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
{ name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
{ name: '车队单开', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },

14
src/jmapNew/theme/nanjing_02/operationConfig.js
View File

@ -658,16 +658,18 @@ export default {
minDuration: 8,
operateType: 'Signal_Set_Guide',
skinCode: '07',
trainingName: '开放引导({3})',
trainingName: '开放引导({5})',
trainingRemark: '开放引导功能',
trainingType: 'Signal',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL'},
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
{ deviceType: '04', orderNum: 3, operateCode: '3087', tip: '鼠标左键点击【开放引导】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3087', tip: '鼠标左键点击【开放引导】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
],
config: {onlySignalOP:true}
},
{
maxDuration: 15,

4
src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue
View File

@ -47,7 +47,7 @@ export default {
},
computed: {
confirmId() {
return this.operation.domId;
return OperationEvent.Command.close.password.domId;
}
},
methods: {
@ -67,7 +67,7 @@ export default {
if ( this.password !== 'root' ) {
this.messageShow = true;
} else {
commitOperate({operation: this.operation}, {}, 1).then(({valid, operate}) => {
commitOperate({operation: OperationEvent.Command.close.password.operation}, {}, 1, this.password).then(({valid, operate}) => {
if (valid && this.operation === OperationEvent.StationLight.SetOrCancelForceLight.password.operation) {
this.show = false;
this.$emit('confirm');

6
src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
View File

@ -62,7 +62,11 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.humanTrainRoute.menu.domId : '';
return this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation
? OperationEvent.Signal.humanTrainRoute.menu.domId
: this.operate == OperationEvent.Signal.guide.confirm.operation
? OperationEvent.Signal.guide.menu.domId
: ''
},
title() {
if (this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation) {

8
src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
View File

@ -87,10 +87,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
const memberData = this.$store.state.training.memberData;
@ -101,6 +97,10 @@ export default {
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
},
doShow(point) {
this.clickEvent();

8
src/jmapNew/theme/ningbo_01/menus/menuSection.vue
View File

@ -184,10 +184,6 @@ export default {
} else {
this.menu = [];
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
this.menu = this.menuForce;
}
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
const memberData = this.$store.state.training.memberData;
@ -198,6 +194,10 @@ export default {
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
this.menu = this.menuForce;
}
},
doShow(point) {
this.clickEvent();

8
src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
View File

@ -231,10 +231,6 @@ export default {
},
initMenu() {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
const memberData = this.$store.state.training.memberData;
@ -245,6 +241,10 @@ export default {
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
},
executeConfirm(operate) {
if (operate.operation === OperationEvent.Signal.unlock.confirm.operation) {

8
src/jmapNew/theme/ningbo_01/menus/menuStation.vue
View File

@ -131,10 +131,6 @@ export default {
initMenu() {
if (this.selected.centralized) {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const memberData = this.$store.state.training.memberData;
const userId = this.$store.state.user.id;
@ -144,6 +140,10 @@ export default {
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
}
},
doShow(point) {

8
src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
View File

@ -78,10 +78,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const memberData = this.$store.state.training.memberData;
const userId = this.$store.state.user.id;
@ -92,6 +88,10 @@ export default {
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
},
doShow(point) {
this.clickEvent();

8
src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
View File

@ -82,10 +82,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
this.getCurrentStateObject();
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const memberData = this.$store.state.training.memberData;
@ -96,6 +92,10 @@ export default {
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
},
doShow(point) {
this.clickEvent();

9
src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
View File

@ -185,11 +185,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
const memberData = this.$store.state.training.memberData;
@ -200,6 +195,10 @@ export default {
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
},
doShow(point) {
this.clickEvent();

9
src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
View File

@ -80,11 +80,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
const memberData = this.$store.state.training.memberData;
@ -95,6 +90,10 @@ export default {
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
},
doShow(point) {
this.clickEvent();

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

@ -186,6 +186,16 @@ export default {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
const memberData = this.$store.state.training.memberData;
const userId = this.$store.state.user.id;
if (!station.controller || !memberData[station.controller] || memberData[station.controller].userId != userId) {
this.menu.forEach(item => {
item.disabled = true;
});
}
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
// if (!this.$store.state.scriptRecord.bgSet) {
@ -198,16 +208,6 @@ export default {
// this.menu = this.menuForce;
// }
}
if (this.$store.state.training.mode === TrainingMode.NORMAL) {
const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
const memberData = this.$store.state.training.memberData;
const userId = this.$store.state.user.id;
if (!station.controller || !memberData[station.controller] || memberData[station.controller].userId != userId) {
this.menu.forEach(item => {
item.disabled = true;
});
}
}
},
doShow(point) {
this.clickEvent();

6
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -721,8 +721,10 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导】' },
{ deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' }
]
{ deviceType: '04', orderNum: 2, operateCode: '0011', tip: '请输入密码"root",点击【确认】按钮', val: 'root' },
{ deviceType: '04', orderNum: 3, operateCode: '308', tip: '鼠标左键点击【确定】按钮' },
],
config: {onlySignalOP:true}
},
{
maxDuration: 15,

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

@ -292,7 +292,7 @@ export default {
// },
{
title: '列车(T)',
operate: OperationEvent.Command.mBar.check,
operate: OperationEvent.Command.mBar.train,
children: [
{
title: '排列进路',
@ -328,7 +328,7 @@ export default {
},
{
title: '操作',
operate: '',
operate: OperationEvent.Command.commandNingBo3.train_operate,
children: [
{
title: '发车',
@ -344,6 +344,7 @@ export default {
},
{
title: '跳停',
operate: OperationEvent.Command.commandNingBo3.train_operate_jump,
click: this.setJumpStop
},
{

33
src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalGuide.vue
View File

@ -7,6 +7,7 @@
:data="signalList"
highlight-current-row
height="300px"
:id="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="信号机" />
@ -33,7 +34,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !selected.callOn" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !selected.callOn" @click="commit(false)">应用(A)</el-button>
<el-button :id="domIdApply" type="primary" :loading="loading" :disabled="!selected || !selected.callOn" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@ -83,15 +84,18 @@ export default {
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
title() {
return '初始化引导';
}
@ -154,9 +158,9 @@ export default {
},
commit(isClose = false) {
const step = {
code: `${this.selected.code}`,
operation: OperationEvent.Signal.guide.confirm.operation,
param: {}
operation: isClose
? OperationEvent.Command.common.confirm.operation
: OperationEvent.Command.common.apply.operation,
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
@ -176,8 +180,11 @@ export default {
this.commandEleCode = null;
const step = {
code: `${val.code}`,
operation: OperationEvent.Signal.guide.choose.operation,
param: {}
operation: OperationEvent.Command.common.choose.operation,
val: val.code,
param: {
signalCode: val.code
}
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
@ -196,7 +203,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

27
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
View File

@ -41,7 +41,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
<el-button :id="domIdApply" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@ -87,15 +87,18 @@ export default {
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
},
title() {
return '确认/取消引导';
}
@ -125,8 +128,12 @@ export default {
},
commit(isClose = false) {
const operate = {
cmdType: this.command ? CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE : CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE,
operation: this.command ? OperationEvent.Signal.guide.confirm1.operation : OperationEvent.Signal.cancelGuide.confirm1.operation,
cmdType: this.command
? CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE,
operation: this.command
? OperationEvent.Command.common.confirm1.operation
: OperationEvent.Command.common.apply1.operation,
over: true,
param: {signalCode: this.selected.code}
};
@ -175,7 +182,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close1.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

156
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
View File

@ -2,26 +2,30 @@
<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-col :span="20">
<el-tabs type="border-card">
<el-tab-pane label="运行线">
<el-table :data="trainList" height="300px">
<el-tabs type="border-card" v-model="activeName" :id="domIdChoose" @change="handleChangeTab">
<el-tab-pane label="运行线" name="first">
<el-table ref="table0" :data="trainList" height="300px" highlight-current-row :id="domIdChoose1" @current-change="handleRunLineChange">
<el-table-column prop="interval" label="运行线" />
</el-table>
</el-tab-pane>
<el-tab-pane label="列车">
<el-tab-pane label="列车" name="second">
<el-row>
<el-col :span="14">
<el-table :data="trainList" height="300px">
<el-col :span="12">
<el-table ref="table1" :data="trainList" height="300px" highlight-current-row :id="domIdSelect1" @current-change="handleTrainChange">
<el-table-column prop="code" label="列车" />
<el-table-column prop="interval" label="运行线" />
</el-table>
</el-col>
<el-col :span="10" style="padding-left: 5px;">
<el-table :data="stationStandList" height="260px">
<el-col :span="12" style="padding-left: 5px;">
<el-table ref="table2" :data="stationStandList" height="260px" highlight-current-row :id="domIdSelect2" @current-change="handleStandChange">
<el-table-column prop="name" label="站台" />
<el-table-column prop="jump" label="跳停" />
<el-table-column prop="jump" :width="60" label="跳停" >
<template slot-scope="scope">
<span>{{ getStandStatus(scope.row.code) }}</span>
</template>
</el-table-column>
</el-table>
<el-checkbox v-model="allCheck" style="margin-top: 10px;">所有站台</el-checkbox>
<el-checkbox v-model="allCheck" :id="domIdSelect" style="margin-top: 10px;" @change="handleAllStandChange">所有站台</el-checkbox>
</el-col>
</el-row>
</el-tab-pane>
@ -30,18 +34,18 @@
<el-col :span="4" style="padding-left: 5px;">
<div class="set-status-title">跳停</div>
<div class="set-status-box">
<el-radio v-model="command" :disabled="true" :label="true">设置(S)</el-radio>
<el-radio v-model="status" :disabled="!allCheck &&!status" :label="true">设置(S)</el-radio>
<br>
<el-radio v-model="command" :label="false">清除(R)</el-radio>
<el-radio v-model="status" :disabled="!allCheck && status" :label="false">清除(R)</el-radio>
</div>
</el-col>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>应用(A)</el-button>
<el-button :id="domIdApply" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@ -57,7 +61,7 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
export default {
@ -68,11 +72,9 @@ export default {
data() {
return {
status: false,
command: true,
allChecked: false,
dialogShow: false,
loading: false,
activeName: 'first',
activeName: 'second',
operate: {},
allCheck: false
};
@ -88,15 +90,33 @@ export default {
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdChoose1() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
},
// domIdChoose2() {
// return this.dialogShow ? OperationEvent.Command.common.choose2.domId : ''
// },
domIdSelect() {
return this.dialogShow ? OperationEvent.Command.common.select.domId : ''
},
domIdSelect1() {
return this.dialogShow ? OperationEvent.Command.common.select1.domId : ''
},
domIdSelect2() {
return this.dialogShow ? OperationEvent.Command.common.select2.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
title() {
return '设置/清除站台跳停';
}
@ -106,30 +126,112 @@ export default {
if (this.show) {
this.commit();
}
}
},
'selected': function(val) {
if (val) {
const stand = this.$store.getters['map/getDeviceByCode'](val.code);
this.status = stand && stand.assignSkip? false: true;
}
}
},
methods: {
getStandStatus(code) {
const standEle = this.$store.getters['map/getDeviceByCode'](code);
if (standEle.assignSkip) {
return '是';
} else {
return '否';
}
},
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table0 && this.$refs.table0.setCurrentRow();
this.$refs.table1 && this.$refs.table1.setCurrentRow();
this.$refs.table2 && this.$refs.table2.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$refs.table0 && this.$refs.table0.setCurrentRow();
this.$refs.table1 && this.$refs.table1.setCurrentRow();
this.$refs.table2 && this.$refs.table2.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
commit() {
handleChangeTab(val) {
},
handleRunLineChange(val) {
},
handleTrainChange(val) {
if (!val) { return; }
const step = {
operation: OperationEvent.Command.common.select.operation,
val: val.code,
param: {
trainGroupNumber: val.code
}
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
handleStandChange(val) {
if (!val) { return; }
const step = {
code: val.code,
operation: OperationEvent.Command.common.select1.operation,
val: val.code,
param: {
standCode: val.code
}
};
this.allCheck = false;
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
handleClick() {
handleAllStandChange(val) {
this.$refs.table2 && this.$refs.table2.setCurrentRow();
},
commit(isClose=false) {
const step = {
over: true,
cmdType:this.status
? this.allCheck? CMD.Stand.CMD_STAND_ALL_SET_JUMP_STOP: CMD.Stand.CMD_STAND_SET_JUMP_STOP
: this.allCheck? CMD.Stand.CMD_STAND_ALL_CANCEL_JUMP_STOP: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
operation: isClose? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
param: this.allCheck
? { standCodes: this.stationStandList.map(el => el.code ) }
: { standCode: this.selected.code }
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
isClose && this.doClose();
}
}).catch((error) => {
console.log(error);
isClose && this.doClose();
this.$refs.noticeInfo.doShow();
});
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -38,7 +38,43 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
list: [
{
// {
// maxDuration: 8,
// minDuration: 5,
// operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
// skinCode: '12',
// trainingName: '跳停({10}-{12} 站台)',
// trainingRemark: '设置跳停功能',
// trainingType: 'Stand',
// productTypes: ['01', '02'],
// stepVOList: [
// { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
// { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
// { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
// { deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
// { deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
// { deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
// ]
// },
// {
// maxDuration: 8,
// minDuration: 5,
// operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
// skinCode: '12',
// trainingName: '取消跳停({10}-{12} 站台)',
// trainingRemark: '设置取消跳停功能',
// trainingType: 'Stand',
// productTypes: ['01', '02'],
// stepVOList: [
// { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
// { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
// { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
// { deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
// { deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
// { deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
// ]
// },
{
maxDuration: 8,
minDuration: 5,
operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
@ -48,10 +84,11 @@ export default {
trainingType: 'Stand',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.train.operation, tip: '鼠标左键选择【列车】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.train_operate.operation, tip: '鼠标左键选择【操作】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.train_operate_jump.operation, tip: '鼠标左键选择【跳停】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select1.operation, tip: '请选择列车【{29}】', val: '{30}' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select2.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
@ -66,10 +103,11 @@ export default {
trainingType: 'Stand',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.train.operation, tip: '鼠标左键选择【列车】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.train_operate.operation, tip: '鼠标左键选择【操作】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.train_operate_jump.operation, tip: '鼠标左键选择【跳停】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select1.operation, tip: '请选择列车【{29}】', val: '{30}' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select2.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
@ -272,7 +310,8 @@ export default {
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择信号机【{5}】', codeType:'SIGNAL', val: '{6}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
],
config: {onlySignalOP:true}
},
{
maxDuration: 15,

3
src/jmapNew/theme/xian_02/operationConfig.js
View File

@ -396,7 +396,8 @@ export default {
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导信号】' },
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
]
],
config: {onlySignalOP:true}
},
{
maxDuration: 15,

10
src/jmapNew/utils/parser.js
View File

@ -282,6 +282,16 @@ export function parser(data, skinCode, showConfig) {
zrUtil.each(data.overlapList || [], elem => {
mapDevice[elem.code] = createDevice(deviceType.OverAp, elem, propConvert, showConfig);
});
// 二次处理
// zrUtil.each(data.stationStandList || [], elem => {
// const device = mapDevice[elem.code];
// if (device.aliasCodes) {
// // 信号机别名列表
// device
// }
// mapDevice[elem.code] = createDevice(deviceType.StationStand, elem, propConvert, showConfig);
// }, this);
}
return mapDevice;

3
src/scripts/ConstDic.js
View File

@ -119,7 +119,8 @@ export const IbpOperation = {
XXKM: {operate: '08', event: 'XXKM', name: '下行屏蔽门开门'},
SXKM: {operate: '10', event: 'SXKM', name: '上行屏蔽门开门'},
XXYS: {operate: '09', event: 'XXYS', name: '下行钥匙'},
SXYS: {operate: '11', event: 'SXYS', name: '上行钥匙'}
SXYS: {operate: '11', event: 'SXYS', name: '上行钥匙'},
PRERESET: {operate: '12', event: 'PRERESET', name: '计轴复位'}
};
/**

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

@ -157,6 +157,10 @@ export default {
CMD_STAND_SET_JUMP_STOP: {value:'Stand_Set_Jump_Stop', label: '设置跳停'},
/** 取消跳停 */
CMD_STAND_CANCEL_JUMP_STOP: {value:'Stand_Cancel_Jump_Stop', label: '取消跳停'},
/** 全站台设置跳停 */
CMD_STAND_ALL_SET_JUMP_STOP: {value:'Stand_All_Set_Jump_Stop', label: '全站台设置跳停'},
/** 全站台取消跳停 */
CMD_STAND_ALL_CANCEL_JUMP_STOP: {value:'Stand_All_Cancel_Jump_Stop', label: '全站台取消跳停'},
/** 设置扣车 */
CMD_STAND_SET_HOLD_TRAIN: {value:'Stand_Set_Hold_Train', label: '设置扣车'},
/** 取消扣车 */

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

@ -481,7 +481,22 @@ export const OperationEvent = {
line_user_reclaim: {
operation: '00a44',
domId: '_Tips-ningBo-line-user-reclaim{TOP}'
}
},
// 列车
train: {
operation: '00b',
domId: '_Tips-ningBo-train{TOP}'
},
// 列车-操作
train_operate: {
operation: '00b0',
domId: '_Tips-ningBo-train-operate{TOP}'
},
// 列车-操作-跳停
train_operate_jump: {
operation: '00b01',
domId: '_Tips-ningBo-train-operate-jump{TOP}'
},
}
},
// 站台概要表

49
src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue
View File

@ -34,6 +34,16 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="form.mean === 'PRERESET'" label="关联区段">
<el-select v-model="form.sectionCode" placeholder="请选择">
<el-option
v-for="item in sectionList"
:key="item.code"
:label="item.name + '(' + item.code +')'"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
<el-button v-show="showDeleteButton" type="danger" @click="deleteDevice">{{ $t('global.delete') }}</el-button>
@ -44,6 +54,7 @@
</template>
<script>
import {getSectionListByStationCode, getSectionListByMapId } from '@/api/jmap/map';
export default {
name: 'ButtonDraft',
components: {
@ -62,14 +73,17 @@ export default {
{ label: '取消紧急停车', value: 'QXJJTC' },
{ label: '报警切除', value: 'BJQC' },
{ label: '下行屏蔽门开门', value: 'XXKM' },
{ label: '上行屏蔽门开门', value: 'SXKM' }
{ label: '上行屏蔽门开门', value: 'SXKM' },
{ label: '计轴复位', value: 'PRERESET' }
],
form: {
code: '',
buttonColor: 'red',
buttonWidth: 25,
x: 10,
y: 10
y: 10,
sectionCode: '',
mean: ''
},
rules: {
code: [
@ -81,7 +95,8 @@ export default {
buttonWidth: [
{ required: true, message: this.$t('ibp.enterTheButtonWidth'), trigger: 'blur' }
]
}
},
sectionList: []
};
},
computed: {
@ -100,12 +115,31 @@ export default {
this.form.x = model.point.x;
this.form.y = model.point.y;
this.form.mean = model.mean;
this.form.sectionCode = model.sectionCode;
}
}
},
mounted() {
if (this.$route.query.stationCode) {
getSectionListByStationCode(this.$route.query.mapId, this.$route.query.stationCode).then(resp => {
this.sectionList = resp.data;
console.log(resp.data);
}).catch(() => {
this.$message.error('获取区段列表失败！');
});
} else {
getSectionListByMapId(this.$route.query.mapId).then(resp => {
this.sectionList = resp.data;
console.log(resp.data);
}).catch(() => {
this.$message.error('获取区段列表失败！');
});
}
},
methods: {
// consoleChange() {
// console.log(this.form.mean === 'PRERESET', this.form.mean );
// },
onSubmit(form) {
this.$refs[form].validate((valid) => {
if (valid) {
@ -119,7 +153,8 @@ export default {
color: this.form.buttonColor,
status: 'off',
width: this.form.buttonWidth,
mean: this.form.mean
mean: this.form.mean,
sectionCode: this.form.sectionCode
};
this.$emit('createData', buttonModel);
this.initPage();
@ -139,7 +174,8 @@ export default {
color: this.form.buttonColor,
status: 'off',
width: this.form.buttonWidth,
mean: this.form.mean
mean: this.form.mean,
sectionCode: this.form.sectionCode
};
this.$emit('deleteDataModel', buttonModel );
this.initPage();
@ -154,7 +190,8 @@ export default {
buttonWidth: 25,
x: 10,
y: 10,
mean: ''
mean: '',
sectionCode: ''
};
},
generateCode() {

10
src/views/ibp/ibpsystem/index.vue
View File

@ -229,10 +229,12 @@ export default {
},
onMouseDown(em) {
if (em.deviceModel.mean) {
if (IbpOperation[em.deviceModel.mean]) {
handlerIbpEvent(this.$route.query.group, IbpOperation[em.deviceModel.mean].event, this.stationCode);
}
if (em.deviceModel.mean && IbpOperation[em.deviceModel.mean] && em.deviceModel.mean === IbpOperation.PRERESET.event) {
handlerIbpEvent(this.$route.query.group, IbpOperation[em.deviceModel.mean].event, this.stationCode, em.deviceModel.sectionCode).then(() => {
}).catch(error => { this.$message.error(error.message); });
} else if ( em.deviceModel.mean && IbpOperation[em.deviceModel.mean]) {
handlerIbpEvent(this.$route.query.group, IbpOperation[em.deviceModel.mean].event, this.stationCode).then(() => {
}).catch(error => { this.$message.error(error.message); });
}
},
// 右键点击事件

9
src/views/system/configLine/config.vue
View File

@ -103,7 +103,8 @@ export default {
'allowEarlyDepartureWhenHoldTrain',
'standSkipSetTrainOnlyOnce',
'blockadeCommandOnlyValidInStandbyMode',
'ebwhenCancelRoute'
'ebwhenCancelRoute',
'stationPreResetBeforeAxlePreReset'
],
selectList: ['runMode'],
generalConfig: [
@ -137,7 +138,8 @@ export default {
'allowEarlyDepartureWhenHoldTrain',
'standSkipSetTrainOnlyOnce',
'blockadeCommandOnlyValidInStandbyMode',
'ebwhenCancelRoute'
'ebwhenCancelRoute',
'stationPreResetBeforeAxlePreReset'
],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -176,7 +178,8 @@ export default {
allowEarlyDepartureWhenHoldTrain: '扣车时是否允许提前发车',
standSkipSetTrainOnlyOnce: '站台指定列车跳停仅跳停一次',
blockadeCommandOnlyValidInStandbyMode: '封锁命令（状态）仅在后备模式下有效',
ebwhenCancelRoute: '取消进路时列车紧急制动'
ebwhenCancelRoute: '取消进路时列车紧急制动',
stationPreResetBeforeAxlePreReset: '计轴预复位前需要车站预复位'
}
};
},