diff --git a/src/api/runplan.js b/src/api/runplan.js index fcddb5f31..58cbdb46a 100644 --- a/src/api/runplan.js +++ b/src/api/runplan.js @@ -511,3 +511,12 @@ export function getRunLevelDetail(id) { method: 'get' }); } + +// 更新站间运行等级数据 +export function updateRunlevelDistance(mapId) { + return request({ + url: `/api/runPlan/userData/${mapId}/runlevelDistance`, + method: 'put' + }); +} + diff --git a/src/assets/icon/favicon_cgy.png b/src/assets/icon/favicon_cgy.png new file mode 100644 index 000000000..2a6f2062e Binary files /dev/null and b/src/assets/icon/favicon_cgy.png differ diff --git a/src/jlmap3d/edit/testEditorModel/SectionList.js b/src/jlmap3d/edit/testEditorModel/SectionList.js index 66ead2811..f5933a30e 100644 --- a/src/jlmap3d/edit/testEditorModel/SectionList.js +++ b/src/jlmap3d/edit/testEditorModel/SectionList.js @@ -213,13 +213,8 @@ export function SectionList() { stopsections.push(realstopsection); } - - console.log(stopsections); - stopsections.sort(compare("posx")) - - let leng1 = 0; let leng2 = 0; @@ -330,13 +325,12 @@ export function SectionList() { createsection(stopsections[0].reals[1].code,downstartpoint,stopsections[0].reals[1].code,34.8); for(let i=1,leni=stopsections.length;i0.01){ closedSpline = new THREE.CatmullRomCurve3( [ new THREE.Vector3(newsection.railpoint[0].x,newsection.railpoint[0].y,newsection.railpoint[0].z), - new THREE.Vector3(newsection.railpoint[1].x,newsection.railpoint[1].y,newsection.railpoint[1].z+0.001), + new THREE.Vector3(newsection.railpoint[1].x,newsection.railpoint[1].y,newsection.railpoint[1].z+0.0001), new THREE.Vector3(newsection.railpoint[2].x,newsection.railpoint[2].y,newsection.railpoint[2].z) ] ); }else{ closedSpline = new THREE.CatmullRomCurve3( [ new THREE.Vector3(newsection.railpoint[0].x,newsection.railpoint[2].y,newsection.railpoint[0].z), - new THREE.Vector3(newsection.railpoint[1].x,newsection.railpoint[2].y,newsection.railpoint[1].z+0.0015), + new THREE.Vector3(newsection.railpoint[1].x,newsection.railpoint[2].y,newsection.railpoint[1].z+0.0001), new THREE.Vector3(newsection.railpoint[2].x,newsection.railpoint[2].y,newsection.railpoint[2].z) ] ); } diff --git a/src/jlmap3d/main/newmodel/TdtList.js b/src/jlmap3d/main/newmodel/TdtList.js index 9dc369316..414be4544 100644 --- a/src/jlmap3d/main/newmodel/TdtList.js +++ b/src/jlmap3d/main/newmodel/TdtList.js @@ -17,7 +17,7 @@ export function TdtList() { stopSections[sectionData[i].code] = sectionData[i]; } } - + console.log(stationData); for(let k in stationData){ for(let i=0;i 0, model.speedUpLimit); } } } @@ -424,7 +423,7 @@ export default class Section extends Group { this.on('mouseout', () => { // 移出 if (!this.selectedType && !this.selected && this.line ) { this.line.setStyle({ stroke: this.style.Section.line.spareColor, lineWidth: this.style.Section.line.width }); - this.line.setOrignalCross(); + this.line.setOrignalCross(true); } if (this.style.Switch.sectionAction.flag && this.model.relSwitchCode) { const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode]; @@ -456,7 +455,7 @@ export default class Section extends Group { } else { this.lineBorder && this.lineBorder.setStyle({ lineWidth: 0 }); !this.selectedType && this.setState(this.model); - this.line.setOrignalCross(); + this.line.setOrignalCross(false); } } drawBatchSelected(selected, type) { diff --git a/src/jmapNew/shape/Switch/ELimitName.js b/src/jmapNew/shape/Switch/ELimitName.js new file mode 100644 index 000000000..471c9bac7 --- /dev/null +++ b/src/jmapNew/shape/Switch/ELimitName.js @@ -0,0 +1,44 @@ +import Group from 'zrender/src/container/Group'; +import Text from 'zrender/src/graphic/Text'; + +class ESwName extends Group { + constructor(model) { + super(); + this.model = model; + this.create(); + } + + create() { + const model = this.model; + const style = this.model.style; + + this.limitNameText = new Text({ + zlevel: model.zlevel, + z: model.z + 6, + style: { + x: model.nameTextX, + y: model.nameTextY, + fontWeight: style.Switch.text.fontWeight, + fontSize: model.fontSize, + fontFamily: style.fontFamily, + text: '0', + textAlign: 'center', + textVerticalAlign: 'middle', + textFill: model.fillColor + } + }); + + this.add(this.limitNameText); + this.limitNameText.hide(); + } + + limitNameShow(text) { + this.limitNameText.show(); + this.limitNameText.setStyle({ text: text }); + } + limitNameHide() { + this.limitNameText.hide(); + } +} + +export default ESwName; diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index 4ee411a14..16d861dba 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -3,6 +3,7 @@ import Text from 'zrender/src/graphic/Text'; import Rect from 'zrender/src/graphic/shape/Rect'; import JTriangle from '../../utils/JTriangle'; import ESwName from './ESwName.js'; +import ELimitName from './ELimitName.js'; import ESwLocal from './ESwLocal.js'; import ESwLnversion from './ESwLnversion'; import ELockRect from './ELockRect'; @@ -167,6 +168,20 @@ export default class Switch extends Group { nameShow: style.Switch.text.show, triangle: this.triangle }); + if (this.style.Switch.limitNameText) { // 道岔限速 + const limitTextX = model.intersection.x + directx * (style.Section.line.width * 3 + style.Switch.text.offset.x) * this.triangle.getCotRate(); + const limitTextY = model.intersection.y - style.Switch.text.offset.y * directy; + this.limitName = new ELimitName({ + zlevel: this.zlevel, + z: this.z, + style: style, + fillColor: style.Switch.limitNameText.fillColor, + fontSize: style.Switch.limitNameText.fontSize, + nameTextX: limitTextX, + nameTextY: limitTextY + }); + this.add(this.limitName); + } this.enabledName = new Text({ // 道岔使能 E 西安二号线独有 zlevel: this.zlevel, @@ -572,7 +587,14 @@ export default class Switch extends Group { section.show(); } if (sectionModel.cutOff) { - section.hide(); + const lineWidth = sectionModel.instance.line.section.style.lineWidth; + section && section.animateStyle(item => { + let an = item.animateStyle(true); + an = an.when(0, {lineWidth: lineWidth}); + an = an.when(1000, {stroke: this.style.backgroundColor}); + an = an.when(2000, {lineWidth: lineWidth}); + an.start(); + }); } } setAshShow() { @@ -629,7 +651,13 @@ export default class Switch extends Group { } model.noStatus && this.setAshShow(); } - + setLimitState(flag, limitValue) { + if (flag) { + this.limitName && this.limitName.limitNameShow(limitValue); + } else { + this.limitName && this.limitName.limitNameHide(); + } + } getBoundingRect() { return this.name.getBoundingRect(); } diff --git a/src/jmapNew/shape/element/EHighlight.js b/src/jmapNew/shape/element/EHighlight.js index 924be8fab..e2250e202 100644 --- a/src/jmapNew/shape/element/EHighlight.js +++ b/src/jmapNew/shape/element/EHighlight.js @@ -5,6 +5,7 @@ class EHighlight extends Group { constructor(device) { super(); this.device = device; + this.style = device.style; this.selected = false; this.create(); } @@ -13,11 +14,19 @@ class EHighlight extends Group { let fill = 'rgba(0,255,255,0.6)'; if (this.device._type === 'Psd') { fill = 'rgba(255,0,0,0.6)'; + } else if (this.device._type === 'Signal' && this.style.Signal.highlightColor) { + fill = this.style.Signal.highlightColor; + } + let z = this.device.z + 1; + if (this.device._type === 'StationStand') { + z = this.device.z + 3; + } else if (this.device._type === 'Signal' && this.style.Signal.highlightZ) { + z = this.style.Signal.highlightZ; } const rect = this.device.getBoundingRect(); this.lineBorder = new Rect({ zlevel: this.device.zlevel, - z: this.device._type === 'StationStand' ? this.device.z + 3 : this.device.z + 1, + z: z, shape: rect, style: { fill: fill diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js index 58ea1b7b5..c712f10e6 100644 --- a/src/jmapNew/theme/chengdu_03/operationConfig.js +++ b/src/jmapNew/theme/chengdu_03/operationConfig.js @@ -119,7 +119,7 @@ export default { { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' } ] }, - + /** 暂不生成实训 */ { maxDuration: 15, minDuration: 8, @@ -136,6 +136,7 @@ export default { { deviceType: '04', orderNum: 4, operateCode: '3082', tip: '鼠标左键点击【确认】按钮' } ] }, + /** 暂不生成实训 */ { maxDuration: 15, minDuration: 8, @@ -186,14 +187,13 @@ export default { minDuration: 8, operateType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value, skinCode: '04', - trainingName: '总取消({3} 进路)', - trainingRemark: '总取消功能', + trainingName: '取消进路({3} 进路)', + trainingRemark: '取消进路功能（总取消）', trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, - { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: '2994', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' } + { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' } ] }, { // 不生成实训 @@ -245,7 +245,7 @@ export default { minDuration: 5, operateType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value, skinCode: '04', - trainingName: '信号重开({3} 进路)', + trainingName: '信号重开({5})', trainingRemark: '信号重开功能', trainingType: 'Signal', productTypes: ['01'], @@ -339,7 +339,9 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3140', tip: '鼠标左键点击【人工控】' }, { deviceType: '04', orderNum: 2, operateCode: '3140', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' } - ] + ], + // 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置 + config:{onlySignalOP:true} }, { maxDuration: 15, @@ -368,7 +370,8 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3150', tip: '鼠标左键点击【自动控】' }, { deviceType: '04', orderNum: 2, operateCode: '3150', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' } - ] + ], + config:{onlySignalOP:true} }, { maxDuration: 15, diff --git a/src/jmapNew/theme/chengdu_03/planConvert.js b/src/jmapNew/theme/chengdu_03/planConvert.js index 903f5b6b9..b57903e54 100644 --- a/src/jmapNew/theme/chengdu_03/planConvert.js +++ b/src/jmapNew/theme/chengdu_03/planConvert.js @@ -91,7 +91,6 @@ export default { // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`; pointdata.name = `${service.serviceNumber}${train.tripNumber}`; pointdata.color = '#000' || lineStyle.color; - // pointdata.directionCode = train.directionCode; pointdata.directionCode = train.right ? '2' : '1'; if (!store.state.map.mapConfig.upRight) { pointdata.directionCode = train.right ? '1' : '2'; @@ -110,7 +109,6 @@ export default { if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode || index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime || index > 0 && index < train.stationTimeList.length - 1) { - // ${train.directionCode} const aa = `${train.tripNumber}`; opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]); } @@ -121,7 +119,6 @@ export default { lastPoint = train.stationTimeList[idx - 1]; nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1]; num = this.computedReentryNumber(train.tripNumber); - // ${train.directionCode} const aa = `${train.tripNumber}`; opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]); opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]); diff --git a/src/jmapNew/theme/nanjing_02/menus/index.vue b/src/jmapNew/theme/nanjing_02/menus/index.vue index 7b42fb0a5..fdcd832ae 100644 --- a/src/jmapNew/theme/nanjing_02/menus/index.vue +++ b/src/jmapNew/theme/nanjing_02/menus/index.vue @@ -1,13 +1,13 @@
- 执行 - 取消 + 执行 + 取消 关闭
@@ -208,8 +208,8 @@ @@ -237,6 +237,16 @@ export default { default() { return null; } + }, + loginActive: { + type: Boolean, + default() { + return false; + } + }, + inputStr: { + type: String, + default: '' } }, data() { @@ -317,20 +327,20 @@ export default { cr2ConfirmId() { return OperationEvent.Command.commandHaerbin.confrimCr2.domId; }, + stationContorl() { + return this.getStationControl(this.selectedObj || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {}; + }, isLocal() { return this.$store.state.training.prdType == '01'; }, - stationContorl() { - return this.getStationControl(this.selected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {}; + isLogin() { + return this.isLocal ? this.loginActive && this.checkBelongCentralizedStationByInputStr(this.inputStr, this.stationContorl) : true; }, menuPosition() { return this.$store.state.menuOperation.menuPosition; } }, watch: { - '$store.state.menuOperation.setMenuChangeCount': function (val) { - - }, '$store.state.training.prdType': function (val) { this.trainOperationShow = false; this.initMenus(); @@ -340,8 +350,8 @@ export default { if (!val) { this.doClose(); } - }, - 'selected': function (val) { + }, + 'selected': function (val) { this.initMenus();// 初始化菜单数据 this.pushTempData([]); // 清空执行栏 this.selectedObj = this.selected; @@ -375,14 +385,13 @@ export default { } }, '$store.state.map.showCentralizedStationCode': function(val) { + this.cancle(); if (!this.oldSelected) { this.handleBasicMenu(); } }, '$store.state.map.mapStationStateUpdateCount': function() { - if (!this.selected || !this.selected.code) { - this.handleBasicMenu(); - } + this.initCentralizedStationList([...this.centralizedStationList]) } }, mounted() { @@ -390,6 +399,29 @@ export default { this.handleBasicMenu(); }, methods: { + initCentralizedStationList(list, selectedObj=this.selectedObj) { + const stationContorl = this.getStationControl(selectedObj || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {}; + this.centralizedStationList = new Array(15).fill({}); + list.forEach((el, index) => { + if (el.disabledCb && stationContorl) { + el.disabled = el.disabledCb(stationContorl); + } + this.centralizedStationList[index] = el; + }); + }, + checkBelongCentralizedStationByInputStr(inputStr, station) { + const child= this.stationList.find(el => el.depot ? false : el.jp == inputStr ); + if (child && station) { + return station.code == child.code || station.chargeStationCodeList && station.chargeStationCodeList.includes(child.code); + } + }, + interceptLogin(cb) { + return (args) => { + if (this.isLogin) { + cb(args); + } + }; + }, // 高亮设备 deviceHighLight(device, flag) { if (device && device.instance && typeof device.instance.drawSelected === 'function' ) { @@ -438,7 +470,10 @@ export default { this.deviceHighLight(this.oldDevice, false); this.deviceHighLight(this.selectedObj, true); this.oldDevice = this.selectedObj; - break; + break; + default: + this.handleBasicMenu(); + break; } }, handleIbpShow() { @@ -501,13 +536,7 @@ export default { }); this.oldDevice = section; - this.centralizedStationList = new Array(15).fill({}); - this.switchParamList.forEach((swicth, index) => { - this.centralizedStationList[index] = swicth; - if (swicth.disabledCb && this.selectedObj) { - swicth.disabled = swicth.disabledCb(this.selectedObj); - } - }); + this.initCentralizedStationList(this.switchParamList); this.pushTempData([this.selectedObj]); this.param = { switchCode: this.selectedObj.code, @@ -522,16 +551,8 @@ export default { this.deviceHighLight(this.oldClickObj, false); } - this.oldClickObj = deepAssign({}, this.selectedObj); - this.centralizedStationList = new Array(15).fill({}); - this.signalParamList.forEach((singal, index) => { - if (singal.disabledCb && this.selectedObj) { - singal.disabled = singal.disabledCb(this.selectedObj); - } - - this.centralizedStationList[index] = singal; - }); - + this.oldClickObj = deepAssign({}, this.selectedObj); + this.initCentralizedStationList(this.signalParamList); this.pushTempData([this.selectedObj]); this.param = { signalCode: this.selectedObj.code @@ -540,16 +561,9 @@ export default { handleSectionMenu() { this.deviceHighLight(this.oldDevice, false); this.deviceHighLight(this.selectedObj, true); - this.oldDevice = this.selectedObj; - - this.centralizedStationList = new Array(15).fill({}); - this.sectionParamList.forEach((section, index) => { - this.centralizedStationList[index] = section; - if (section.disabledCb && this.selectedObj) { - section.disabled = section.disabledCb(this.selectedObj); - } - }); + this.oldClickObj = deepAssign({}, this.selectedObj); + this.initCentralizedStationList(this.sectionParamList); this.pushTempData([this.selectedObj]); this.param = { sectionCode: this.selectedObj.code @@ -560,17 +574,10 @@ export default { this.deviceHighLight(this.oldDevice, false); if (this.oldClickObj) { this.deviceHighLight(this.oldClickObj, false); - } - this.oldClickObj = null; // 清空上次点击信号机 - - this.centralizedStationList = new Array(15).fill({}); - this.basicParamList.forEach((basic, index) => { - this.centralizedStationList[index] = basic; - if (basic.disabledCb && station) { - basic.disabled = basic.disabledCb(station); - } - }); + } + this.oldClickObj = null; // 清空上次点击信号机 + this.initCentralizedStationList(this.basicParamList, station); this.pushTempData(station ? [station] : []); this.param = { @@ -579,14 +586,7 @@ export default { }; }, handleStationMenu() { - this.centralizedStationList = new Array(15).fill({}); - this.stationParamList.forEach((station, index) => { - this.centralizedStationList[index] = station; - if (station.disabledCb && this.selectedObj) { - station.disabled = station.disabledCb(this.selectedObj); - } - }); - + this.initCentralizedStationList(this.stationParamList); this.pushTempData([this.selectedObj]); this.param = { stationCode: this.selectedObj.code }; }, @@ -595,15 +595,9 @@ export default { this.deviceHighLight(this.oldDevice, false); this.deviceHighLight(this.selectedObj, true); this.oldDevice = this.selectedObj; - } - this.centralizedStationList = new Array(15).fill({}); - this.standParamList.forEach((stand, index) => { - this.centralizedStationList[index] = stand; - if (stand.disabledCb && this.selectedObj) { - stand.disabled = stand.disabledCb(this.selectedObj); - } - }); + } + this.initCentralizedStationList(this.standParamList); const data = Object.assign(this.selectedObj); const station = this.$store.getters['map/getDeviceByCode'](this.selectedObj.stationCode); data.name = `${station.name} ${data.right ? '上行' : '下行'}`; @@ -612,14 +606,8 @@ export default { standCode: this.selectedObj.code }; }, - handleRouteMenu() { // 进路命令覆盖 - this.centralizedStationList = new Array(15).fill({}); - this.routeParamList.forEach((swicth, index) => { - this.centralizedStationList[index] = swicth; - if (swicth.disabledCb && this.selectedObj) { - swicth.disabled = swicth.disabledCb(this.selectedObj); - } - }); + handleRouteMenu() { // 进路命令覆盖 + this.initCentralizedStationList(this.routeParamList); if (this.selectedObj._event === MouseEvent.Right) { this.rightClickDialogVisible = true; } @@ -792,13 +780,15 @@ export default { this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.pushTempData([{ name: `${this.cmdType.label}成功` }]); - this.doClose(); + this.doClose(); + this.handleDeviceMenu(); this.handleClose(); } }).catch((error) => { console.error(error); this.pushTempData([{ name: `${this.cmdType.label}失败` }]); - this.doClose(); + this.doClose(); + this.handleDeviceMenu(); this.handleClose(); this.$refs.noticeInfo.doShow(); }); @@ -818,9 +808,8 @@ export default { this.operate = ''; // 清空指令 this.cmdType = ''; this.securityCommand = ''; - // this.speedLimitValue = 15; this.speedLimitValue = ''; - this.secondConfirm = false; + this.secondConfirm = false; this.cr1Confrim = false; if (this.oldClickObj) { this.deviceHighLight(this.oldClickObj, false); @@ -833,6 +822,7 @@ export default { this.dialogVisible = true; }, handleClose() { + this.secondConfirm = false; this.dialogVisible = false; }, handleStationClose() { @@ -960,14 +950,14 @@ export default { { name: '' }, { name: '' }, { name: '' }, - { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, securityCommand: true, disabledCb: (selectedObj) => ['Local'].includes(selectedObj.controlMode) }, - { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, disabledCb: (selectedObj) => ['Local'].includes(selectedObj.controlMode) }, - { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (selectedObj) => ['Center'].includes(selectedObj.controlMode) }, + { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, securityCommand: true, disabledCb: (stationControl) => ['Local'].includes(stationControl.controlMode) }, + { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, disabledCb: (stationControl) => ['Local'].includes(stationControl.controlMode) }, + { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (stationControl) => ['Center'].includes(stationControl.controlMode) }, { name: '' }, { name: '' }, { name: '' }, { name: '' }, - { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (selectedObj) => ['None'].includes(selectedObj.controlMode) } + { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (stationControl) => ['None'].includes(stationControl.controlMode) } ] : [ { name: '' }, { name: '' }, @@ -986,79 +976,79 @@ export default { { name: '' } ]; this.sectionParamList = this.selected && this.selected.type == '05' ? [ - { name: '岔芯设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '岔芯消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '强行消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '预复位', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '封锁岔心', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '解封岔心', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '强解岔心', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch } + { name: '岔芯设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '岔芯消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '强行消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '预复位', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '封锁岔心', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '解封岔心', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '强解岔心', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch } ] : [ - { name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '轨区消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '强行消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '强解区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '预复位', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '封锁区段', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '解封区段', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch } + { name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '轨区消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '强行消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '强解区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '预复位', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '封锁区段', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '解封区段', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch } ]; this.switchParamList = [ - { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch}, - { name: '岔区消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.locate.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '强行转岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.locate.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '挤岔恢复', cmdType: CMD.Switch.CMD_SWITCH_SQUEEZE_RECOVERY, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch || selectedObj.fault !== 'SQUEEZE' }, - { name: '单独锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET, operate: OperationEvent.Switch.axlePreReset.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '封锁道岔', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '解封道岔', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '强行消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch } + { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch}, + { name: '岔区消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.locate.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '强行转岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.locate.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '挤岔恢复', cmdType: CMD.Switch.CMD_SWITCH_SQUEEZE_RECOVERY, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '单独锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET, operate: OperationEvent.Switch.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '封锁道岔', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '解封道岔', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '强行消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch } ]; this.signalParamList = this.$store.state.training.prdType === '01' ? [ - { name: '关闭信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '封锁信号', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '开放信号', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '解封信号', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, + { name: '关闭信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '封锁信号', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '开放信号', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '解封信号', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, - { name: '自排单开', cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, operate: OperationEvent.Signal.atsAutoControl.menuButton, disabledCb: (selectedObj) => selectedObj.atsControl || !this.modeMatch }, - { name: '自排单关', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, operate: OperationEvent.Signal.humanControl.menuButton, disabledCb: (selectedObj) => !selectedObj.atsControl || !this.modeMatch }, - { name: '追踪单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, disabledCb: (selectedObj) => selectedObj.atsControl || !this.modeMatch }, - { name: '追踪单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, disabledCb: (selectedObj) => !selectedObj.atsControl || !this.modeMatch }, + { name: '自排单开', cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, operate: OperationEvent.Signal.atsAutoControl.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '自排单关', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, operate: OperationEvent.Signal.humanControl.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '追踪单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '追踪单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch }, - { name: '开放引导', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '车队单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '车队单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch } + { name: '开放引导', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '车队单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '车队单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch } ] : [ - { name: '关闭信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '封锁信号', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '开放信号', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '解封信号', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, + { name: '关闭信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '封锁信号', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '开放信号', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '解封信号', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, - { name: '自排单开', cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, operate: OperationEvent.Signal.atsAutoControl.menuButton, disabledCb: (selectedObj) => selectedObj.atsControl || !this.modeMatch }, - { name: '自排单关', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, operate: OperationEvent.Signal.humanControl.menuButton, disabledCb: (selectedObj) => !selectedObj.atsControl || !this.modeMatch }, - { name: '追踪单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, disabledCb: (selectedObj) => selectedObj.ciControl || !this.modeMatch }, - { name: '追踪单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, disabledCb: (selectedObj) => !selectedObj.ciControl || !this.modeMatch }, + { name: '自排单开', cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, operate: OperationEvent.Signal.atsAutoControl.menuButton, disabledCb: (stationControl) => !this.modeMatch || stationControl.atsControl }, + { name: '自排单关', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, operate: OperationEvent.Signal.humanControl.menuButton, disabledCb: (stationControl) => !this.modeMatch || !stationControl.atsControl }, + { name: '追踪单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch || stationControl.ciControl }, + { name: '追踪单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch || !stationControl.ciControl }, - { name: '开放引导', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '车队单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '车队单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch } + { name: '开放引导', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, + { name: '车队单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '车队单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch } ]; this.stationParamList = this.$store.state.training.prdType === '01' ? [ - { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, disabledCb: (selectedObj) => !['Local'].includes(selectedObj.controlMode) || !this.modeMatch } + { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, disabledCb: (stationControl) => !this.modeMatch || !['Local'].includes(stationControl.controlMode) } ] : [ - { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, disabledCb: (selectedObj) => !['Local'].includes(selectedObj.controlMode) || !this.modeMatch }, - { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, disabledCb: (selectedObj) => ['Center'].includes(selectedObj.controlMode) }, - { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (selectedObj) => ['Local', 'None'].includes(selectedObj.controlMode) } + { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, disabledCb: (stationControl) => !this.modeMatch || !['Local'].includes(stationControl.controlMode) }, + { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, disabledCb: (stationControl) => ['Center'].includes(stationControl.controlMode) }, + { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (stationControl) => ['Local', 'None'].includes(stationControl.controlMode) } ]; this.routeParamList = [ - { name: '排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '取消进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (selectedObj) => !this.modeMatch } + { name: '排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '取消进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch } ]; } } diff --git a/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue index 89cf1c601..a3167406c 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue @@ -1,5 +1,5 @@