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

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

Browse Source
This commit is contained in:
fan 2021-02-01 18:31:23 +08:00
commit 07efc9ae51
8 changed files with 80 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/jmapNew/theme/foshan_01/menus/menuStation.vue
View File

@ -47,36 +47,12 @@ export default {
menu: [],
menuNormal: {
Local: [
{
label: '全站设置联锁自动触发',
handler: this.setAutoTrigger
},
{
label: '全站取消联锁自动触发',
handler: this.cancelAutoTrigger
},
{
label: '上电解锁',
handler: this.powerUnLock
},
{
label: '执行关键操作测试',
handler: this.execKeyOperationTest
}
],
Center: [
{
label: '所有进路自排关',
handler: this.humanControlALL
},
{
label: '所有进路自排开',
handler: this.atsAutoControlALL
},
{
label: '执行关键操作测试',
handler: this.execKeyOperationTest
}
]
},
menuForce: [
@ -123,7 +99,6 @@ export default {
},
initMenu() {
// 编辑模式菜单列表
if (this.selected.centralized) {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
@ -165,42 +140,6 @@ export default {
}
});
},
// 全站设置联锁自动触发
setAutoTrigger() {
const operate = {
start: true,
send: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.setAutoTrigger.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
// 全站取消联锁自动触发
cancelAutoTrigger() {
const operate = {
start: true,
send: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
// 上电解锁
powerUnLock() {
const operate = {
@ -217,54 +156,6 @@ export default {
}
});
},
// 执行关键操作测试
execKeyOperationTest() {
const operate = {
start: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.execKeyOperationTest.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.stationCmdControl.doShow(operate, this.selected);
}
});
},
// 所有进路自排关
humanControlALL() {
const operate = {
start: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.humanControlALL.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.stationHumanControlAll.doShow(operate, this.selected);
}
});
},
// 所有进路自排开
atsAutoControlALL() {
const operate = {
start: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.stationSetRouteControlAll.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
}
});
},
triggerFaultManagement() {
this.$store.dispatch('training/setTriggerFaultCount', this.selected);
}

4
src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
View File

@ -172,12 +172,12 @@ export default {
// cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
// },
{
label: this.$t('menu.menuSignal.humanControl'),
label: '进路交人工控',
handler: this.humanControl,
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
},
{
label: this.$t('menu.menuSignal.atsAutoControl'),
label: '进路交ATS自动控',
handler: this.atsAutoControl,
cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
},

4
src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
View File

@ -70,12 +70,12 @@ export default {
],
Center: [
{
label: this.$t('menu.menuStation.allHumanControl'),
label: '全站进路交人工控',
handler: this.humanControlALL,
cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
},
{
label: this.$t('menu.menuStation.allATSAutoControl'),
label: '全站进路ATS自排',
handler: this.atsAutoControlALL,
cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
},

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

@ -94,11 +94,10 @@ export default {
{ deviceType: '05', orderNum: 8, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
]
},
// 未生成
{
maxDuration: 15,
minDuration: 8,
operateType: 'CMD_STATION_SET_CI_AUTO_TRIGGER',
operateType: 'Station_Set_CI_Auto_Trigger',
skinCode: '07',
trainingName: '全站设置联锁自动触发({26})',
trainingRemark: '全站设置联锁自动触发',
@ -108,11 +107,10 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】' }
]
},
// 未生成
{
maxDuration: 15,
minDuration: 8,
operateType: 'CMD_STATION_CANCEL_CI_AUTO_TRIGGER',
operateType: 'Station_Cancel_CI_Auto_Trigger',
skinCode: '07',
trainingName: '全站取消联锁自动触发({26})',
trainingRemark: '全站取消联锁自动触发',
@ -917,6 +915,35 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: '312', tip: '鼠标右键菜单选择【取消联锁自动触发】' },
{ deviceType: '04', orderNum: 2, operateCode: '312', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Station_Close_Auto_Setting',
skinCode: '07',
trainingName: '全站进路交人工控({26})',
trainingRemark: '全站进路交人工控',
trainingType: 'Station',
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '605', tip: '鼠标右键菜单选择【全站进路交人工控】' },
{ deviceType: '04', orderNum: 2, operateCode: '605', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Station_Open_Auto_Setting',
skinCode: '07',
trainingName: '全站进路ATS自排({26})',
trainingRemark: '全站进路ATS自排',
trainingType: 'Station',
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '606', tip: '鼠标右键菜单选择【全站进路ATS自排】' },
{ deviceType: '04', orderNum: 2, operateCode: '606', tip: '鼠标左键点击【确定】按钮', val: 'true' }
]
}
]
};

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

@ -731,21 +731,6 @@ export default {
{
maxDuration: 15,
minDuration: 8,
operateType: 'Station_Close_AllSignal',
skinCode: '07',
trainingName: '关站信号({26})',
trainingRemark: '关站信号',
trainingType: 'ControlConvertMenu',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
{ deviceType: '05', orderNum: 2, operateCode: '6114', tip: '鼠标左键点击【关站信号】按钮' },
{ deviceType: '05', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'CM_Receive_Control',
skinCode: '07',
trainingName: '接收控制({1})',
@ -815,6 +800,21 @@ export default {
stepVOList: [
{ deviceType: 'mbm', orderNum: 1, operateCode: '2044', tip: '鼠标左键点击【交出控制】按钮' },
{ deviceType: '05', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Station_Close_AllSignal',
skinCode: '07',
trainingName: '关站信号({26})',
trainingRemark: '关站信号',
trainingType: 'Station',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
{ deviceType: '04', orderNum: 2, operateCode: '6114', tip: '鼠标左键点击【关站信号】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
}
]

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

@ -130,11 +130,13 @@ export default {
};
},
initMenu() {
if (this.selected.centralized) {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
}
},
doShow(point) {
this.clickEvent();
@ -142,6 +144,7 @@ export default {
if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
this.$refs.popMenu.resetShowPosition(point);
}
},
doClose() {
if (this.$refs && this.$refs.popMenu) {

3
src/jmapNew/theme/race_01/menus/menuStation.vue
View File

@ -130,11 +130,14 @@ export default {
};
},
initMenu() {
if (this.selected.centralized) {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
}
},
doShow(point) {
this.clickEvent();

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

@ -398,20 +398,20 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
]
},
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Signal_Find_Routes_Status',
// skinCode: '09',
// trainingName: '查询进路控制状态({5})',
// trainingRemark: '查询进路控制状态',
// trainingType: 'Signal',
// productTypes: ['01', '02'],
// stepVOList: [
// { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制状态】' },
// { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
// ]
// },
{
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Find_Routes_Status',
skinCode: '09',
trainingName: '帮助({5})',
trainingRemark: '帮助',
trainingType: 'Signal',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【帮助】' },
{ deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
]
},
// {
// maxDuration: 15,
// minDuration: 8,