diff --git a/src/api/assist.js b/src/api/assist.js index 09791c67d..34c3bcf23 100644 --- a/src/api/assist.js +++ b/src/api/assist.js @@ -17,7 +17,7 @@ export function queryAssistById(mapId){ method: 'get' }) } -// 保存指示灯关联信息 +// 保存或更新指示灯关联信息 export function saveAssist(data, mapId) { return request({ // url: `/api/assist/indicator/section/save/${mapId}`, diff --git a/src/assets/ctc_icon/pic1.png b/src/assets/ctc_icon/pic1.png new file mode 100644 index 000000000..87d1249b8 Binary files /dev/null and b/src/assets/ctc_icon/pic1.png differ diff --git a/src/assets/ctc_icon/pic10.png b/src/assets/ctc_icon/pic10.png new file mode 100644 index 000000000..3ab9b8d0c Binary files /dev/null and b/src/assets/ctc_icon/pic10.png differ diff --git a/src/assets/ctc_icon/pic11.png b/src/assets/ctc_icon/pic11.png new file mode 100644 index 000000000..9acc0ffe4 Binary files /dev/null and b/src/assets/ctc_icon/pic11.png differ diff --git a/src/assets/ctc_icon/pic12.png b/src/assets/ctc_icon/pic12.png new file mode 100644 index 000000000..06e8c21a3 Binary files /dev/null and b/src/assets/ctc_icon/pic12.png differ diff --git a/src/assets/ctc_icon/pic13.png b/src/assets/ctc_icon/pic13.png new file mode 100644 index 000000000..7de193f96 Binary files /dev/null and b/src/assets/ctc_icon/pic13.png differ diff --git a/src/assets/ctc_icon/pic14.png b/src/assets/ctc_icon/pic14.png new file mode 100644 index 000000000..ec84e94ae Binary files /dev/null and b/src/assets/ctc_icon/pic14.png differ diff --git a/src/assets/ctc_icon/pic15.png b/src/assets/ctc_icon/pic15.png new file mode 100644 index 000000000..533aa39ac Binary files /dev/null and b/src/assets/ctc_icon/pic15.png differ diff --git a/src/assets/ctc_icon/pic16.png b/src/assets/ctc_icon/pic16.png new file mode 100644 index 000000000..5d502ad32 Binary files /dev/null and b/src/assets/ctc_icon/pic16.png differ diff --git a/src/assets/ctc_icon/pic17.png b/src/assets/ctc_icon/pic17.png new file mode 100644 index 000000000..b7fb4e7fa Binary files /dev/null and b/src/assets/ctc_icon/pic17.png differ diff --git a/src/assets/ctc_icon/pic18.png b/src/assets/ctc_icon/pic18.png new file mode 100644 index 000000000..2b3eeab39 Binary files /dev/null and b/src/assets/ctc_icon/pic18.png differ diff --git a/src/assets/ctc_icon/pic2.png b/src/assets/ctc_icon/pic2.png new file mode 100644 index 000000000..422f8ecb5 Binary files /dev/null and b/src/assets/ctc_icon/pic2.png differ diff --git a/src/assets/ctc_icon/pic3.png b/src/assets/ctc_icon/pic3.png new file mode 100644 index 000000000..0d01ad832 Binary files /dev/null and b/src/assets/ctc_icon/pic3.png differ diff --git a/src/assets/ctc_icon/pic4.png b/src/assets/ctc_icon/pic4.png new file mode 100644 index 000000000..9238d103e Binary files /dev/null and b/src/assets/ctc_icon/pic4.png differ diff --git a/src/assets/ctc_icon/pic5.png b/src/assets/ctc_icon/pic5.png new file mode 100644 index 000000000..9d7ba3957 Binary files /dev/null and b/src/assets/ctc_icon/pic5.png differ diff --git a/src/assets/ctc_icon/pic6.png b/src/assets/ctc_icon/pic6.png new file mode 100644 index 000000000..2f5cd7be3 Binary files /dev/null and b/src/assets/ctc_icon/pic6.png differ diff --git a/src/assets/ctc_icon/pic7.png b/src/assets/ctc_icon/pic7.png new file mode 100644 index 000000000..4ed0511d3 Binary files /dev/null and b/src/assets/ctc_icon/pic7.png differ diff --git a/src/assets/ctc_icon/pic8.png b/src/assets/ctc_icon/pic8.png new file mode 100644 index 000000000..90e0a08f5 Binary files /dev/null and b/src/assets/ctc_icon/pic8.png differ diff --git a/src/assets/ctc_icon/pic9.png b/src/assets/ctc_icon/pic9.png new file mode 100644 index 000000000..1be3e85f1 Binary files /dev/null and b/src/assets/ctc_icon/pic9.png differ diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js index 1c5fed385..3d6e78c40 100644 --- a/src/jmapNew/shape/graph/Section/index.js +++ b/src/jmapNew/shape/graph/Section/index.js @@ -530,8 +530,8 @@ export default class Section extends Group { } } // 分路不良 - // model.badShunt && - model.shuntingTypeList && model.shuntingTypeList.length > 0 && this.badShuntStatus(); + // model.shuntingTypeList.length > 0 && + model.badShunt&& this.badShuntStatus(); } } diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index 2358832a0..7af64ad8f 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -226,7 +226,7 @@ export default class Train extends Group { this.trainR && this.trainR.setLineShow(false); this.trainL && this.trainL.setArrowShow(false); this.trainR && this.trainR.setArrowShow(false); - this.trainB && this.trainB.setTrainBorderColor(this.style.Train.trainBody.trainSidelineColor || this.style.trainSidelineColor); + this.trainB && this.trainB.setTrainBorderColor(this.style.Train.trainBody.trainSidelineColor || this.style.trainSidelineColor); } // 设置运行方向状态类型 @@ -267,20 +267,20 @@ export default class Train extends Group { this.trainL && this.trainL.setArrowShow(item.arrowLShow); this.trainR && this.trainR.setArrowShow(item.arrowRShow); } - } else if(this.style.Train.trainHead.directionStopType == 'specialAll'){ - if (flag) { - this.trainL && this.trainL.setArrowShow(!item.arrowLShow); - this.trainR && this.trainR.setArrowShow(!item.arrowRShow); - this.trainL && this.trainL.setLineShow(!item.lineLShow); - this.trainR && this.trainR.setLineShow(!item.lineRShow); - } else { - this.trainL && this.trainL.setArrowShow(item.arrowLShow); - this.trainR && this.trainR.setArrowShow(item.arrowRShow); - this.trainL && this.trainL.setLineShow(item.lineLShow); - this.trainR && this.trainR.setLineShow(item.lineRShow); - } - this.trainB && this.trainB.setTrainBorderColor(this.style.Train.trainBody.trainSidelineStopColor); - } else { + } else if (this.style.Train.trainHead.directionStopType == 'specialAll') { + if (flag) { + this.trainL && this.trainL.setArrowShow(!item.arrowLShow); + this.trainR && this.trainR.setArrowShow(!item.arrowRShow); + this.trainL && this.trainL.setLineShow(!item.lineLShow); + this.trainR && this.trainR.setLineShow(!item.lineRShow); + } else { + this.trainL && this.trainL.setArrowShow(item.arrowLShow); + this.trainR && this.trainR.setArrowShow(item.arrowRShow); + this.trainL && this.trainL.setLineShow(item.lineLShow); + this.trainR && this.trainR.setLineShow(item.lineRShow); + } + this.trainB && this.trainB.setTrainBorderColor(this.style.Train.trainBody.trainSidelineStopColor); + } else { if (flag) { this.trainL && this.trainL.setLineShow(!item.lineLShow); this.trainR && this.trainR.setLineShow(!item.lineRShow); diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue index f2a9ba5e0..1e7378f11 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue @@ -200,7 +200,7 @@ export default { }); }, loadSpare() { - commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{ + commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.loadSpareTrain.doShow(operate, this.selected); } diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue index f9fbd99c9..17cd93abb 100644 --- a/src/jmapNew/theme/components/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue @@ -201,7 +201,12 @@ export default { {label: '计轴故障', value: 'FAULT'}, {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'} ]; - } else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') { + } else if (selected._type === 'Section' && this.popClass === 'datie-02__systerm'){ + this.faultList = [ + {label: '计轴故障', value: 'FAULT'}, + {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'} + ]; + } else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') { this.faultList = [ {label: '失表', value: 'SPLIT'}, {label: '定位失表', value: 'NORMAL_SPLIT'}, @@ -210,7 +215,16 @@ export default { {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}, {label: '计轴故障', value: 'AXLE_FAULT'} ]; - } else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') { + } else if(selected._type === 'Switch' && this.popClass === 'datie-02__systerm') { + this.faultList = [ + {label: '失表', value: 'SPLIT'}, + {label: '定位失表', value: 'NORMAL_SPLIT'}, + {label: '反位失表', value: 'REVERSE_SPLIT'}, + {label: '挤岔', value: 'SQUEEZE'}, + {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}, + {label: '红光带故障', value: 'AXLE_FAULT'} + ]; + } else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') { this.faultList = [ {label: '红光带故障', value: 'FAULT'}, {label: '粉光带故障', value: 'CBTC_OCCUPIED_FAULT'}, diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index a5f912339..56b9af7c4 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -501,25 +501,40 @@ export const menuOperate = { deletDestionation: { operation: OperationEvent.Train.deleteDestinationTrainId.menu.operation, cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL + }, + updateTrip:{ + // 修改车次号 (大铁线路 车次号 车组号) + operation: OperationEvent.Train.updateTrip.menu.operation, + cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN + }, + updateTripCommit:{ + // 修改车次号 (大铁线路 车次号 车组号) + operation: OperationEvent.Train.updateTrip.confirm.operation, + cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN + }, + removeTrip:{ + // 删车次号 (大铁线路 车组号) + operation: OperationEvent.Train.removeTrip.menu.operation, + cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE } }, - CTC: { + CTC: { // 接预 - receivingNotice: { - operation: OperationEvent.CTCCommand.receivingNotice.menu.operation, - cmdType: CMD.CTC.CTC_RECEIVING_NOTICE - }, - // 发预 - departureNotice: { - operation: OperationEvent.CTCCommand.departureNotice.menu.operation, - cmdType: CMD.CTC.CTC_DEPARTURE_NOTICE - }, - // 自动触发 - autoTrigger: { - operation: OperationEvent.CTCCommand.autoTrigger.menu.operation, - cmdType: CMD.CTC.CTC_AUTO_TRIGGER - } - } + receivingNotice: { + operation: OperationEvent.CTCCommand.receivingNotice.menu.operation, + cmdType: CMD.CTC.CTC_RECEIVING_NOTICE + }, + // 发预 + departureNotice: { + operation: OperationEvent.CTCCommand.departureNotice.menu.operation, + cmdType: CMD.CTC.CTC_DEPARTURE_NOTICE + }, + // 自动触发 + autoTrigger: { + operation: OperationEvent.CTCCommand.autoTrigger.menu.operation, + cmdType: CMD.CTC.CTC_AUTO_TRIGGER + } + } }; diff --git a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue index 7a47b6c24..f2964cbb2 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue @@ -15,12 +15,12 @@ 上下行 - +
{{ messageTip1 }}
 - + @@ -118,18 +118,22 @@ export default { const figuresOfServiceMaxNumber = 6; // this.$store.state.map.mapConfig.figuresOfServiceNumber; const tripNumber = this.addModel.tripNumber; - const judge = /^[a-zA-Z0-9]{1,}$/.test(this.addModel.tripNumber); + const judge = /^[a-zA-Z0-9]*[\d]$/.test(this.addModel.tripNumber); if (judge) { if (tripNumber.toString().length > figuresOfServiceMaxNumber || tripNumber.toString().length < figuresOfServiceMinNumber) { this.messageTip1 = '车次号长度' + figuresOfServiceMinNumber + '-' + figuresOfServiceMaxNumber + '位'; } else { this.addModel.tripNumber = tripNumber; this.messageTip1 = ''; + const result = this.addModel.tripNumber.match(/[\d]$(?=[a-zA-Z0-9]*)/); + if (result) { + const is_even = result[0] % 2 == 0; + this.addModel.right = is_even; + } } } else { - // debugger; this.addModel.tripNumber = ''; - this.messageTip1 = '请输入车次号'; + this.messageTip1 = '请输入车次号(最后一位必须是数字)'; } }, commit() { @@ -143,10 +147,10 @@ export default { result = true; } if (this.addModel.tripNumber && result) { - if (this.addModel.right === '') { - this.messageTip2 = '请选择上下行'; - return; - } + // if (this.addModel.right === '') { + // this.messageTip2 = '请选择上下行'; + // return; + // } const params = { tripNumber: this.addModel.tripNumber, sectionCode: this.addModel.sectionCode, @@ -170,7 +174,6 @@ export default { } else { this.messageTip1 = '请输入车次号'; } - } }, cancel() { diff --git a/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue new file mode 100644 index 000000000..0e985813a --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue @@ -0,0 +1,165 @@ + + + diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index 074dd82d4..6158fbfdd 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -1,6 +1,26 @@ @@ -25,7 +26,8 @@ import TrainMoveNumber from './dialog/trainMoveNumber'; import TrainCreateNumber from './dialog/trainCreateNumber'; import TrainDeleteNumber from './dialog/trainDeleteNumber'; import TrainDetailInfo from './dialog/trainDetailInfo'; -import TrainSetPlan from './dialog/trainSetPlan'; +// import TrainSetPlan from './dialog/trainSetPlan'; +import UpdateTrip from './dialog/updateTrip'; import CancelMouseState from '@/mixin/CancelMouseState'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; @@ -44,7 +46,8 @@ export default { TrainDeleteNumber, TrainDetailInfo, SetFault, - TrainSetPlan + UpdateTrip + // TrainSetPlan }, mixins: [ CancelMouseState @@ -62,18 +65,33 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '设置计划车', - handler: this.setPlanTrain, - cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN - }, + // { + // label: '设置计划车', + // handler: this.setPlanTrain, + // cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN + // }, + { + label: '变更车次号', + handler: this.modifyTripNumber, + cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN + }, + { + label: '删车次号', + handler: this.removeTripNumber, + cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE + } ], Center: [ - { - label: '设置计划车', - handler: this.setPlanTrain, - cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN - } + { + label: '变更车次号', + handler: this.modifyTripNumber, + cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN + } + // { + // label: '设置计划车', + // handler: this.setPlanTrain, + // cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN + // } // { // label: '新建车组号', // handler: this.createTrainNo @@ -131,31 +149,31 @@ export default { } ], menuDirective: [ - { - label: '切换驾驶模式', - children: [ - { - label: '转AM-C模式', - handler: this.handlerApplyAmcMode - }, - { - label: '转SM-C模式', - handler: this.handlerApplySmcMode - }, - { - label: '转AM-I模式', - handler: this.handlerApplyAmiMode - }, - { - label: '转SM-I模式', - handler: this.handlerApplySmiMode - }, - { - label: '转RM模式', - handler: this.handlerApplyRmMode - } - ] - }, + { + label: '切换驾驶模式', + children: [ + { + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode + }, + { + label: '转RM模式', + handler: this.handlerApplyRmMode + } + ] + }, { label: '确认运行至前方站', handler: this.nextStation @@ -172,14 +190,22 @@ export default { label: '越红灯行驶', handler: this.handleOverEedLight }, - { - label: '驾驶至', - handler: this.handleDriveTo - }, - { - label: '换端', - handler: this.handleTurnDirection - } + // { + // label: '驾驶至', + // handler: this.handleDriveTo + // }, + { + label: '换端', + handler: this.handleTurnDirection + }, + { + label: '发车', + handler: this.handleDepartTrain + }, + { + label: '停车', + handler: this.handleParkingTrain + } ], menuSpeed: [ { @@ -259,48 +285,21 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - const group = this.$route.query.group; - const param = { - commandType: 'Drive_Ahead', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} - }; - commitTrainSend(group, param).then(({valid, operate})=>{ - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); + this.trainSend('Drive_Ahead'); }, routeBlockRun() { - const group = this.$route.query.group; - const param = { - commandType: 'Route_Block_Drive', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} - }; - commitTrainSend(group, param).then(({valid, operate})=>{ - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); + this.trainSend('Route_Block_Drive'); }, handleOverFuideSignal() { - const group = this.$route.query.group; - const param = { - commandType: 'Drive_Through_The_Guide_Signal', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} - }; - commitTrainSend(group, param).then(({valid, operate})=>{ - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); + this.trainSend('Drive_Through_The_Guide_Signal'); }, handleOverEedLight() { + this.trainSend('Drive_Through_The_Red_Light'); + }, + trainSend(type) { const group = this.$route.query.group; const param = { - commandType: 'Drive_Through_The_Red_Light', + commandType: type, targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, params: {} }; @@ -329,21 +328,21 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - // 设置计划车 - setPlanTrain() { - const operate = { - start: true, - code: this.selected.code, - operation: OperationEvent.Train.editTrainId.menu.operation, - param: {} - }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.trainSetPlan.doShow(operate, this.selected); - } - }); - }, + // 设置计划车 + // setPlanTrain() { + // const operate = { + // start: true, + // code: this.selected.code, + // operation: OperationEvent.Train.editTrainId.menu.operation, + // param: {} + // }; + // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + // if (valid) { + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // this.$refs.trainSetPlan.doShow(operate, this.selected); + // } + // }); + // }, // 设计划车 setPlanTrainId() { const operate = { @@ -472,93 +471,136 @@ export default { } }); }, - handlerApplyAmcMode() { - const group = this.$route.query.group; - const param = { - commandType: 'Change_Preselection_Mode', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: { preselectionMode: 'AM_C' } - }; - commitTrainSend(group, param).then(({ valid, operate }) => { - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, - handlerApplySmcMode() { - const group = this.$route.query.group; - const param = { - commandType: 'Change_Preselection_Mode', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: { preselectionMode: 'SM_C' } - }; - commitTrainSend(group, param).then(({ valid, operate }) => { - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, - handlerApplyAmiMode() { - const group = this.$route.query.group; - const param = { - commandType: 'Change_Preselection_Mode', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: { preselectionMode: 'AM_I' } - }; - commitTrainSend(group, param).then(({ valid, operate }) => { - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, - handlerApplySmiMode() { - const group = this.$route.query.group; - const param = { - commandType: 'Change_Preselection_Mode', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: { preselectionMode: 'SM_I' } - }; - commitTrainSend(group, param).then(({ valid, operate }) => { - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, - handlerApplyRmMode() { - const group = this.$route.query.group; - const param = { - commandType: 'Change_Preselection_Mode', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: { preselectionMode: 'RM' } - }; - commitTrainSend(group, param).then(({ valid, operate }) => { - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, - // 驾驶至（托管） - handleDriveTo() { - commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{ - if (valid) { - this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true); - } - }); - }, - // 换端 - handleTurnDirection() { - const group = this.$route.query.group; - const param = { - commandType: 'Turn_Direction', - targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} - }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error)=> { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, + handlerApplyAmcMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'AM_C' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplySmcMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'SM_C' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyAmiMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'AM_I' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplySmiMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'SM_I' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + // 驾驶至（托管） + handleDriveTo() { + commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true); + } + }); + }, + // 换端 + handleTurnDirection() { + const group = this.$route.query.group; + const param = { + commandType: 'Turn_Direction', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: {} + }; + commitTrainSend(group, param).then(({valid, operate}) => { + }).catch((error)=> { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handleDepartTrain() { + const group = this.$route.query.group; + const param = { + commandType: 'Depart_Train', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: {} + }; + commitTrainSend(group, param).then(({valid, operate}) => { + }).catch((error)=> { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handleParkingTrain() { + const group = this.$route.query.group; + const param = { + commandType: 'Parking_Train', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: {} + }; + commitTrainSend(group, param).then(({valid, operate}) => { + }).catch((error)=> { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + + }, + modifyTripNumber() { + commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.updateTrip.doShow(operate, this.selected.tripNumber); + } + }); + }, + removeTripNumber() { + commitOperate(menuOperate.Train.removeTrip, {groupNumber:this.selected.groupNumber}, 3).then(({valid, operate})=>{ + if (valid) { + } + }).catch((error)=> { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, undeveloped() { this.doClose(); this.$alert('实现中......', '提示', { diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 93cd1fac6..ebd795620 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -180,7 +180,6 @@ export default { CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN: {value: 'Train_Load_Trip_Number_Train', label: '增加备用车'}, /** 分路不良 大铁线路使用*/ CMD_SECTION_DEFECTIVE_SHUNTING: {value: 'Section_Defective_Shunting', label: '分路不良'} - }, // 站台 @@ -335,7 +334,11 @@ export default { /** 选择调度模式 */ CMD_TRAIN_REGULATION : { value:'Train_Regulation', label:'选择调度模式' }, /** 计算列车间隔 */ - CMD_TRAIN_CALCULATE_INTERVAL : {value: 'Train_Calculate_Interval', label: '计算列车间隔'} + CMD_TRAIN_CALCULATE_INTERVAL : {value: 'Train_Calculate_Interval', label: '计算列车间隔'}, + /** 修改车次号 大铁线路使用*/ + CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN: {value: 'Train_Update_Trip_Number_Train', label: '变更车次号'}, + /** 删除车次号 大铁线路使用*/ + CMD_TRAIN_REMOVE_TRAIN_TRACE:{value: 'Train_Remove_Train_Trace', label: '删车次号'} }, TrainWindow: { /** 修改列车识别号 */ diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js index 01d68789d..c18329953 100644 --- a/src/scripts/cmdPlugin/CommandHandler.js +++ b/src/scripts/cmdPlugin/CommandHandler.js @@ -40,6 +40,10 @@ class CommandHandle { operate: 'Train_Load_Trip_Number_Train', paramList:[{name: 'tripNumber'}, {name: 'sectionCode'}, {name: 'right'}] }, + // Train_Update_Trip_Number_Train:{ + // operate: 'Train_Update_Trip_Number_Train', + // paramList:[{name: 'tripNumber'}, {name: 'groupNumber'}] + // }, Train_Trust: { operate: 'Train_Trust', paramList:[{name: 'groupNumber'}, {name: 'targetDeviceCode'}], diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 643e86fa1..b75a736d9 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3397,6 +3397,26 @@ export const OperationEvent = { operation: '70t3', domId: '_Tips-Train-trainSetRunType-Confirm' } + }, + updateTrip: { + menu: { + operation: '70u', + domId: '_Tips-Train-updateTrip-Menu' + }, + changeTripNumber: { + operation: '70u1', + domId: '_Tips-Train-updateTrip-ChangeTripNumber' + }, + confirm: { + operation: '70u2', + domId: '_Tips-Train-updateTrip-Confirm' + } + }, + removeTrip:{ + menu: { + operation: '70v', + domId: '_Tips-Train-removeTrip-Menu' + } } }, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index ce530d24f..05d02e164 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -30,7 +30,7 @@ export function handlerUrl(data) { // BASE_API = 'http://192.168.8.172:9200'; // 旭强 // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 - // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 + // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/newMap/displayCity/demonMenu.vue b/src/views/newMap/displayCity/demonMenu.vue index a9dee5909..1e089ac2f 100644 --- a/src/views/newMap/displayCity/demonMenu.vue +++ b/src/views/newMap/displayCity/demonMenu.vue @@ -8,7 +8,7 @@ 经典案例分析 规范学习 - 占线板 + 占线板 - + diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue index f84bd881d..0c54e7e92 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue @@ -12,7 +12,6 @@