diff --git a/src/jmapNew/theme/components/menus/dialog/standStopTime.vue b/src/jmapNew/theme/components/menus/dialog/standStopTime.vue index f22985c20..8d0384fd7 100644 --- a/src/jmapNew/theme/components/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/components/menus/dialog/standStopTime.vue @@ -152,9 +152,9 @@ export default { this.stationName = station.name; } } - // this.control = selected.parkingTime == 0 ? '01' : '02'; - // this.time = selected.parkingTime ? Number(selected.parkingTime) : 30; - // this.effective = selected.parkingAlwaysValid == '1'; + this.control = selected.parkingTime == 0 ? '01' : '02'; + this.time = selected.parkingTime ? Number(selected.parkingTime) : 30; + this.effective = selected.parkingAlwaysValid == '1'; } this.dialogShow = true; this.$nextTick(function () { diff --git a/src/jmapNew/theme/foshan_01/menus/menuStation.vue b/src/jmapNew/theme/foshan_01/menus/menuStation.vue index edb23e922..e0d9deaa4 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStation.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStation.vue @@ -47,36 +47,12 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '全站设置联锁自动触发', - handler: this.setAutoTrigger - }, - { - label: '全站取消联锁自动触发', - handler: this.cancelAutoTrigger - }, { label: '上电解锁', handler: this.powerUnLock - }, - { - label: '执行关键操作测试', - handler: this.execKeyOperationTest } ], Center: [ - { - label: '所有进路自排关', - handler: this.humanControlALL - }, - { - label: '所有进路自排开', - handler: this.atsAutoControlALL - }, - { - label: '执行关键操作测试', - handler: this.execKeyOperationTest - } ] }, menuForce: [ @@ -123,7 +99,6 @@ export default { }, initMenu() { // 编辑模式菜单列表 - if (this.selected.centralized) { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { @@ -165,42 +140,6 @@ export default { } }); }, - // 全站设置联锁自动触发 - setAutoTrigger() { - const operate = { - start: true, - send: true, - code: this.selected.code, - type: MapDeviceType.Station.type, - label: MapDeviceType.Station.label, - operation: OperationEvent.Station.setAutoTrigger.menu.operation - }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } - }).catch(() => { - this.$refs.noticeInfo.doShow(); - }); - }, - // 全站取消联锁自动触发 - cancelAutoTrigger() { - const operate = { - start: true, - send: true, - code: this.selected.code, - type: MapDeviceType.Station.type, - label: MapDeviceType.Station.label, - operation: OperationEvent.Station.cancelAutoTrigger.menu.operation - }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } - }).catch(() => { - this.$refs.noticeInfo.doShow(); - }); - }, // 上电解锁 powerUnLock() { const operate = { @@ -217,54 +156,6 @@ export default { } }); }, - // 执行关键操作测试 - execKeyOperationTest() { - const operate = { - start: true, - code: this.selected.code, - type: MapDeviceType.Station.type, - label: MapDeviceType.Station.label, - operation: OperationEvent.Station.execKeyOperationTest.menu.operation - }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.stationCmdControl.doShow(operate, this.selected); - } - }); - }, - // 所有进路自排关 - humanControlALL() { - const operate = { - start: true, - code: this.selected.code, - type: MapDeviceType.Station.type, - label: MapDeviceType.Station.label, - operation: OperationEvent.Station.humanControlALL.menu.operation - }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.stationHumanControlAll.doShow(operate, this.selected); - } - }); - }, - // 所有进路自排开 - atsAutoControlALL() { - const operate = { - start: true, - code: this.selected.code, - type: MapDeviceType.Station.type, - label: MapDeviceType.Station.label, - operation: OperationEvent.Station.stationSetRouteControlAll.menu.operation - }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.stationSetRouteControlAll.doShow(operate, this.selected); - } - }); - }, triggerFaultManagement() { this.$store.dispatch('training/setTriggerFaultCount', this.selected); } diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue index d18ca0e27..bd77f3190 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue @@ -172,12 +172,12 @@ export default { // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER // }, { - label: this.$t('menu.menuSignal.humanControl'), + label: '进路交人工控', handler: this.humanControl, cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING }, { - label: this.$t('menu.menuSignal.atsAutoControl'), + label: '进路交ATS自动控', handler: this.atsAutoControl, cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING }, diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue index 1ffebd905..0ce2c2713 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue @@ -70,12 +70,12 @@ export default { ], Center: [ { - label: this.$t('menu.menuStation.allHumanControl'), + label: '全站进路交人工控', handler: this.humanControlALL, cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING }, { - label: this.$t('menu.menuStation.allATSAutoControl'), + label: '全站进路ATS自排', handler: this.atsAutoControlALL, cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING }, diff --git a/src/jmapNew/theme/fuzhou_01/operationConfig.js b/src/jmapNew/theme/fuzhou_01/operationConfig.js index 875540fa7..42705fb3a 100644 --- a/src/jmapNew/theme/fuzhou_01/operationConfig.js +++ b/src/jmapNew/theme/fuzhou_01/operationConfig.js @@ -94,11 +94,10 @@ export default { { deviceType: '05', orderNum: 8, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } ] }, - // 未生成 { maxDuration: 15, minDuration: 8, - operateType: 'CMD_STATION_SET_CI_AUTO_TRIGGER', + operateType: 'Station_Set_CI_Auto_Trigger', skinCode: '07', trainingName: '全站设置联锁自动触发({26})', trainingRemark: '全站设置联锁自动触发', @@ -108,11 +107,10 @@ export default { { deviceType: '04', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】' } ] }, - // 未生成 { maxDuration: 15, minDuration: 8, - operateType: 'CMD_STATION_CANCEL_CI_AUTO_TRIGGER', + operateType: 'Station_Cancel_CI_Auto_Trigger', skinCode: '07', trainingName: '全站取消联锁自动触发({26})', trainingRemark: '全站取消联锁自动触发', @@ -917,6 +915,35 @@ export default { { deviceType: '04', orderNum: 1, operateCode: '312', tip: '鼠标右键菜单选择【取消联锁自动触发】' }, { deviceType: '04', orderNum: 2, operateCode: '312', tip: '鼠标左键点击【确定】按钮' } ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: 'Station_Close_Auto_Setting', + skinCode: '07', + trainingName: '全站进路交人工控({26})', + trainingRemark: '全站进路交人工控', + trainingType: 'Station', + productTypes: ['02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '605', tip: '鼠标右键菜单选择【全站进路交人工控】' }, + { deviceType: '04', orderNum: 2, operateCode: '605', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: 'Station_Open_Auto_Setting', + skinCode: '07', + trainingName: '全站进路ATS自排({26})', + trainingRemark: '全站进路ATS自排', + trainingType: 'Station', + productTypes: ['02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '606', tip: '鼠标右键菜单选择【全站进路ATS自排】' }, + { deviceType: '04', orderNum: 2, operateCode: '606', tip: '鼠标左键点击【确定】按钮', val: 'true' } + ] } + ] }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue index c720b89a9..9873e4f56 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue @@ -130,10 +130,12 @@ export default { }; }, initMenu() { - this.menu = MenuContextHandler.covert(this.menuNormal); - // 故障模式菜单列表 - if (this.operatemode === OperateMode.FAULT) { - this.menu = this.menuForce; + if (this.selected.centralized) { + this.menu = MenuContextHandler.covert(this.menuNormal); + // 故障模式菜单列表 + if (this.operatemode === OperateMode.FAULT) { + this.menu = this.menuForce; + } } }, doShow(point) { @@ -142,6 +144,7 @@ export default { if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) { this.$refs.popMenu.resetShowPosition(point); } + }, doClose() { if (this.$refs && this.$refs.popMenu) { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue index 18d8095d1..90cfb87c1 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue @@ -124,15 +124,15 @@ export default { 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 } + // { + // type: 'separator' + // }, + // { + // label: '查看公里标', + // handler: this.undeveloped, + // cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED + // } ] }, menuForce: [ diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index 9c36b5652..fb04500b0 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -789,7 +789,7 @@ export default { trainingType: 'ControlConvertMenu', productTypes: ['01'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击【系统】' }, + { deviceType: 'bar', orderNum: 1, operateCode: '002', codeType:'NULL', tip: '鼠标左键点击【系统】' }, { deviceType: '05', orderNum: 2, operateCode: '0024', tip: '鼠标左键点击【站遥控】' }, { deviceType: '05', orderNum: 3, operateCode: '0071', tip: '选择车站-【{1}】', val: '{2}'}, { deviceType: '05', orderNum: 4, operateCode: '007', tip: '选择【紧急站控】', val: '{2}' }, diff --git a/src/jmapNew/theme/race_01/menus/menuStation.vue b/src/jmapNew/theme/race_01/menus/menuStation.vue index a7870ddd0..2f8dbe6a3 100644 --- a/src/jmapNew/theme/race_01/menus/menuStation.vue +++ b/src/jmapNew/theme/race_01/menus/menuStation.vue @@ -130,11 +130,14 @@ export default { }; }, initMenu() { - this.menu = MenuContextHandler.covert(this.menuNormal); - // 故障模式菜单列表 - if (this.operatemode === OperateMode.FAULT) { - this.menu = this.menuForce; + if (this.selected.centralized) { + this.menu = MenuContextHandler.covert(this.menuNormal); + // 故障模式菜单列表 + if (this.operatemode === OperateMode.FAULT) { + this.menu = this.menuForce; + } } + }, doShow(point) { this.clickEvent(); diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/speedLimit.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/speedLimit.vue new file mode 100644 index 000000000..0e494df93 --- /dev/null +++ b/src/jmapNew/theme/xian_02/menus/menuDialog/speedLimit.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue index bdd90d3c4..4d04a0790 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue @@ -8,6 +8,7 @@ + @@ -26,6 +27,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; +import SpeedLimit from './menuDialog/speedLimit'; export default { name: 'SectionMenu', @@ -37,7 +39,8 @@ export default { NoticeInfo, TrainAddPlan, SetFault, - LoadSpareTrain + LoadSpareTrain, + SpeedLimit }, props: { selected: { @@ -298,7 +301,7 @@ export default { setSpeed() { commitOperate(menuOperate.Section.setSpeed, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.speedLimitControl.doShow(operate, this.selected); + this.$refs.speedLimit.doShow(operate, this.selected); } }); },