diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 536994084..222b03d03 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -156,7 +156,7 @@ class Jlmap {
}
switchScreen(data, num, sum) {
- const sumHalf = sum / 2;
+ const sumHalf = sum <= 2 ? sum : sum / 2;
const dx = data.width / sumHalf;
const dy = data.height / sumHalf;
const row = num <= sumHalf ? 0 : 1;
diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
index b847e688f..0618cff57 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
@@ -220,7 +220,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -229,7 +231,7 @@ export default {
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
- {
+ {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
@@ -249,8 +251,8 @@ export default {
computed: {
...mapGetters('training', [
'mode',
- 'operatemode',
- 'memberList'
+ 'operatemode',
+ 'memberList'
]),
...mapGetters('menuOperation', [
'buttonOperation'
@@ -282,8 +284,11 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- this.menu = [...this.menuForce];
- // ...this.menuSpeed
+ this.menu = [...this.menuForce, ...this.menuDirective];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
// this.menu = menuConvert(this.menu);
@@ -322,8 +327,8 @@ export default {
// commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -338,8 +343,8 @@ export default {
// commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -349,9 +354,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverFuideSignal() {
- const group = this.$route.query.group;
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -361,9 +366,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverEedLight() {
- const group = this.$route.query.group;
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -373,7 +378,7 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
index 8d01a64d1..d2a361f1e 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
@@ -133,7 +133,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -142,7 +144,7 @@ export default {
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
- {
+ {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
@@ -162,8 +164,8 @@ export default {
computed: {
...mapGetters('training', [
'mode',
- 'operatemode',
- 'memberList'
+ 'operatemode',
+ 'memberList'
]),
...mapGetters('menuOperation', [
'buttonOperation'
@@ -191,7 +193,11 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- this.menu = [...this.menuForce, ...this.menuSpeed];
+ this.menu = [...this.menuForce, ...this.menuDirective, ...this.menuSpeed];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
// this.menu = menuConvert(this.menu);
@@ -229,8 +235,8 @@ export default {
// commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -245,8 +251,8 @@ export default {
// commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -256,9 +262,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverFuideSignal() {
- const group = this.$route.query.group;
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -268,9 +274,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverEedLight() {
- const group = this.$route.query.group;
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -280,7 +286,7 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
index f5e7f51e3..c1be54899 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
@@ -116,7 +116,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -125,7 +127,7 @@ export default {
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
- {
+ {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
@@ -145,8 +147,8 @@ export default {
computed: {
...mapGetters('training', [
'mode',
- 'operatemode',
- 'memberList'
+ 'operatemode',
+ 'memberList'
]),
...mapGetters('menuOperation', [
'buttonOperation'
@@ -173,7 +175,11 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- this.menu = this.menuForce;
+ this.menu = [...this.menuForce, ...this.menuDirective];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
},
doShow(point) {
@@ -209,8 +215,8 @@ export default {
// commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -225,8 +231,8 @@ export default {
// commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -236,9 +242,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverFuideSignal() {
- const group = this.$route.query.group;
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -248,9 +254,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverEedLight() {
- const group = this.$route.query.group;
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -260,7 +266,7 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
index f34f3037b..640393dd8 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
@@ -125,7 +125,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -134,7 +136,7 @@ export default {
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
- {
+ {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
@@ -154,8 +156,8 @@ export default {
computed: {
...mapGetters('training', [
'mode',
- 'operatemode',
- 'memberList'
+ 'operatemode',
+ 'memberList'
]),
...mapGetters('menuOperation', [
'buttonOperation'
@@ -182,7 +184,11 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- this.menu = this.menuForce;
+ this.menu = [...this.menuForce, ...this.menuDirective];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
},
doShow(point) {
@@ -219,8 +225,8 @@ export default {
// commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -235,8 +241,8 @@ export default {
// commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -246,9 +252,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverFuideSignal() {
- const group = this.$route.query.group;
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -258,9 +264,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverEedLight() {
- const group = this.$route.query.group;
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -270,7 +276,7 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
// 限速行驶
limitSpeed() {
const step = {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
index 47dc71267..4bf0c1a24 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
@@ -93,7 +93,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -102,7 +104,7 @@ export default {
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
- {
+ {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
@@ -123,8 +125,8 @@ export default {
computed: {
...mapGetters('training', [
'mode',
- 'operatemode',
- 'memberList'
+ 'operatemode',
+ 'memberList'
]),
...mapGetters('menuOperation', [
'buttonOperation'
@@ -164,8 +166,11 @@ export default {
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- this.menu = [...this.menuForce];
- // ...this.menuSpeed
+ this.menu = [...this.menuForce, ...this.menuDirective];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
},
doShow(point) {
@@ -202,8 +207,8 @@ export default {
// commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -218,8 +223,8 @@ export default {
// commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -229,9 +234,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverFuideSignal() {
- const group = this.$route.query.group;
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -241,9 +246,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverEedLight() {
- const group = this.$route.query.group;
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -253,7 +258,7 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
// 限速行驶
limitSpeed() {
const step = {
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
index 1b39c4621..479829bee 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
@@ -64,7 +64,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -73,7 +75,7 @@ export default {
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
- {
+ {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
@@ -94,8 +96,8 @@ export default {
computed: {
...mapGetters('training', [
'mode',
- 'operatemode',
- 'memberList'
+ 'operatemode',
+ 'memberList'
]),
...mapGetters('menuOperation', [
'buttonOperation'
@@ -123,10 +125,13 @@ 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.menu = [...this.menuForce, ...this.menuDirective];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
},
doShow(point) {
@@ -179,7 +184,7 @@ export default {
});
},
nextStation() {
- const group = this.$route.query.group;
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -191,7 +196,7 @@ export default {
});
},
routeBlockRun() {
- const group = this.$route.query.group;
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -201,9 +206,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverFuideSignal() {
- const group = this.$route.query.group;
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -213,9 +218,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverEedLight() {
- const group = this.$route.query.group;
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -225,7 +230,7 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- }
+ }
// // 添加列车识别号
// addTrainId() {
// const step = {
@@ -326,8 +331,8 @@ export default {
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
// this.$refs.trainSwitch.doShow(step, this.selected);
// }
- // });
- // }
+ // });
+ // }
}
};
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index b6124c681..2305347d6 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -211,7 +211,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -280,7 +282,11 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- this.menu = this.menuForce;
+ this.menu = [...this.menuForce, ...this.menuDirective];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
},
doShow(point) {
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index e7277c3e9..fc6ef8b36 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -114,7 +114,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -122,8 +124,8 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
- },
- {
+ },
+ {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
@@ -176,11 +178,13 @@ export default {
if (this.operatemode === OperateMode.ADMIN) {
this.menu = [...this.menu, ...this.menuForce];
}
-
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- this.menu = [...this.menuForce];
- // ...this.menuSpeed
+ this.menu = [...this.menuForce, ...this.menuDirective];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
},
doShow(point) {
@@ -387,9 +391,9 @@ export default {
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
// });
- // },
- handleOverFuideSignal() {
- const group = this.$route.query.group;
+ // },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -399,9 +403,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverEedLight() {
- const group = this.$route.query.group;
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -411,7 +415,7 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
undeveloped() {
this.doClose();
this.$alert('实现中......', '提示', {
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index 054b85091..2214a0b90 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -222,7 +222,9 @@ export default {
{
label: '取消故障',
handler: this.cancelStoppage
- },
+ }
+ ],
+ menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -231,7 +233,7 @@ export default {
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
- {
+ {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
@@ -251,8 +253,8 @@ export default {
computed: {
...mapGetters('training', [
'mode',
- 'operatemode',
- 'memberList'
+ 'operatemode',
+ 'memberList'
]),
...mapGetters('menuOperation', [
'buttonOperation'
@@ -281,7 +283,11 @@ export default {
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- this.menu = this.menuForce;
+ this.menu = [...this.menuForce, ...this.menuDirective];
+ }
+ // 指令模式列表
+ if (this.operatemode === OperateMode.DIRECTIVE) {
+ this.menu = [...this.menuDirective];
}
},
doShow(point) {
@@ -319,8 +325,8 @@ export default {
// commitOperate(menuOperate.Train.nextStation, { code: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -335,8 +341,8 @@ export default {
// commitOperate(menuOperate.Train.routeBlockRun, { code: this.selected.code }, 3).then(({valid, operate})=>{
// }).catch((error) => {
// this.$refs.noticeInfo.doShow(error.message);
- // });
- const group = this.$route.query.group;
+ // });
+ const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -346,9 +352,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverFuideSignal() {
- const group = this.$route.query.group;
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Guide_Signal',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -358,9 +364,9 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
- handleOverEedLight() {
- const group = this.$route.query.group;
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
const param = {
commandType: 'Drive_Through_The_Red_Light',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
@@ -370,7 +376,7 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 58fc5ce4a..97f1b6c72 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -47,7 +47,8 @@ export const TrainingMode = {
export const OperateMode = {
ADMIN: '00',
NORMAL: '01',
- FAULT: '02'
+ FAULT: '02',
+ DIRECTIVE: '03'
};
/**
diff --git a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
index a4a0100de..9d78f477c 100644
--- a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
@@ -396,6 +396,7 @@
bottom:0px;
height: 15px;
position: absolute;
+ cursor:pointer;
}
.panelb {
diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
index a5386a126..3dd9a6357 100644
--- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
@@ -376,6 +376,7 @@ import axios from 'axios';
width: 60px;
position: absolute;
text-align: center;
+ cursor:pointer;
}
.panebutton2{
@@ -383,6 +384,7 @@ import axios from 'axios';
width: 80px;
position: absolute;
text-align: center;
+ cursor:pointer;
}
.buttonimg{
@@ -423,6 +425,7 @@ import axios from 'axios';
width:30px;
height:30px;
position:absolute;
+ cursor:pointer;
}
.switchimg{
diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
index 9e2b944ad..3e4cb5f70 100644
--- a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
+++ b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
@@ -302,15 +302,16 @@ export default {
position:absolute;
width: 100%;
height: 100%;
- z-index: 2;
+ z-index: 35;
}
.jl3dmap3dMaintainerSelect{
position:absolute;
width: 100%;
height: 100%;
- z-index: 35;
-
+ z-index: 350;
+ top:0;
+ left:0;
background-image:url("/static/texture/bg.jpg");
// background-repeat:no-repeat;
background-size:100%;
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 6b2ca5a63..7685f1444 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -15,12 +15,10 @@
{{ $t('display.schema.previewRunDiagram') }}
{{ $t('display.schema.loadRunDiagram') }}
- 自动故障设置
+ 自动故障设置
-
- {{ $t('display.schema.normalOperation') }}
- 故障模式
-
+ 故障模式
+
@@ -89,6 +87,7 @@ export default {
swch: '02',
showStationContent:'',
isScriptCommand:false,
+ faultMode: false,
swchList: [
{ value: '01', name: '现地' },
{ value: '02', name: '行调' }
@@ -176,9 +175,22 @@ export default {
}
});
},
- changeOperateMode(handle) {
- this.$store.dispatch('training/changeOperateMode', { mode: handle });
+ changeOperateMode() {
+ this.faultMode = !this.faultMode;
+ let mode = OperateMode.NORMAL;
+ if (this.faultMode) {
+ mode = OperateMode.FAULT;
+ }
+ this.$store.dispatch('training/changeOperateMode', { mode: mode });
},
+ // changeDirectiveMode() { // 调整指令模式 (暂时不使用 等项目更新 在使用)
+ // this.directiveMode = !this.directiveMode;
+ // let mode = OperateMode.NORMAL;
+ // if (this.directiveMode) {
+ // mode = OperateMode.DIRECTIVE;
+ // }
+ // this.$store.dispatch('training/changeOperateMode', { mode: mode });
+ // },
setRuning(run) {
this.runing = run;
},
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index f526e3760..1ddef081f 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -12,18 +12,12 @@
{{ $t('joinTraining.runGraphLoading') }}
- {{ $t('joinTraining.faultSetting') }}
+ {{ $t('joinTraining.faultSetting') }}
-
- {{ $t('joinTraining.normalOperation') }}
- {{ $t('joinTraining.faultOperation') }}
-
+ 故障模式
+
+ 指令模式
@@ -34,6 +28,7 @@ import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { getByGroupStationList } from '@/api/jmap/map';
import { getEveryDayRunPlanNew } from '@/api/simulation';
+import { getSessionStorage } from '@/utils/auth';
import JoinRunPlanView from '@/views/newMap/displayNew/demon/runPlanView';
export default {
name: 'MenuDemonSchema',
@@ -89,7 +84,9 @@ export default {
kmRangeCoordMap: {},
runPlanData: {},
runing: false,
- userId: ''
+ userId: '',
+ faultMode: false,
+ directiveMode: false
};
},
computed: {
@@ -98,6 +95,12 @@ export default {
]),
isScreen() {
return this.$store.state.training.prdType === '07';
+ },
+ isCenter() {
+ return this.$store.state.training.prdType === '02';
+ },
+ isShowDirective() { // 哈尔滨项目 行调设备显示
+ return this.$route.query.type == 'CW' && getSessionStorage('project') == 'heb';
}
},
watch: {
@@ -147,8 +150,21 @@ export default {
// initPlannedDriving(isDisable) {
// this.isDisable = isDisable;
// },
- changeOperateMode(handle) {
- this.$store.dispatch('training/changeOperateMode', { mode: handle });
+ changeOperateMode() {
+ this.faultMode = !this.faultMode;
+ let mode = OperateMode.NORMAL;
+ if (this.faultMode) {
+ mode = OperateMode.FAULT;
+ }
+ this.$store.dispatch('training/changeOperateMode', { mode: mode });
+ },
+ changeDirectiveMode() { // 调整指令模式
+ this.directiveMode = !this.directiveMode;
+ let mode = OperateMode.NORMAL;
+ if (this.directiveMode) {
+ mode = OperateMode.DIRECTIVE;
+ }
+ this.$store.dispatch('training/changeOperateMode', { mode: mode });
},
setFault() {
this.$emit('faultChooseShow');
diff --git a/src/views/newMap/newMapdraft/mapoperate/splitScreen.vue b/src/views/newMap/newMapdraft/mapoperate/splitScreen.vue
index b7c85758c..133565f6a 100644
--- a/src/views/newMap/newMapdraft/mapoperate/splitScreen.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/splitScreen.vue
@@ -62,7 +62,7 @@
-
+