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

Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 4m9s
Details

Browse Source
This commit is contained in:
joylink_fanyuhong 2024-04-21 17:51:33 +08:00
commit b8f90509eb
4 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/jmapNew/theme/fuzhou_01/menus/dispatchWorkMenuBar.vue
View File

@ -46,20 +46,20 @@ export default {
data() {
return {
menuNormal: [
{
title: this.$t('menu.menuBar.system'),
operate: OperationEvent.Command.mBar.system,
click: this.undeveloped,
children: [
]
},
{
title: this.$t('menu.menuBar.view'),
operate: OperationEvent.Command.mBar.check,
click: this.undeveloped,
children: [
]
},
// {
// title: this.$t('menu.menuBar.system'),
// operate: OperationEvent.Command.mBar.system,
// click: this.undeveloped,
// children: [
// ]
// },
// {
// title: this.$t('menu.menuBar.view'),
// operate: OperationEvent.Command.mBar.check,
// click: this.undeveloped,
// children: [
// ]
// },
{
title: this.$t('menu.menuBar.refresh'),
operate: OperationEvent.Command.mBar.fresh,
@ -70,7 +70,7 @@ export default {
{
title: this.$t('menu.menuBar.display'),
operate: OperationEvent.Command.mBar.view,
click: this.undeveloped,
// click: this.undeveloped,
children: [
{
title: this.$t('menu.menuBar.setTrainIdDisplay'),
@ -89,13 +89,13 @@ export default {
}
]
},
{
title: this.$t('menu.menuBar.stationMapSwitch'),
operate: '',
click: this.undeveloped,
children: [
]
},
// {
// title: this.$t('menu.menuBar.stationMapSwitch'),
// operate: '',
// click: this.undeveloped,
// children: [
// ]
// },
{
title: this.$t('menu.menuBar.planCarOperation'),
operate: OperationEvent.Command.mBar.planTrain,
@ -117,13 +117,13 @@ export default {
}
]
},
{
title: this.$t('menu.menuBar.trainNumberMaintenance'),
operate: '',
click: this.undeveloped,
children: [
]
},
// {
// title: this.$t('menu.menuBar.trainNumberMaintenance'),
// operate: '',
// click: this.undeveloped,
// children: [
// ]
// },
{
title: this.$t('menu.menuBar.controlModeSwitch'),
operate: OperationEvent.Command.mBar.remoteControl,
@ -147,27 +147,27 @@ export default {
}
]
},
{
title: this.$t('menu.menuBar.requestOperationArea'),
operate: OperationEvent.Command.mBar.requestZone,
click: this.undeveloped,
children: [
]
},
{
title: this.$t('menu.menuBar.schedulingLog'),
operate: '',
click: this.undeveloped,
children: [
]
},
{
title: this.$t('menu.menuBar.systemAnalysis'),
operate: '',
click: this.undeveloped,
children: [
]
},
// {
// title: this.$t('menu.menuBar.requestOperationArea'),
// operate: OperationEvent.Command.mBar.requestZone,
// click: this.undeveloped,
// children: [
// ]
// },
// {
// title: this.$t('menu.menuBar.schedulingLog'),
// operate: '',
// click: this.undeveloped,
// children: [
// ]
// },
// {
// title: this.$t('menu.menuBar.systemAnalysis'),
// operate: '',
// click: this.undeveloped,
// children: [
// ]
// },
{
title: this.$t('menu.menuBar.userManage'),
operate: OperationEvent.Command.mBar.userManage,
@ -179,13 +179,13 @@ export default {
}
]
},
{
title: this.$t('menu.menuBar.historyQuery'),
operate: OperationEvent.Command.mBar.historyQuery,
click: this.undeveloped,
children: [
]
},
// {
// title: this.$t('menu.menuBar.historyQuery'),
// operate: OperationEvent.Command.mBar.historyQuery,
// click: this.undeveloped,
// children: [
// ]
// },
{
title: this.$t('menu.menuBar.help'),
operate: OperationEvent.Command.mBar.help,

74
src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue
View File

@ -37,20 +37,20 @@ export default {
data() {
return {
menuNormal: [
{
title: this.$t('menu.menuBar.system'),
operate: OperationEvent.Command.mBar.system,
click: this.undeveloped,
children: [
]
},
{
title: this.$t('menu.menuBar.view'),
operate: OperationEvent.Command.mBar.check,
click: this.undeveloped,
children: [
]
},
// {
// title: this.$t('menu.menuBar.system'),
// operate: OperationEvent.Command.mBar.system,
// click: this.undeveloped,
// children: [
// ]
// },
// {
// title: this.$t('menu.menuBar.view'),
// operate: OperationEvent.Command.mBar.check,
// click: this.undeveloped,
// children: [
// ]
// },
{
title: this.$t('menu.menuBar.refresh'),
operate: OperationEvent.Command.mBar.fresh,
@ -61,7 +61,7 @@ export default {
{
title: this.$t('menu.menuBar.display'),
operate: OperationEvent.Command.mBar.view,
click: this.undeveloped,
// click: this.undeveloped,
children: [
{
title: this.$t('menu.menuBar.setTrainIdDisplay'),
@ -80,17 +80,17 @@ export default {
}
]
},
{
title: this.$t('menu.menuBar.stationMapSwitch'),
operate: '',
click: this.undeveloped,
children: [
]
},
// {
// title: this.$t('menu.menuBar.stationMapSwitch'),
// operate: '',
// click: this.undeveloped,
// children: [
// ]
// },
{
title: this.$t('menu.menuBar.controlModeSwitch'),
operate: OperationEvent.Command.mBar.remoteControl,
click: this.undeveloped,
// click: this.undeveloped,
children: [
{
title: this.$t('menu.menuBar.toStationControl'),
@ -110,20 +110,20 @@ export default {
// }
]
},
{
title: this.$t('menu.menuBar.requestOperationArea'),
operate: OperationEvent.Command.mBar.requestZone,
click: this.undeveloped,
children: [
]
},
{
title: this.$t('menu.menuBar.historyQuery'),
operate: OperationEvent.Command.mBar.historyQuery,
click: this.undeveloped,
children: [
]
},
// {
// title: this.$t('menu.menuBar.requestOperationArea'),
// operate: OperationEvent.Command.mBar.requestZone,
// click: this.undeveloped,
// children: [
// ]
// },
// {
// title: this.$t('menu.menuBar.historyQuery'),
// operate: OperationEvent.Command.mBar.historyQuery,
// click: this.undeveloped,
// children: [
// ]
// },
{
title: this.$t('menu.menuBar.userManage'),
operate: OperationEvent.Command.mBar.userManage,

10
src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
View File

@ -152,11 +152,11 @@ export default {
}
],
menuSpeed: [
{
label: this.$t('menu.menuTrain.confirmRunToFrontStation'),
handler: this.undeveloped,
cmdType:CMD.Train.CMD_TRAIN_MANUAL_LIMIT_DRIVE
}
// {
// label: this.$t('menu.menuTrain.confirmRunToFrontStation'),
// handler: this.undeveloped,
// cmdType:CMD.Train.CMD_TRAIN_MANUAL_LIMIT_DRIVE
// }
]
};
},

2
src/views/newMap/display/terminals/paScreen.vue
View File

@ -42,7 +42,7 @@ export default {
res.data.forEach(station => {
if (!station.depot && station.visible) {
const param = {
name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`,
name: station.name,
id: station.code
};
if (station.centralized) {