diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js index 732860278..4331c55bd 100644 --- a/src/jmap/shape/StationStand/index.js +++ b/src/jmap/shape/StationStand/index.js @@ -250,6 +250,7 @@ class StationStand extends Group { /** 中心+车站扣车*/ standAndCenterDetainTrain() { this.detain && this.detain.show(); + this.detain && this.detain.setColor(this.style.StationStand.detainCar.andCenterTrainColor); } /** 人工设置停战时间*/ diff --git a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js index 5882a171e..e1d26ee45 100644 --- a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js @@ -240,12 +240,16 @@ export const MenuDisabledState = { // 设置扣车 setDetainTrain() { const device = getCurrentStateObject(); - if (store.state.training.prdType == '02') { - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) { + if (store.state.training.prdType == '02') { // 中心行调模式 + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) { + return true; + } else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) { return true; } - } else { - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) { + } else { // 现地模式 + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) { + return true; + } else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) { return true; } } @@ -254,11 +258,15 @@ export const MenuDisabledState = { cancelDetainTrain() { const device = getCurrentStateObject(); if (store.state.training.prdType == '02') { - if (device && device.holdStatus != deviceState.StationStand.holdStatus.State03) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) { + return false; + } else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State03) { return true; } } else { - if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) { + if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) { + return false; + } else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) { return true; } } diff --git a/src/views/lesson/trainingrecord/category/draft.vue b/src/views/lesson/trainingrecord/category/draft.vue index 2781d4ec7..6d91e27b6 100644 --- a/src/views/lesson/trainingrecord/category/draft.vue +++ b/src/views/lesson/trainingrecord/category/draft.vue @@ -176,7 +176,7 @@ export default { } if (node && node.data) { switch (node.data.type) { - case 'trainingType': + case 'TrainingType': if (node.parent) { this.operateModel.type = node.data.id; this.operateModel.prdCode = node.parent.data.id; @@ -196,7 +196,7 @@ export default { this.operateModel.operateType = ''; this.operationList = this.trainingOperateTypeMap[node.data.id] || []; break; - case 'training': + case 'Training': if (node.parent && node.parent.parent) { this.operateModel.type = node.parent.data.id; this.operateModel.prdCode = node.parent.parent.data.id; diff --git a/src/views/lesson/trainingrecord/category/operateMenu.vue b/src/views/lesson/trainingrecord/category/operateMenu.vue index ec39297d1..2c5dd04a8 100644 --- a/src/views/lesson/trainingrecord/category/operateMenu.vue +++ b/src/views/lesson/trainingrecord/category/operateMenu.vue @@ -84,7 +84,6 @@ export default { doShow(point) { this.closeEvent(); if (this.$refs && this.$refs.popMenu) { - console.log('22222222333') this.$refs.popMenu.resetShowPosition(point); } this.menuShow = true;