diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js index 9f610c48b..21664f9aa 100644 --- a/src/i18n/langs/en/map.js +++ b/src/i18n/langs/en/map.js @@ -103,6 +103,7 @@ export default { statusSignalName: 'Status signal name:', stateSignalsPlotCoordinates: 'State signals plot coordinates:', equipmentStation: 'Equipment centralization station:', + signalNoRoute:'No route', lineCoding: 'Line coding:', lineType: 'Line type:', diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index fc63f9bee..997b1996c 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -82,6 +82,7 @@ export default { statusSignalName: '状态信号名称:', stateSignalsPlotCoordinates: '状态信号画图坐标:', equipmentStation: '所属设备集中站', + signalNoRoute:'不生成进路', lineCoding: '线条编码:', lineType: '线条类型:', diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index c2f7d2649..0f74e1e49 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -482,21 +482,21 @@ export const OperationEvent = { operation: '00a44', domId: '_Tips-ningBo-line-user-reclaim{TOP}' }, - // 列车 - train: { - operation: '00b', + // 列车 + train: { + operation: '00b', domId: '_Tips-ningBo-train{TOP}' - }, - // 列车-操作 - train_operate: { - operation: '00b0', + }, + // 列车-操作 + train_operate: { + operation: '00b0', domId: '_Tips-ningBo-train-operate{TOP}' - }, - // 列车-操作-跳停 - train_operate_jump: { - operation: '00b01', - domId: '_Tips-ningBo-train-operate-jump{TOP}' - }, + }, + // 列车-操作-跳停 + train_operate_jump: { + operation: '00b01', + domId: '_Tips-ningBo-train-operate-jump{TOP}' + } } }, // 站台概要表 diff --git a/src/views/newMap/newMapdraft/mapoperate/models.js b/src/views/newMap/newMapdraft/mapoperate/models.js index 4005ba7fa..766b8ecb5 100644 --- a/src/views/newMap/newMapdraft/mapoperate/models.js +++ b/src/views/newMap/newMapdraft/mapoperate/models.js @@ -86,6 +86,7 @@ class Model { this.ctc = true; // 是否灭灯显示 this.noOverlap = false; // 是否无延续保护 this.routeEnd = false; // 是否进路终端 + this.noRoute = false; // 是否不生成进路 this.ignoreRouteEnd = []; // 不生成进路的信号机终端 this.linkSignalCode = ''; // 传输信号机 关联信号机 } diff --git a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue index f94e763f1..9a9f3235b 100644 --- a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue @@ -143,7 +143,8 @@ export default { { prop: 'ctc', label: '是否灭灯显示(CTC级)', type: 'checkbox'}, { prop: 'noOverlap', label: '是否无延续保护', type: 'checkbox'}, { prop: 'routeEnd', label: '是否进路终端', type: 'checkbox'}, - { prop: 'ignoreRouteEnd', label: '不生成进路的信号机终端', type: 'multiSelectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.signalList, hover: this.hover, buttonType: 'signalIgnoreRouteEnd', buttonShowType: this.signalIgnoreRouteEnd } + { prop: 'ignoreRouteEnd', label: '不生成进路的信号机终端', type: 'multiSelectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.signalList, hover: this.hover, buttonType: 'signalIgnoreRouteEnd', buttonShowType: this.signalIgnoreRouteEnd }, + { prop: 'noRoute', label: this.$t('map.signalNoRoute') + ':', type: 'checkbox'} ] },