diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue index 963eae7f3..2f91ede3f 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue @@ -170,7 +170,7 @@ export default { this.$refs.popMenu.close(); } }, - // v() { + // loadSpare() { // commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{ // if (valid) { // this.$refs.loadSpareTrain.doShow(operate, this.selected); diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue index 513bbed09..2df0d8537 100644 --- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue @@ -285,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: {} };