diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js index 30df092d5..75bb13fa9 100644 --- a/src/jmapNew/config/skinCode/ningbo_03.js +++ b/src/jmapNew/config/skinCode/ningbo_03.js @@ -395,9 +395,9 @@ class SkinCode extends defaultStyle { designatedJumpStopColor: 'lightSkyBlue', // 站台指定列车跳停颜色 headFontSize: 10, // 站台首端字体大小 doorOpenColor:'#00FF00', // 车门开启状态颜色 - stopColor: 'yellow', // 站台列车停站颜色 + stopColor: '#0080C0', // 站台列车停站颜色 virtualColor: '#585858', // 虚拟站台颜色 - lineWidth: 3 // 站台线宽 + lineWidth: 6 // 站台线宽 }, // 站台紧急关闭 emergentRhombus:{ diff --git a/src/jmapNew/shape/Section/ELines.js b/src/jmapNew/shape/Section/ELines.js index 4f31954d4..b616dbadb 100644 --- a/src/jmapNew/shape/Section/ELines.js +++ b/src/jmapNew/shape/Section/ELines.js @@ -173,7 +173,7 @@ export default class ELines extends Group { }); this.routeArrowRight = new Isogon({ zlevel: this.zlevel, - origin: [cPointLeft.x, cPointLeft.y], + origin: [cPointRight.x, cPointRight.y], rotation: -Math.PI / 2 - triangleRight.getRotation(), z: Z + 9, shape: { @@ -191,7 +191,7 @@ export default class ELines extends Group { this.routeLineLeft = new Polyline({ zlevel: this.zlevel, progressive: model.progressive, - z: Z, + z: Z + 9, shape: { points: pointsLeft }, @@ -203,7 +203,7 @@ export default class ELines extends Group { this.routeLineRight = new Polyline({ zlevel: this.zlevel, progressive: model.progressive, - z: Z, + z: Z + 9, shape: { points: pointsRight }, @@ -344,8 +344,8 @@ export default class ELines extends Group { this.routeLineRight && this.routeLineRight.hide(); this.routeArrowLeft && this.routeArrowLeft.setStyle({ stroke: this.model.style.Section.routeArrow.defaultArrowStroke, fill: this.model.style.Section.routeArrow.defaultArrowFill }); this.routeArrowRight && this.routeArrowRight.setStyle({ stroke: this.model.style.Section.routeArrow.defaultArrowStroke, fill: this.model.style.Section.routeArrow.defaultArrowFill }); - this.routeLineLeft && this.routeLineLeft.setStyle({ fill: this.model.style.Section.routeArrow.defaultLineStroke }); - this.routeArrowRight && this.routeArrowRight.setStyle({ fill: this.model.style.Section.routeArrow.defaultLineStroke }); + this.routeLineLeft && this.routeLineLeft.setStyle({ stroke: this.model.style.Section.routeArrow.defaultLineStroke }); + this.routeLineRight && this.routeLineRight.setStyle({ stroke: this.model.style.Section.routeArrow.defaultLineStroke }); } getBoundingRect() { if (this.section) { diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 03e225d1e..8bb3e8274 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -147,12 +147,13 @@ export default class Section extends Group { }); } /** 进路锁闭 04*/ - routeLock() { + routeLock(lockRight) { if (this.line) { this.line.setStyle({ stroke: this.style.Section.line.routeLockColor, lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth }); + this.line.setRouteLock(lockRight); } } @@ -260,7 +261,7 @@ export default class Section extends Group { /** 道岔保护区段锁闭 */ model.overlapLock && this.protectiveLock(); /** 空闲锁闭或者叫进路锁闭 */ - model.routeLock && this.routeLock(); + model.routeLock && this.routeLock(model.lockRight); /** 轨道封锁 */ model.invalid && this.invalid(); /** 计轴故障 */ diff --git a/src/jmapNew/shape/StationStand/EPatternFilter.js b/src/jmapNew/shape/StationStand/EPatternFilter.js index e29c4c863..bf980c0b6 100644 --- a/src/jmapNew/shape/StationStand/EPatternFilter.js +++ b/src/jmapNew/shape/StationStand/EPatternFilter.js @@ -11,7 +11,10 @@ class EPatternFilter extends Group { create() { const model = this.model.modelData; const style = this.model.style; - const direction = model.right ? 1 : -1; + let direction = -1; + if ((model.right && model.inside) || (!model.right && !model.inside)) { + direction = 1; + } const startX = (model.width / 2 + style.StationStand.patternFilter.offset.x); const startY = model.position.y + (model.height / 2 + style.StationStand.patternFilter.offset.y) * direction + (1 + direction) / 2 * 14; diff --git a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js index 5ef4d9b4b..60b2fc005 100644 --- a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js +++ b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js @@ -25,7 +25,9 @@ class ESolidStand extends Group { height: model.height }, style: { - 'fill':style.StationStand.solidStand.spareColor + fill:style.StationStand.solidStand.spareColor, + lineWidth: style.StationStand.solidStand.lineWidth || 0, + stroke: style.StationStand.solidStand.spareStrokeColor } }); this.add(this.stand); @@ -61,7 +63,9 @@ class ESolidStand extends Group { setColor(color) { this.stand.setStyle('fill', color); } - + setStroke(color) { + this.stand.setStyle('stroke', color); + } recover() { const style = this.model.style; this.setColor(style.StationStand.solidStand.spareColor); @@ -77,6 +81,7 @@ class ESolidStand extends Group { model.allSkip && this.setColor(style.StationStand.solidStand.jumpStopColor); // 停车 model.trainParking && this.setColor(style.StationStand.solidStand.stopColor); + model.trainParking && this.setStroke(style.StationStand.solidStand.doorOpenColor); // 紧急停车 model.emergencyClosed && this.setColor(this.style.StationStand.solidStand.spareColor); } else { diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue index 3395cadc9..88d3b52c0 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue @@ -51,53 +51,53 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '区段故障解锁', - handler: this.fault, - cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK - }, - { - label: '区段跟踪激活', - handler: this.active, - cmdType: CMD.Section.CMD_SECTION_ACTIVE - }, - { - label: '区段跟踪切除', - handler: this.split, - cmdType: CMD.Section.CMD_SECTION_CUT_OFF - }, - { - label: '区段封锁', - handler: this.lock, - cmdType: CMD.Section.CMD_SECTION_BLOCK - }, - { - label: '区段解封', - handler: this.unlock, - cmdType: CMD.Section.CMD_SECTION_UNBLOCK - } + // { + // label: '区段故障解锁', + // handler: this.fault, + // cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK + // }, + // { + // label: '区段跟踪激活', + // handler: this.active, + // cmdType: CMD.Section.CMD_SECTION_ACTIVE + // }, + // { + // label: '区段跟踪切除', + // handler: this.split, + // cmdType: CMD.Section.CMD_SECTION_CUT_OFF + // }, + // { + // label: '区段封锁', + // handler: this.lock, + // cmdType: CMD.Section.CMD_SECTION_BLOCK + // }, + // { + // label: '区段解封', + // handler: this.unlock, + // cmdType: CMD.Section.CMD_SECTION_UNBLOCK + // } ], Center: [ - { - label: '区段跟踪激活', - handler: this.active, - cmdType: CMD.Section.CMD_SECTION_ACTIVE - }, - { - label: '区段跟踪切除', - handler: this.split, - cmdType: CMD.Section.CMD_SECTION_CUT_OFF - }, - { - label: '确认计轴有效', - handler: this.alxeEffective, - cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE - }, - { - label: '设置临时限速', - handler: this.setSpeed, - cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED - } + // { + // label: '区段跟踪激活', + // handler: this.active, + // cmdType: CMD.Section.CMD_SECTION_ACTIVE + // }, + // { + // label: '区段跟踪切除', + // handler: this.split, + // cmdType: CMD.Section.CMD_SECTION_CUT_OFF + // }, + // { + // label: '确认计轴有效', + // handler: this.alxeEffective, + // cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE + // }, + // { + // label: '设置临时限速', + // handler: this.setSpeed, + // cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED + // } ] }, menuForce: [ diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue index 713dcd76e..87299c3fa 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue @@ -54,113 +54,113 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '排列进路', - handler: this.arrangementRoute, - cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE - }, - { - label: '取消进路', - handler: this.cancelTrainRoute, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE - }, - { - label: '信号重开', - handler: this.reopenSignal, - cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL - }, - { - label: '信号机引导办理', - handler: this.guide, - cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE - }, - { - label: '人工解锁进路', // 信号机引导取消 - handler: this.humanTrainRoute, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE - }, - { - label: '信号封锁', - handler: this.lock, - cmdType: CMD.Signal.CMD_SIGNAL_BLOCK - }, - { - label: '信号解封', - handler: this.unlock, - cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK - }, - { - label: 'Fleet进路办理', - handler: this.singalPassModel, - cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO - }, - { - label: 'Fleet进路取消', - handler: this.singalCancelPassModel, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO - }, - { - label: '进路交人工控', - handler: this.humanControl, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING - }, - { - label: '进路交自动控', - handler: this.atsAutoControl, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING - }, - { - label: '查询进路控制状态', - handler: this.detail, - cmdType: CMD.Signal.CMD_SIGNAL_DETAIL - } + // { + // label: '排列进路', + // handler: this.arrangementRoute, + // cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE + // }, + // { + // label: '取消进路', + // handler: this.cancelTrainRoute, + // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE + // }, + // { + // label: '信号重开', + // handler: this.reopenSignal, + // cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL + // }, + // { + // label: '信号机引导办理', + // handler: this.guide, + // cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE + // }, + // { + // label: '人工解锁进路', // 信号机引导取消 + // handler: this.humanTrainRoute, + // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE + // }, + // { + // label: '信号封锁', + // handler: this.lock, + // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK + // }, + // { + // label: '信号解封', + // handler: this.unlock, + // cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK + // }, + // { + // label: 'Fleet进路办理', + // handler: this.singalPassModel, + // cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO + // }, + // { + // label: 'Fleet进路取消', + // handler: this.singalCancelPassModel, + // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO + // }, + // { + // label: '进路交人工控', + // handler: this.humanControl, + // cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + // }, + // { + // label: '进路交自动控', + // handler: this.atsAutoControl, + // cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + // }, + // { + // label: '查询进路控制状态', + // handler: this.detail, + // cmdType: CMD.Signal.CMD_SIGNAL_DETAIL + // } ], Center: [ - { - label: '排列进路', - handler: this.arrangementRoute, - cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE - }, - { - label: '取消进路', - handler: this.cancelTrainRoute, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE - }, - { - label: '人工解锁进路', // 信号机引导取消 - handler: this.humanTrainRoute, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE - }, - { - label: '信号重开', - handler: this.reopenSignal, - cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL - }, - { - label: '进路交人工控', - handler: this.humanControl, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING - }, - { - label: '进路交自动控', - handler: this.atsAutoControl, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING - }, - { - label: '设置通过模式', - handler: this.singalPassModel, - cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO - }, - { - label: '取消通过模式', - handler: this.singalCancelPassModel, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO - }, - { - label: '查询进路控制状态', - handler: this.detail, - cmdType: CMD.Signal.CMD_SIGNAL_DETAIL - } + // { + // label: '排列进路', + // handler: this.arrangementRoute, + // cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE + // }, + // { + // label: '取消进路', + // handler: this.cancelTrainRoute, + // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE + // }, + // { + // label: '人工解锁进路', // 信号机引导取消 + // handler: this.humanTrainRoute, + // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE + // }, + // { + // label: '信号重开', + // handler: this.reopenSignal, + // cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL + // }, + // { + // label: '进路交人工控', + // handler: this.humanControl, + // cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + // }, + // { + // label: '进路交自动控', + // handler: this.atsAutoControl, + // cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + // }, + // { + // label: '设置通过模式', + // handler: this.singalPassModel, + // cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO + // }, + // { + // label: '取消通过模式', + // handler: this.singalCancelPassModel, + // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO + // }, + // { + // label: '查询进路控制状态', + // handler: this.detail, + // cmdType: CMD.Signal.CMD_SIGNAL_DETAIL + // } ] }, menuForce: [ diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStation.vue b/src/jmapNew/theme/ningbo_03/menus/menuStation.vue index 2dee4c8ad..18c2895bb 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuStation.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuStation.vue @@ -46,43 +46,43 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '全站设置联锁自动触发', - handler: this.setAutoTrigger, - cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER - }, - { - label: '全站取消联锁自动触发', - handler: this.cancelAutoTrigger, - cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER - }, - { - label: '上电解锁', - handler: this.powerUnLock, - cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK - }, - { - label: '执行关键操作测试', - handler: this.execKeyOperationTest, - cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST - } + // { + // label: '全站设置联锁自动触发', + // handler: this.setAutoTrigger, + // cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER + // }, + // { + // label: '全站取消联锁自动触发', + // handler: this.cancelAutoTrigger, + // cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER + // }, + // { + // label: '上电解锁', + // handler: this.powerUnLock, + // cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK + // }, + // { + // label: '执行关键操作测试', + // handler: this.execKeyOperationTest, + // cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST + // } ], Center: [ - { - label: '所有进路自排关', - handler: this.humanControlALL, - cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING - }, - { - label: '所有进路自排开', - handler: this.atsAutoControlALL, - cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING - }, - { - label: '执行关键操作测试', - handler: this.execKeyOperationTest, - cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST - } + // { + // label: '所有进路自排关', + // handler: this.humanControlALL, + // cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING + // }, + // { + // label: '所有进路自排开', + // handler: this.atsAutoControlALL, + // cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING + // }, + // { + // label: '执行关键操作测试', + // handler: this.execKeyOperationTest, + // cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST + // } ] }, menuForce: [ diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_03/menus/menuStationControl.vue index 0425495e9..51c66c414 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuStationControl.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuStationControl.vue @@ -33,28 +33,28 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '请求站控', - handler: this.setStationControl, - cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL - }, - { - label: '请求遥控', - handler: this.setCenterControl, - cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL - } + // { + // label: '请求站控', + // handler: this.setStationControl, + // cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL + // }, + // { + // label: '请求遥控', + // handler: this.setCenterControl, + // cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL + // } ], Center: [ - { - label: '请求站控', - handler: this.setStationControl, - cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL - }, - { - label: '请求遥控', - handler: this.setCenterControl, - cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL - } + // { + // label: '请求站控', + // handler: this.setStationControl, + // cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL + // }, + // { + // label: '请求遥控', + // handler: this.setCenterControl, + // cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL + // } ] }, menuForce: [ diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue index 7c3256916..3fadc687a 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue @@ -54,88 +54,88 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '扣车', - handler: this.setDetainTrain, - cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN - }, - { - label: '取消扣车', - handler: this.cancelDetainTrain, - cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN - }, - { - label: '提前发车', - handler: this.earlyDeparture, - cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART - }, - { - label: '站台详细信息', - handler: this.detail, - cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS - } + // { + // label: '扣车', + // handler: this.setDetainTrain, + // cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN + // }, + // { + // label: '取消扣车', + // handler: this.cancelDetainTrain, + // cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN + // }, + // { + // label: '提前发车', + // handler: this.earlyDeparture, + // cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART + // }, + // { + // label: '站台详细信息', + // handler: this.detail, + // cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS + // } ], Center: [ - { - label: '扣车', - handler: this.setDetainTrain, - cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN - }, - { - label: '取消扣车', - handler: this.cancelDetainTrain, - cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN - }, - { - label: '批量扣车', - handler: this.setBulkBuckleTrain, - cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL - }, - { - label: '批量取消扣车', - handler: this.cancelBulkBuckleTrain, - cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL - }, - { - label: '提前发车', - handler: this.earlyDeparture, - cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART - }, - { - label: '设置跳停', - handler: this.setJumpStop, - cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP - }, - { - label: '取消跳停', - handler: this.cancelJumpStop, - cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP - }, - { - label: '设置停站时间', - handler: this.setStopTime, - cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME - }, - { - label: '设置运行等级', - handler: this.setRunLevel, - cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME - }, - { - label: '区间列车数量限制', - handler: this.setDetainTrainAll, - cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO - }, - { - label: '取消区间列车数量限制', - handler: this.cancelDetainTrainAll, - cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO - }, - { - label: '查看站台信息', - handler: this.detail, - cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS - } + // { + // label: '扣车', + // handler: this.setDetainTrain, + // cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN + // }, + // { + // label: '取消扣车', + // handler: this.cancelDetainTrain, + // cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN + // }, + // { + // label: '批量扣车', + // handler: this.setBulkBuckleTrain, + // cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL + // }, + // { + // label: '批量取消扣车', + // handler: this.cancelBulkBuckleTrain, + // cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL + // }, + // { + // label: '提前发车', + // handler: this.earlyDeparture, + // cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART + // }, + // { + // label: '设置跳停', + // handler: this.setJumpStop, + // cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP + // }, + // { + // label: '取消跳停', + // handler: this.cancelJumpStop, + // cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP + // }, + // { + // label: '设置停站时间', + // handler: this.setStopTime, + // cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME + // }, + // { + // label: '设置运行等级', + // handler: this.setRunLevel, + // cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME + // }, + // { + // label: '区间列车数量限制', + // handler: this.setDetainTrainAll, + // cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO + // }, + // { + // label: '取消区间列车数量限制', + // handler: this.cancelDetainTrainAll, + // cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO + // }, + // { + // label: '查看站台信息', + // handler: this.detail, + // cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS + // } ] }, menuForce: [ diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue index a666f4f4f..ace1ccb4a 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue @@ -52,87 +52,87 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '定操', - handler: this.locate, - cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION - }, - { - label: '反操', - handler: this.reverse, - cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION - }, - { - label: '道岔单锁', - handler: this.lock, - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK - }, - { - label: '道岔单解', - handler: this.unlock, - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK - }, - { - label: '道岔封锁', - handler: this.block, - cmdType: CMD.Switch.CMD_SWITCH_BLOCK - }, - { - label: '道岔解封', - handler: this.unblock, - cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK - } - ], - Center: [ - { - label: '定操', - handler: this.locate, - cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION - }, - { - label: '反操', - handler: this.reverse, - cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION - }, + // { + // label: '定操', + // handler: this.locate, + // cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION + // }, + // { + // label: '反操', + // handler: this.reverse, + // cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION + // }, // { // label: '道岔单锁', // handler: this.lock, // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK // }, - { - type: 'separator' - }, - { - label: '区段激活', - handler: this.active, - cmdType: CMD.Switch.CMD_SWITCH_ACTIVE - }, - { - label: '区段切除', - handler: this.split, - cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF - }, - { - type: 'separator' - }, - { - label: '确认计轴有效', - handler: this.alxeEffective, - cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE - }, - { - label: '设置临时限速', - handler: this.setSpeed, - cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED - }, - { - type: 'separator' - }, - { - label: '查看公里标', - handler: this.undeveloped, - cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED - } + // { + // label: '道岔单解', + // handler: this.unlock, + // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK + // }, + // { + // label: '道岔封锁', + // handler: this.block, + // cmdType: CMD.Switch.CMD_SWITCH_BLOCK + // }, + // { + // label: '道岔解封', + // handler: this.unblock, + // cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK + // } + ], + Center: [ + // { + // label: '定操', + // handler: this.locate, + // cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION + // }, + // { + // label: '反操', + // handler: this.reverse, + // cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION + // }, + // { + // label: '道岔单锁', + // handler: this.lock, + // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK + // }, + // { + // type: 'separator' + // }, + // { + // label: '区段激活', + // handler: this.active, + // cmdType: CMD.Switch.CMD_SWITCH_ACTIVE + // }, + // { + // label: '区段切除', + // handler: this.split, + // cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF + // }, + // { + // type: 'separator' + // }, + // { + // label: '确认计轴有效', + // handler: this.alxeEffective, + // cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE + // }, + // { + // label: '设置临时限速', + // handler: this.setSpeed, + // cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED + // }, + // { + // type: 'separator' + // }, + // { + // label: '查看公里标', + // handler: this.undeveloped, + // cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED + // } ] }, menuForce: [ diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue index 8577e224c..58e202399 100644 --- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue +++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue @@ -134,7 +134,7 @@ export default { name: this.$t('map.drawData'), item: [ { prop:'type', label: this.$t('map.saidLampType'), type: 'select', optionLabel: 'name', optionValue: 'value', options: this.typeList, deviceChange: this.typeChange }, - { prop: 'code', label: `${this.$t('map.code')}`, type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.selectLists, deviceChange: this.deviceChange }, + { prop: 'code', label: `${this.$t('map.code')}`, type: 'select', optionLabel: 'code', optionValue: 'code', options: this.selectLists, deviceChange: this.deviceChange }, { prop: 'name', label: this.$t('map.saidLampName'), type: 'input', isHidden: this.noNameTypeList.includes(this.editModel.type) }, { prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '140px', children: [ { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' }, diff --git a/src/views/newMap/newMapdraft/mapoperate/models.js b/src/views/newMap/newMapdraft/mapoperate/models.js index bd6b9a4d0..4349b849c 100644 --- a/src/views/newMap/newMapdraft/mapoperate/models.js +++ b/src/views/newMap/newMapdraft/mapoperate/models.js @@ -192,5 +192,6 @@ class Model { export default function getModel(type) { const model = new Model(type); + // console.log(model, type, '****'); return model; }