From b00bb22a8cedc4d7380d368da43a325c69df0e28 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Tue, 30 Jul 2019 16:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/constant/deviceState.js | 24 +++++++++---------- .../batong_01/menus/utils/menuItemStatus.js | 10 ++++---- .../beijing_01/menus/utils/menuItemStatus.js | 10 ++++---- .../chengdou_03/menus/utils/menuItemStatus.js | 10 ++++---- .../fuzhou_01/menus/utils/menuItemStatus.js | 14 +++++------ 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/jmap/constant/deviceState.js b/src/jmap/constant/deviceState.js index 4a8951651..ccc8dcd2e 100644 --- a/src/jmap/constant/deviceState.js +++ b/src/jmap/constant/deviceState.js @@ -127,7 +127,7 @@ deviceState[deviceType.Signal] = { State05: '05' /** 折返进路终端待选 */ }, /** 引导信号按钮状态类型 */ - guideState: { + guideStatus: { Default: '01', /** 空闲（缺省值）*/ State01: '01', /** 空闲 */ State02: '02' /** 引导 */ @@ -193,20 +193,20 @@ deviceState[deviceType.StationStand] = { State05: '03' /** 站台紧急关闭 */ }, /** 屏蔽门状态*/ - screenDoorState: { + screenDoorStatus: { Default: '01', /** 关门（缺省值）*/ State01: '01', /** 正常 */ State02: '02', /** 故障 */ State03: '03' /** 切除 */ }, /** 屏蔽门开门状态*/ - screenDoorOpenState: { + screenDoorOpenStatus: { Default: '01', /** 关门（缺省值）*/ State01: '01', /** 关门 */ State02: '02' /** 开门 */ }, /** 扣车状态*/ - holdState: { + holdStatus: { Default: '01', /** 未设置扣车（缺省值）*/ State01: '01', /** 未设置扣车*/ State02: '02', /** 车站扣车*/ @@ -214,7 +214,7 @@ deviceState[deviceType.StationStand] = { State04: '04' /** 中心+车站扣车*/ }, /** 跳停*/ - jumpStopState: { + jumpStopStatus: { Default: '01', /** 未设置跳停（缺省值）*/ State01: '01', /** 未设置跳停 */ State02: '02', /** 指定列车跳停 */ @@ -258,7 +258,7 @@ deviceState[deviceType.Train] = { State03: '03' /** 显示车组号（人工车），粉色 */ }, /** 目的地状态类型*/ - destinationState: { + destinationStatus: { Default: '01', /** 准点（缺省值）*/ State01: '01', /** 准点*/ State02: '02', /** 早点*/ @@ -276,7 +276,7 @@ deviceState[deviceType.Train] = { State03: '03' /** 从右向左 */ }, /** 运行状态*/ - runState: { + runStatus: { Default: '01', /** 停止（缺省值）*/ State01: '01', /** 停止 */ State02: '02' /** 运行 */ @@ -291,33 +291,33 @@ deviceState[deviceType.Train] = { State05: '05' /** 非限制人工驾驶模式 RM */ }, /** 运行控制状态类型*/ - runControlState: { + runControlStatus: { Default: '01', /** 正常（缺省值）*/ State01: '01', /** 正常 */ State02: '02', /** 扣车 */ State03: '03' /** 跳停 */ }, /** 车门状态 */ - doorState: { + doorStatus: { Default: '01', /** 关门（缺省值）*/ State01: '01', /** 关门 */ State02: '02', /** 开门 */ State03: '03' /** 故障 */ }, /** 通信状态类型*/ - communicationState: { + communicationStatus: { Default: '01', /** 正常（缺省值）*/ State01: '01', /** 正常 */ State02: '02' /** 故障 */ }, /** 计划冲突状态*/ - planConflictState: { + planConflictStatus: { Default: '01', /** 无冲突（缺省值）*/ State01: '01', /** 无冲突 */ State02: '02' /** 有冲突 */ }, /** 报警状态*/ - alarmState: { + alarmStatus: { Default: '01', /** 无报警（缺省值）*/ State01: '01', /** 无报警 */ State02: '02' /** 有报警 */ diff --git a/src/jmap/theme/batong_01/menus/utils/menuItemStatus.js b/src/jmap/theme/batong_01/menus/utils/menuItemStatus.js index 70ec00ab4..473ad3dc4 100644 --- a/src/jmap/theme/batong_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/batong_01/menus/utils/menuItemStatus.js @@ -240,21 +240,21 @@ export const MenuDisabledState = { // 设置扣车 setDetainTrain() { const device = getCurrentStateObject(); - if (device && device.holdState != deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) { return true; } }, // 取消扣车 cancelDetainTrain() { const device = getCurrentStateObject(); - if (device && device.holdState == deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { return true; } }, // 强制取消扣车 cancelDetainTrainForce() { const device = getCurrentStateObject(); - if (device && device.holdState == deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { return true; } }, @@ -270,14 +270,14 @@ export const MenuDisabledState = { // 设置跳停 setJumpStop() { const device = getCurrentStateObject(); - if (device && device.jumpStopState != deviceState.StationStand.jumpStopState.State01) { + if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { return true; } }, // 取消跳停 cancelJumpStop() { const device = getCurrentStateObject(); - if (device && device.jumpStopState == deviceState.StationStand.jumpStopState.State01) { + if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { return true; } }, diff --git a/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js b/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js index 9ef778655..d906e50f5 100644 --- a/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js @@ -231,21 +231,21 @@ export const MenuDisabledState = { // 设置扣车 setDetainTrain() { const device = getCurrentStateObject(); - if (device && device.holdState != deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) { return true; } }, // 取消扣车 cancelDetainTrain() { const device = getCurrentStateObject(); - if (device && device.holdState == deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { return true; } }, // 强制取消扣车 cancelDetainTrainForce() { const device = getCurrentStateObject(); - if (device && device.holdState == deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { return true; } }, @@ -261,14 +261,14 @@ export const MenuDisabledState = { // 设置跳停 setJumpStop() { const device = getCurrentStateObject(); - if (device && device.jumpStopState != deviceState.StationStand.jumpStopState.State01) { + if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { return true; } }, // 取消跳停 cancelJumpStop() { const device = getCurrentStateObject(); - if (device && device.jumpStopState == deviceState.StationStand.jumpStopState.State01) { + if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { return true; } }, diff --git a/src/jmap/theme/chengdou_03/menus/utils/menuItemStatus.js b/src/jmap/theme/chengdou_03/menus/utils/menuItemStatus.js index 555e7cbc1..87a9b417a 100644 --- a/src/jmap/theme/chengdou_03/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/chengdou_03/menus/utils/menuItemStatus.js @@ -235,21 +235,21 @@ export const MenuDisabledState = { // 设置扣车 setDetainTrain() { const device = getCurrentStateObject(); - if (device && device.holdState != deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) { return true; } }, // 取消扣车 cancelDetainTrain() { const device = getCurrentStateObject(); - if (device && device.holdState == deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { return true; } }, // 强制取消扣车 cancelDetainTrainForce() { const device = getCurrentStateObject(); - if (device && device.holdState == deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { return true; } }, @@ -265,14 +265,14 @@ export const MenuDisabledState = { // 设置跳停 setJumpStop() { const device = getCurrentStateObject(); - if (device && device.jumpStopState != deviceState.StationStand.jumpStopState.State01) { + if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { return true; } }, // 取消跳停 cancelJumpStop() { const device = getCurrentStateObject(); - if (device && device.jumpStopState == deviceState.StationStand.jumpStopState.State01) { + if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { return true; } }, diff --git a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js index dd4e680bf..7a944390a 100644 --- a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js @@ -241,11 +241,11 @@ export const MenuDisabledState = { setDetainTrain() { const device = getCurrentStateObject(); if (store.state.training.prdType == '02') { - if (device && device.holdState == deviceState.StationStand.holdState.State03) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) { return true; } } else { - if (device && device.holdState == deviceState.StationStand.holdState.State02) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) { return true; } } @@ -254,11 +254,11 @@ export const MenuDisabledState = { cancelDetainTrain() { const device = getCurrentStateObject(); if (store.state.training.prdType == '02') { - if (device && device.holdState == deviceState.StationStand.holdState.State03) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) { return true; } } else { - if (device && device.holdState != deviceState.StationStand.holdState.State02) { + if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) { return true; } } @@ -266,7 +266,7 @@ export const MenuDisabledState = { // 强制取消扣车 cancelDetainTrainForce() { const device = getCurrentStateObject(); - if (device && device.holdState == deviceState.StationStand.holdState.State01) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { return true; } }, @@ -282,14 +282,14 @@ export const MenuDisabledState = { // 设置跳停 setJumpStop() { const device = getCurrentStateObject(); - if (device && device.jumpStopState != deviceState.StationStand.jumpStopState.State01) { + if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { return true; } }, // 取消跳停 cancelJumpStop() { const device = getCurrentStateObject(); - if (device && device.jumpStopState == deviceState.StationStand.jumpStopState.State01) { + if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { return true; } },