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

BUG 107: 浙大网新仿真线路：对立的功能应设置有误

Browse Source
This commit is contained in:
fan 2021-01-29 15:01:38 +08:00
parent f1822495d2
commit 318d120db6
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/map.js
View File

@ -543,10 +543,12 @@ class Jlmap {
status.atsControl = status.atsControl && elem.atsControl; status.atsControl = status.atsControl && elem.atsControl;
status.fleetMode = status.fleetMode || elem.fleetMode; status.fleetMode = status.fleetMode || elem.fleetMode;
status.ciControl = status.ciControl || elem.ciControl; status.ciControl = status.ciControl || elem.ciControl;
status.lock = status.lock || elem.lock;
} else { } else {
status.atsControl = elem.atsControl; status.atsControl = elem.atsControl;
status.fleetMode = elem.fleetMode; status.fleetMode = elem.fleetMode;
status.ciControl = elem.ciControl; status.ciControl = elem.ciControl;
status.lock = elem.lock;
} }
status.canSetCi = status.arc || elem.arc; status.canSetCi = status.arc || elem.arc;
}); });

9
src/jmapNew/theme/xian_02/menus/menuSection.vue
View File

@ -83,11 +83,13 @@ export default {
Center: [ Center: [
{ {
label: '区段封锁', label: '区段封锁',
handler: this.lock handler: this.lock,
cmdType: CMD.Section.CMD_SECTION_BLOCK
}, },
{ {
label: '区段解封', label: '区段解封',
handler: this.unlock handler: this.unlock,
cmdType: CMD.Section.CMD_SECTION_UNBLOCK
}, },
{ {
label: '设备标签', label: '设备标签',
@ -112,7 +114,8 @@ export default {
}, },
{ {
label: '设置临时限速', label: '设置临时限速',
handler: this.setSpeed handler: this.setSpeed,
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
}, },
{ {
label: '帮助', label: '帮助',

5
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -17,6 +17,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
export default { export default {
name: 'SignalMenu', name: 'SignalMenu',
@ -240,8 +241,8 @@ export default {
}; };
}, },
initMenu() { initMenu() {
// this.menu = MenuContextHandler.covert(this.menuNormal); this.menu = MenuContextHandler.covert2(this.menuNormal);
this.menu = this.menuNormal.Center; // this.menu = this.menuNormal.Center;
// 故障模式菜单列表 // 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) { if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce; this.menu = this.menuForce;

4
src/jmapNew/theme/xian_02/menus/menuSwitch.vue
View File

@ -24,6 +24,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
export default { export default {
name: 'SwitchMenu', name: 'SwitchMenu',
@ -192,8 +193,7 @@ export default {
}, },
initMenu() { initMenu() {
// 编辑模式菜单列表 // 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal); this.menu = MenuContextHandler.covert2(this.menuNormal);
this.menu = this.menuNormal.Center;
// 故障模式菜单列表 // 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) { if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) { if (!this.$store.state.scriptRecord.bgSet) {