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:
sunzhenyu 2020-08-13 17:30:13 +08:00
commit afbdc728c8
18 changed files with 148 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
View File

@ -98,10 +98,6 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -146,6 +142,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
doShow(point) {

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

@ -284,11 +284,17 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
// this.menu = menuConvert(this.menu);

22
src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
View File

@ -4,7 +4,7 @@
<notice-info ref="noticeInfo" pop-class="chengdou-01__system" />
<switch-control ref="switchControl" pop-class="chengdou-01__system" />
<create-device-label ref="createDeviceLabel" />
<switch-hook-lock ref="switchHookLock" pop-class="chengdou-01__system" />
<switch-hook-lock ref="switchHookLock" pop-class="chengdou-01__system" />
<set-fault ref="setFault" pop-class="chengdou-01__system" />
</div>
</template>
@ -31,8 +31,8 @@ export default {
NoticeInfo,
CreateDeviceLabel,
SwitchControl,
SetFault,
SwitchHookLock
SetFault,
SwitchHookLock
},
mixins: [
CancelMouseState
@ -129,10 +129,6 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -169,6 +165,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
@ -267,10 +269,10 @@ export default {
this.$refs.switchControl.doShow(operate, this.selected);
}
});
},
// 道岔钩锁
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();

12
src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
View File

@ -191,13 +191,21 @@ export default {
// 编辑模式菜单列表
// this.menu = trainMenuFiltration(this.menuNormal);
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective, ...this.menuSpeed];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective, ...this.menuSpeed];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
// this.menu = menuConvert(this.menu);

22
src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
View File

@ -4,7 +4,7 @@
<section-control ref="sectionControl" pop-class="chengdou-03__systerm" />
<switch-control ref="switchControl" pop-class="chengdou-03__systerm" />
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
<switch-hook-lock ref="switchHookLock" pop-class="chengdou-03__systerm" />
<switch-hook-lock ref="switchHookLock" pop-class="chengdou-03__systerm" />
<set-fault ref="setFault" pop-class="chengdou-03__systerm" />
</div>
</template>
@ -30,8 +30,8 @@ export default {
SectionControl,
SwitchControl,
NoticeInfo,
SetFault,
SwitchHookLock
SetFault,
SwitchHookLock
},
mixins: [
CancelMouseState
@ -101,10 +101,6 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -141,6 +137,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
@ -235,10 +237,10 @@ export default {
this.$refs.switchControl.doShow(operate, this.selected);
}
});
},
// 道岔钩锁
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();

11
src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
View File

@ -175,12 +175,19 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
},
doShow(point) {
this.clickEvent();

10
src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
View File

@ -126,10 +126,6 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -170,6 +166,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
doShow(point) {

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

@ -184,11 +184,17 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
},
doShow(point) {

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

@ -166,10 +166,6 @@ export default {
{
label: this.$t('menu.menuSwitch.cancelFault'),
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -209,6 +205,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
doShow(point) {

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

@ -163,14 +163,19 @@ export default {
if (this.operatemode === OperateMode.ADMIN) {
this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
},
doShow(point) {

22
src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue
View File

@ -2,7 +2,7 @@
<div>
<pop-menu ref="popMenu" :menu="menu" pop-menu-class="haerbin-01__systerm" />
<notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
<switch-hook-lock ref="switchHookLock" pop-class="haerbin-01__systerm" />
<switch-hook-lock ref="switchHookLock" pop-class="haerbin-01__systerm" />
<set-fault ref="setFault" pop-class="haerbin-01__systerm" />
</div>
</template>
@ -24,8 +24,8 @@ export default {
components: {
PopMenu,
NoticeInfo,
SetFault,
SwitchHookLock
SetFault,
SwitchHookLock
},
props: {
selected: {
@ -54,10 +54,6 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -93,6 +89,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
doShow(point) {
@ -122,10 +124,10 @@ export default {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
}
});
},
// 道岔钩锁
},
// 道岔钩锁
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
this.$refs.switchHookLock.doShow(this.selected);
}
}
};

11
src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
View File

@ -127,12 +127,19 @@ export default {
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
},
doShow(point) {
this.clickEvent();

10
src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
View File

@ -145,10 +145,6 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -184,6 +180,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
doShow(point) {

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

@ -282,11 +282,17 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
},
doShow(point) {

10
src/jmapNew/theme/xian_01/menus/menuSwitch.vue
View File

@ -175,10 +175,6 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -217,6 +213,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
doShow(point) {

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

@ -180,11 +180,17 @@ export default {
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
},
doShow(point) {

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

@ -154,10 +154,6 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
},
{
label: '道岔钩锁',
handler: this.hookLock
}
]
};
@ -196,6 +192,12 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
if (!this.$store.state.scriptRecord.bgSet) {
this.menu.push({
label: '道岔钩锁',
handler: this.hookLock
});
}
}
},
initMenuEnabled() {

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

@ -283,11 +283,17 @@ export default {
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = [...this.menuForce, ...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
} else {
this.menu = [...this.menuForce];
}
}
// 指令模式列表
if (this.operatemode === OperateMode.DIRECTIVE) {
this.menu = [...this.menuDirective];
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuDirective];
}
}
},
doShow(point) {