Merge remote-tracking branch 'origin/test'

src/jmapNew/theme/nanjing_02/menus/menuButton.vue

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

src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue

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