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-02-23 09:18:03 +08:00
commit 914b710e43
5 changed files with 68 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,3 +257,10 @@ export function getVersionList(mapId) {
method: 'get' method: 'get'
}); });
} }
/** 查询地图下车站下的区段 */
export function getSectionListByStationCode(id, stationCode) {
return request({
url: `/api/map/${id}/station/${stationCode}/sections`,
method: 'get'
});
}

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

@ -138,12 +138,12 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
}, },
{ {
label: '取消进路', label: '取消列车进路',
handler: this.cancelTrainRoute, handler: this.cancelTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
}, },
{ {
label: '人工解锁进路', // 信号机引导取消 label: '人解列车进路', // 信号机引导取消
handler: this.humanTrainRoute, handler: this.humanTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
}, },
@ -163,12 +163,12 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
}, },
{ {
label: '设置通过模式', label: '设置自动通过进路',
handler: this.singalPassModel, handler: this.singalPassModel,
cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
}, },
{ {
label: '取消通过模式', label: '取消自动通过进路',
handler: this.singalCancelPassModel, handler: this.singalCancelPassModel,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
}, },

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

@ -38,16 +38,16 @@ export default {
} }
], ],
Center: [ Center: [
{ // {
label: '设置', // label: '设置',
handler: this.setPreReset, // handler: this.setPreReset,
cmdType: CMD.Station.CMD_STATION_PRE_RESET // cmdType: CMD.Station.CMD_STATION_PRE_RESET
}, // },
{ // {
label: '取消', // label: '取消',
handler: this.cancelPreReset, // handler: this.cancelPreReset,
cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET // cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET
} // }
] ]
}, },
menuForce: [ menuForce: [

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

@ -132,7 +132,7 @@ export default {
cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO
}, },
{ {
label: '查看站台信息', label: '站台详细信息',
handler: this.detail, handler: this.detail,
cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
} }

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

@ -70,7 +70,7 @@ export default {
stepVOList: [ stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' }, { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' },
{ deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '06', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '06', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ]
}, },
{ {
@ -269,7 +269,7 @@ export default {
stepVOList: [ stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段跟踪切除】' }, { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段跟踪切除】' },
{ deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '03', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ]
}, },
{ {
@ -284,7 +284,7 @@ export default {
stepVOList: [ stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段跟踪激活】' }, { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段跟踪激活】' },
{ deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '03', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ]
}, },
{ {
@ -331,7 +331,7 @@ export default {
operateType: 'Section_Block', operateType: 'Section_Block',
skinCode: '06', skinCode: '06',
trainingName: '封锁({8}{9})', trainingName: '封锁({8}{9})',
trainingRemark: '封锁功能', trainingRemark: '区段封锁功能',
trainingType: 'Section', trainingType: 'Section',
productTypes: ['01'], productTypes: ['01'],
stepVOList: [ stepVOList: [
@ -345,7 +345,7 @@ export default {
operateType: 'Section_Unblock', operateType: 'Section_Unblock',
skinCode: '06', skinCode: '06',
trainingName: '解封({8}{9})', trainingName: '解封({8}{9})',
trainingRemark: '解封功能', trainingRemark: '区段解封功能',
trainingType: 'Section', trainingType: 'Section',
productTypes: ['01'], productTypes: ['01'],
stepVOList: [ stepVOList: [
@ -353,7 +353,7 @@ export default {
{ deviceType: '03', orderNum: 2, operateCode: '4042', tip: '鼠标左键点击【是】按钮' }, { deviceType: '03', orderNum: 2, operateCode: '4042', tip: '鼠标左键点击【是】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '{19}' }, { deviceType: '03', orderNum: 4, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '{19}' },
{ deviceType: '03', orderNum: 5, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 5, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' }
] ]
}, },
{ {
@ -380,7 +380,7 @@ export default {
operateType: 'Switch_Normal_Position', operateType: 'Switch_Normal_Position',
skinCode: '06', skinCode: '06',
trainingName: '定操({7})', trainingName: '定操({7})',
trainingRemark: '定操({7})', trainingRemark: '道岔定操功能({7})',
trainingType: 'Switch', trainingType: 'Switch',
productTypes: ['01', '02'], productTypes: ['01', '02'],
stepVOList: [ stepVOList: [
@ -395,7 +395,7 @@ export default {
operateType: 'Switch_Reverse_Position', // 0313 新增定位字典 operateType: 'Switch_Reverse_Position', // 0313 新增定位字典
skinCode: '06', skinCode: '06',
trainingName: '反操({7})', trainingName: '反操({7})',
trainingRemark: '反操({7})', trainingRemark: '道岔反操功能({7})',
trainingType: 'Switch', trainingType: 'Switch',
productTypes: ['01', '02'], productTypes: ['01', '02'],
stepVOList: [ stepVOList: [
@ -410,7 +410,7 @@ export default {
operateType: 'Switch_Cut_Off', operateType: 'Switch_Cut_Off',
skinCode: '06', skinCode: '06',
trainingName: '区段切除({7})', trainingName: '区段切除({7})',
trainingRemark: '区段切除', trainingRemark: '区段切除功能',
trainingType: 'Switch', trainingType: 'Switch',
productTypes: ['02'], productTypes: ['02'],
stepVOList: [ stepVOList: [
@ -494,7 +494,7 @@ export default {
stepVOList: [ stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' }, { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
{ deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ]
}, },
{ {
@ -600,7 +600,7 @@ export default {
stepVOList: [ stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' }, { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
{ deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ]
}, },
{ {
@ -647,7 +647,7 @@ export default {
stepVOList: [ stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置自动通过进路】' }, { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置自动通过进路】' },
{ deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ]
}, },
// { // {
@ -678,7 +678,7 @@ export default {
stepVOList: [ stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消自动通过进路】' }, { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消自动通过进路】' },
{ deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ]
}, },
// { // {
@ -701,12 +701,12 @@ export default {
minDuration: 8, minDuration: 8,
operateType: 'Signal_Human_Release_Route', operateType: 'Signal_Human_Release_Route',
skinCode: '06', skinCode: '06',
trainingName: '人工解锁进路({5})', trainingName: '人解列车进路({5})',
trainingRemark: '人工解锁进路', trainingRemark: '人解列车进路',
trainingType: 'Signal', trainingType: 'Signal',
productTypes: ['01', '02'], productTypes: ['01', '02'],
stepVOList: [ stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【人工解锁进路】' }, { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【人解列车进路】' },
{ deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮' } { deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮' }
] ]
}, },
@ -715,12 +715,12 @@ export default {
minDuration: 8, minDuration: 8,
operateType: 'Signal_Set_Guide', operateType: 'Signal_Set_Guide',
skinCode: '06', skinCode: '06',
trainingName: '信号机引导办理({5})', trainingName: '引导({5})',
trainingRemark: '信号机引导办理', trainingRemark: '引导办理',
trainingType: 'Signal', trainingType: 'Signal',
productTypes: ['01'], productTypes: ['01'],
stepVOList: [ stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' }, { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导】' },
{ deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' } { deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' }
] ]
}, },
@ -730,13 +730,13 @@ export default {
operateType: 'Signal_Block', operateType: 'Signal_Block',
skinCode: '06', skinCode: '06',
trainingName: '封锁({5})', trainingName: '封锁({5})',
trainingRemark: '封锁', trainingRemark: '信号机封锁功能',
trainingType: 'Signal', trainingType: 'Signal',
productTypes: ['01'], productTypes: ['01'],
stepVOList: [ stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【封锁】' }, { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【封锁】' },
{ deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ]
}, },
{ {
@ -745,7 +745,7 @@ export default {
operateType: 'Signal_Unblock', operateType: 'Signal_Unblock',
skinCode: '06', skinCode: '06',
trainingName: '解封({5})', trainingName: '解封({5})',
trainingRemark: '解封功能', trainingRemark: '信号机解封功能',
trainingType: 'Signal', trainingType: 'Signal',
productTypes: ['01'], productTypes: ['01'],
stepVOList: [ stepVOList: [
@ -753,7 +753,7 @@ export default {
{ deviceType: '03', orderNum: 2, operateCode: '3072', tip: '鼠标左键点击【是】按钮' }, { deviceType: '03', orderNum: 2, operateCode: '3072', tip: '鼠标左键点击【是】按钮' },
{ deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择信号机({5})', val: '{6}' }, { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择信号机({5})', val: '{6}' },
{ deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' }
] ]
}, },
{ {
@ -825,8 +825,9 @@ export default {
stepVOList: [ stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '900', tip: '鼠标右键菜单选择【设置自动折返】'}, { deviceType: '05', orderNum: 1, operateCode: '900', tip: '鼠标右键菜单选择【设置自动折返】'},
{ deviceType: '05', orderNum: 2, operateCode: '900', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '05', orderNum: 2, operateCode: '900', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '05', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '05', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ],
config: { autoCycleBT: true }
}, },
{ {
maxDuration: 15, maxDuration: 15,
@ -836,12 +837,13 @@ export default {
trainingName: '取消自动折返({3})', trainingName: '取消自动折返({3})',
trainingRemark: '取消自动折返', trainingRemark: '取消自动折返',
trainingType: 'Signal', trainingType: 'Signal',
productTypes: ['01','02'], productTypes: ['01', '02'],
stepVOList: [ stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '901', tip: '鼠标右键菜单选择【取消自动折返】'}, { deviceType: '05', orderNum: 1, operateCode: '901', tip: '鼠标右键菜单选择【取消自动折返】'},
{ deviceType: '05', orderNum: 2, operateCode: '901', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '05', orderNum: 2, operateCode: '901', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '05', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, { deviceType: '05', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }
] ],
config: { autoCycleBT: true }
}, },
{ {
maxDuration: 20, maxDuration: 20,