-
+
语音广播
+
+
+
特定区域
+
全线
+
全站厅
+
全上行站台
+
全下行站台
+
全办公区
+
全出入口
+
全换乘通道
+
+
+
+
+
+
+ 预备
广播
+
+
+
+
+
+
+
+
+ 广播内容
+
+
+ 广播停止
+
+
+
+
+
+ 背景音乐
+
+
+ 播放音乐
+ 停止音乐
+
+
+
-
-
- 实时广播
- 广播
-
+
-
-
- 预备
广播
-
-
-
-
-
-
-
-
- 广播内容
-
-
- 广播停止
-
-
-
-
-
- 背景音乐
-
-
- 播放音乐
- 停止音乐
-
-
-
-
-
-
-
+
\ No newline at end of file
+};
+
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
index bf35a12d4..b15abc755 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
@@ -333,13 +333,7 @@ export default {
// 设置进路
arrangementRoute() {
commitOperate(menuOperate.Signal.arrangementRoute, {signalCode:this.selected.code}, 0).then((data)=>{
- const routes = [];
- this.routeList.forEach(elem => {
- if (elem.startSignalCode === this.selected.code) {
- routes.push(elem);
- }
- });
- this.$refs.routeSelection.doShow(data.operate, this.selected, routes);
+ this.$refs.routeSelection.doShow(data.operate, this.selected, this.getRouteList(this.selected));
});
},
// 现地设置进路
@@ -399,25 +393,13 @@ export default {
// 进路交人工控
humanControl() {
commitOperate(menuOperate.Signal.humanControl, {signalCode:this.selected.code}, 0).then((data)=>{
- const routes = [];
- this.routeList.forEach(elem => {
- if (elem.startSignalCode === this.selected.code) {
- routes.push(elem);
- }
- });
- this.$refs.routeHandControl.doShow(data.operate, this.selected, routes);
+ this.$refs.routeHandControl.doShow(data.operate, this.selected, this.getRouteList(this.selected));
});
},
// 进路交自动控
atsAutoControl() {
commitOperate(menuOperate.Signal.atsAutoControl, {signalCode:this.selected.code}, 0).then((data)=>{
- const routes = [];
- this.routeList.forEach(elem => {
- if (elem.startSignalCode === this.selected.code) {
- routes.push(elem);
- }
- });
- this.$refs.routeHandControl.doShow(data.operate, this.selected, routes);
+ this.$refs.routeHandControl.doShow(data.operate, this.selected, this.getRouteList(this.selected));
});
},
// 设置通过模式
@@ -437,15 +419,19 @@ export default {
// 查询进路状态
detail() {
commitOperate(menuOperate.Signal.detail, {signalCode:this.selected.code}, 0).then((data)=>{
- const routes = [];
- this.routeList.forEach(elem => {
- if (elem.startSignalCode === this.selected.code) {
- routes.push(elem);
- }
- });
- this.$refs.routeDetail.doShow(data.operate, this.selected, routes);
+ this.$refs.routeDetail.doShow(data.operate, this.selected, this.getRouteList(this.selected));
});
},
+ // 获取进路列表
+ getRouteList(selectType) {
+ const routes = [];
+ this.routeList.forEach(elem => {
+ if (elem.startSignalCode === selectType.code) {
+ routes.push(elem);
+ }
+ });
+ return routes;
+ },
passWordCommit(data) {
const operate = {
operation: data.operation,
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
index 928db10dd..ae5053bd7 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
@@ -23,6 +23,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mouseCancelState } from './utils/menuItemStatus';
+import {menuOperate, commitOperate} from './utils/menuOperate';
export default {
name: 'SwitchMenu',
@@ -237,167 +238,63 @@ export default {
},
// 道岔单锁
lock(selectType) {
- const operate = {
- start: true,
- over: true,
- operation: OperationEvent.Switch.lock.menu.operation,
- param: {
- switchCode: selectType.code
- },
- cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- }
- }).catch(error => {
- this.$refs.noticeInfo.doShow(operate, error.message);
+ commitOperate(menuOperate.Switch.lock, {switchCode:selectType.code}, 3).then((data)=>{
+ }).catch(error=>{
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
// 道岔解锁
unlock(selectType) {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.Switch.unlock.menu.operation,
- param: {
- switchCode: selectType.code
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.switchControl.doShow(operate, selectType);
- }
- }).catch(error => {
- this.$refs.noticeInfo.doShow(operate, error.message);
+ commitOperate(menuOperate.Switch.unlock, {switchCode:selectType.code}, 0).then((data)=>{
+ this.$refs.switchControl.doShow(data.operate, selectType);
+ }).catch(error=>{
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
-
// 现地道岔强扳
switchTurnoutForce(selectType) {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.Switch.turnoutForce.menu.operation,
- param:{
- switchCode:selectType.code
- }
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.switchControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.Switch.turnoutForce, {switchCode:selectType.code}, 0).then((data)=>{
+ this.$refs.switchControl.doShow(data.operate, selectType);
+ }).catch(error=>{
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
-
// 单操到定位
locate(selectType) {
- const operate = {
- start: true,
- over: true,
- operation: OperationEvent.Switch.locate.menu.operation,
- param: {
- switchCode: selectType.code
- },
- cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- }
- }).catch(error => {
- this.$refs.noticeInfo.doShow(operate, error.message);
+ commitOperate(menuOperate.Switch.locate, {switchCode:selectType.code}, 3).then((data)=>{
+ }).catch(error=>{
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
-
// 单操到反位
reverse(selectType) {
- const operate = {
- start: true,
- over: true,
- operation: OperationEvent.Switch.reverse.menu.operation,
- param: {
- switchCode: selectType.code
- },
- cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- }
- }).catch(error => {
- this.$refs.noticeInfo.doShow(operate, error.message);
+ commitOperate(menuOperate.Switch.reverse, {switchCode:selectType.code}, 3).then((data)=>{
+ }).catch(error=>{
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
-
// 区段切除
split() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.Switch.split.menu.operation,
- param: {
- switchCode: `${this.selected.code}`
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.switchControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.Switch.split, {switchCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.switchControl.doShow(data.operate, this.selected);
});
},
// 区段激活
active() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.Switch.active.menu.operation,
- param: {
- switchCode: `${this.selected.code}`
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.switchControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.Switch.active, {switchCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.switchControl.doShow(data.operate, this.selected);
});
},
// 设置临时限速
setSpeed() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.Switch.setSpeed.menu.operation,
- param: {
- switchCode: `${this.selected.code}`
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.speedLimitControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.Switch.setSpeed, {switchCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.speedLimitControl.doShow(data.operate, this.selected);
});
},
// 确认计轴有效
alxeEffective() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.Switch.alxeEffective.menu.operation,
- param: {
- switchCode: `${this.selected.code}`
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.alxeEffective.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.Switch.alxeEffective, {switchCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.alxeEffective.doShow(data.operate, this.selected);
});
},
undeveloped() {
diff --git a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
index b6936687f..349e7a566 100644
--- a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
@@ -8,37 +8,31 @@ export const menuOperate = {
active:{
// 区段激活
operation: OperationEvent.Section.active.menu.operation,
- param:['sectionCode'],
cmdType: CMD.Section.CMD_SECTION_ACTIVE
},
alxeEffective:{
// 确认计轴有效
operation: OperationEvent.Section.alxeEffective.menu.operation,
- param:['sectionCode'],
cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE
},
split:{
// 区段切除
operation: OperationEvent.Section.split.menu.operation,
- param:['sectionCode'],
cmdType: CMD.Section.CMD_SECTION_CUT_OFF
},
setSpeed:{
// 设置速度
operation: OperationEvent.Section.setSpeed.menu.operation,
- param:['sectionCode'],
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
},
axlePreReset:{
// 区段计轴预复位
operation: OperationEvent.Section.axlePreReset.menu.operation,
- param:['sectionCode'],
cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
},
fault:{
// 区段故障解锁
operation: OperationEvent.Section.fault.menu.operation,
- param:['sectionCode'],
cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
}
},
@@ -92,6 +86,56 @@ export const menuOperate = {
// 查询进路状态
operation: OperationEvent.Signal.detail.menu.operation
}
+ },
+ Switch:{
+ lock:{
+ // 道岔单锁
+ operation: OperationEvent.Switch.lock.menu.operation,
+ cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+ },
+ unlock:{
+ // 道岔解锁
+ operation: OperationEvent.Switch.unlock.menu.operation,
+ cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+ },
+ turnoutForce:{
+ // 道岔强扳
+ operation: OperationEvent.Switch.turnoutForce.menu.operation
+ },
+ locate:{
+ // 单操到定位
+ operation: OperationEvent.Switch.locate.menu.operation,
+ cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
+ },
+ reverse:{
+ // 单操到反位
+ operation: OperationEvent.Switch.reverse.menu.operation,
+ cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
+ },
+ split:{
+ // 区段切除
+ operation: OperationEvent.Switch.split.menu.operation,
+ cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
+ },
+ active:{
+ // 区段激活
+ operation: OperationEvent.Switch.active.menu.operation,
+ cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
+ },
+ setSpeed:{
+ // 设置临时限速
+ operation: OperationEvent.Switch.setSpeed.menu.operation,
+ cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
+ },
+ alxeEffective:{
+ // 确认计轴有效
+ operation: OperationEvent.Switch.alxeEffective.menu.operation,
+ cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE
+ }
+
+ },
+ Stand:{
+
}
};
@@ -102,8 +146,8 @@ export function commitOperate(operate, paramList, over) {
param:{}
};
step.param = paramList;
- // isOnce 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
- if (over != 0) {
+ // over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
+ if (over != 0 && over != 3) {
delete step.start;
}
if (over == 2 || over == 3) {
From 402d161e736d147585c8f1a1babbe82b80663d6b Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 20 Mar 2020 13:07:31 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/shape/Signal/index.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 4bcbd7bdc..2eff0fbc2 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -1,7 +1,6 @@
/*
* 信号机
*/
-
import ESigPost from './ESigPost';
import ESigLamp from './ESigLamp';
import ESigAuto from './ESigAuto';
From d50f096b0ad2c2c2f65139d3bfd64aca0fdb71ad Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 20 Mar 2020 13:30:57 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?=
=?UTF-8?q?=E7=BA=BF=E7=AB=99=E5=8F=B0=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../beijing_01/menus/menuStationStand.vue | 183 +++---------------
.../beijing_01/menus/utils/menuOperate.js | 48 ++++-
2 files changed, 71 insertions(+), 160 deletions(-)
diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
index 19cf0d451..2d4a13385 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
@@ -27,6 +27,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mouseCancelState } from './utils/menuItemStatus';
+import {menuOperate, commitOperate} from './utils/menuOperate';
export default {
name: 'StationStandMenu',
@@ -242,75 +243,28 @@ export default {
},
// 现地设置扣车
setDetainTrainByLow(selectType) {
- const operate = {
- start: true,
- operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
- param:{
- standCode:selectType.code
- },
- cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
- };
-
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- }
- }).catch(error => {
- this.$refs.noticeInfo.doShow(operate, error.message);
+ commitOperate(menuOperate.StationStand.setDetainTrain, {standCode:selectType.code}, 3).then((data)=>{
+ }).catch(error=>{
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
/** 取消扣车 */
cancleDetainTrainByLow(selectType) {
- const operate = {
- start: true,
- over: true,
- operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
- param:{
- standCode:selectType.code
- },
- cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
- };
-
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- }
- }).catch(error => {
- this.$refs.noticeInfo.doShow(operate, error.message);
+ commitOperate(menuOperate.StationStand.cancelDetainTrain, {standCode:selectType.code}, 3).then((data)=>{
+ }).catch(error=>{
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
// 设置扣车
setDetainTrain() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
- param:{
- standCode:this.selected.code
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.StationStand.setDetainTrain, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standControl.doShow(data.operate, this.selected);
});
},
// 取消扣车
cancelDetainTrain() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
- param:{
- standCode:this.selected.code
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.StationStand.cancelDetainTrain, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standControl.doShow(data.operate, this.selected);
});
},
// 强制取消扣车
@@ -331,131 +285,44 @@ export default {
// },
// 设置跳停
setJumpStop() {
- const operate = {
- start: true,
- code: `${this.selected.code}`,
- operation: OperationEvent.StationStand.setJumpStop.menu.operation,
- param:{
- standCode:this.selected.code
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standJumpStopControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.StationStand.setJumpStop, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standJumpStopControl.doShow(data.operate, this.selected);
});
},
// 取消跳停
cancelJumpStop() {
- const operate = {
- start: true,
- code: `${this.selected.code}`,
- operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
- param:{
- standCode:this.selected.code
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standJumpStopControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.StationStand.cancelJumpStop, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standJumpStopControl.doShow(data.operate, this.selected);
});
},
// 停站时间控制
setStopTime() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.setStopTime.menu.operation,
- param:{
- standCode:this.selected.code
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- const tempData = [];
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standStopTime.doShow(operate, this.selected, tempData);
- }
- }).catch(() => {
- this.$refs.noticeInfo.doShow(operate);
+ commitOperate(menuOperate.StationStand.setStopTime, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standStopTime.doShow(data.operate, this.selected, []);
});
},
// 运行时间控制
setRunLevel() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.setRunLevel.menu.operation,
- param:{
- standCode:this.selected.code
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- const tempData = [];
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standRunLevel.doShow(operate, this.selected, tempData);
- }
- }).catch(() => {
- this.$refs.noticeInfo.doShow(operate);
+ commitOperate(menuOperate.StationStand.setRunLevel, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standRunLevel.doShow(data.operate, this.selected, []);
});
},
// 设置提前发车
earlyDeparture() {
- const operate = {
- start: true,
- code: `${this.selected.code}`,
- operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
- param:{
- standCode:this.selected.code
- }
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standControl.doShow(operate, this.selected);
- }
+ commitOperate(menuOperate.StationStand.earlyDeparture, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standControl.doShow(data.operate, this.selected);
});
},
// 设置折返策略
setBackStrategy() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
- param:{
- standCode:this.selected.code
- }
- };
-
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- const tempData = [];
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standBackStrategy.doShow(operate, this.selected, tempData);
- }
- }).catch(() => {
- this.$refs.noticeInfo.doShow(operate);
+ commitOperate(menuOperate.StationStand.setBackStrategy, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standBackStrategy.doShow(data.operate, this.selected);
});
},
// 查询站台状态
detail() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.StationStand.detail.menu.operation
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- const tempData = [];
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.standDetail.doShow(operate, this.selected, tempData);
- }
- }).catch(() => {
- this.$refs.noticeInfo.doShow(operate);
+ commitOperate(menuOperate.StationStand.detail, {standCode:this.selected.code}, 0).then((data)=>{
+ this.$refs.standDetail.doShow(data.operate, this.selected, []);
});
}
}
diff --git a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
index 349e7a566..80366922c 100644
--- a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
@@ -2,7 +2,7 @@ import store from '@/store';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// 控制禁用
+// 操作
export const menuOperate = {
Section:{
active:{
@@ -134,7 +134,51 @@ export const menuOperate = {
}
},
- Stand:{
+ StationStand:{
+ setDetainTrain:{
+ // 设置扣车
+ operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+ },
+ cancelDetainTrain:{
+ // 取消扣车
+ operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+ },
+ setJumpStop:{
+ // 设置跳停
+ operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
+ },
+ cancelJumpStop:{
+ // 取消跳停
+ operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+ },
+ setStopTime:{
+ // 停站时间控制
+ operation: OperationEvent.StationStand.setStopTime.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
+ },
+ setRunLevel:{
+ // 运行时间控制
+ operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME
+ },
+ earlyDeparture:{
+ // 设置提前发车
+ operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
+ },
+ setBackStrategy:{
+ // 设置折返策略
+ operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
+ },
+ detail:{
+ // 查询站台状态
+ operation: OperationEvent.StationStand.detail.menu.operation
+ }
}
};
From 2c4848f4db96bd1892691aa95bfd748c74e94bbb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 20 Mar 2020 14:48:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?=
=?UTF-8?q?=E7=BA=BF=E6=8C=87=E4=BB=A4=E6=93=8D=E4=BD=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../beijing_01/menus/dialog/routeControl.vue | 59 ++------
.../beijing_01/menus/dialog/routeDetail.vue | 134 ++++++++++--------
.../menus/dialog/routeHandControl.vue | 37 +----
.../menus/dialog/routeSelection.vue | 25 +---
.../menus/dialog/sectionControl.vue | 49 ++-----
.../menus/dialog/standBackStrategy.vue | 129 +++++++++--------
.../beijing_01/menus/dialog/standControl.vue | 63 ++------
.../menus/dialog/standJumpStopControl.vue | 55 ++-----
.../beijing_01/menus/dialog/standRunLevel.vue | 22 +--
.../beijing_01/menus/dialog/standStopTime.vue | 23 +--
.../theme/beijing_01/menus/menuSection.vue | 2 +-
11 files changed, 210 insertions(+), 388 deletions(-)
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
index 97c59122f..3e3e986fb 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
@@ -36,13 +36,13 @@
\ No newline at end of file
+};
+
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
index 5422480fa..d4d6e3abb 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
@@ -80,7 +80,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import { mouseCancelState } from '../utils/menuItemStatus';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
export default {
name: 'RouteHandControl',
@@ -278,47 +278,24 @@ export default {
},
// 进路交人工控
humanControl() {
- const operate = {
- over: true,
- operation: OperationEvent.Signal.humanControl.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
- param:{
- routeCodeList:this.selection
- }
- };
this.loading = true;
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- this.loading = false;
- if (valid) {
- this.doClose();
- }
+ commitOperate(menuOperate.Signal.humanControl, {routeCodeList:this.selection}, 2).then((data)=>{
+ this.doClose();
}).catch((error) => {
this.loading = false;
this.doClose();
- this.$refs.noticeInfo.doShow(operate, error.message);
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
// 进路交自动控
atsAutoControl() {
- const operate = {
- over: true,
- operation: OperationEvent.Signal.atsAutoControl.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
- param:{
- routeCodeList:this.selection
- }
- };
-
this.loading = true;
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- this.loading = false;
- if (valid) {
- this.doClose();
- }
+ commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2).then((data)=>{
+ this.doClose();
}).catch((error) => {
this.loading = false;
this.doClose();
- this.$refs.noticeInfo.doShow(operate, error.message);
+ this.$refs.noticeInfo.doShow({}, error.message);
});
},
cancel() {
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
index c192bb5b6..acf3dee42 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
@@ -61,11 +61,11 @@
\ No newline at end of file
+};
+
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
index c085f2079..cf415927c 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
@@ -110,10 +110,11 @@