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/test'

Browse Source
This commit is contained in:
joylink_zhangsai 2021-08-11 19:04:09 +08:00
commit 9a37c1f972
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,7 +282,7 @@
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { deepAssign } from '@/utils/index'; import { deepAssign } from '@/utils/index';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { TrainingMode, MouseEvent } from '@/scripts/ConstDic'; import { TrainingMode, MouseEvent, OperateMode } from '@/scripts/ConstDic';
import { EventBus } from '@/scripts/event-bus'; import { EventBus } from '@/scripts/event-bus';
import * as adapter from '@/jmapNew/utils/adapter'; import * as adapter from '@/jmapNew/utils/adapter';
import CMD from '@/scripts/cmdPlugin/CommandEnum'; import CMD from '@/scripts/cmdPlugin/CommandEnum';
@ -381,7 +381,8 @@ export default {
}, },
computed: { computed: {
...mapGetters('training', [ ...mapGetters('training', [
'mode' 'mode',
'operatemode'
]), ]),
...mapGetters('map', [ ...mapGetters('map', [
'routeList', 'routeList',
@ -812,7 +813,7 @@ export default {
}, },
handleRouteMenu() { // 进路命令覆盖 handleRouteMenu() { // 进路命令覆盖
this.initCentralizedStationList(this.routeParamList); this.initCentralizedStationList(this.routeParamList);
if (this.selectedObj._event === MouseEvent.Right) { if (this.selectedObj._event === MouseEvent.Right && this.operatemode !== OperateMode.FAULT) {
this.rightClickDialogVisible = true; this.rightClickDialogVisible = true;
} }
// this.param = { routeCode: this.route.code }; // this.param = { routeCode: this.route.code };

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

@ -90,7 +90,7 @@ export default {
// 故障模式菜单列表 // 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) { if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce; this.menu = [...this.menuForce];
if (this.$store.state.training.prdType === '01') { if (this.$store.state.training.prdType === '01') {
this.menu.push({ this.menu.push({
label: 'PSL', label: 'PSL',