diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js index 3f5d977bd..b484dfaf4 100644 --- a/src/scripts/cmdPlugin/CommandHandler.js +++ b/src/scripts/cmdPlugin/CommandHandler.js @@ -64,7 +64,7 @@ class CommandHandle { }, Train_Calculate_Interval: { operate: 'Train_Calculate_Interval', - paramList: [{name: 'trainNumber'}, {name: 'interval'}] + paramList: [{name: 'calculateParam'}] } } }; diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index c608fb5e6..aa96b200b 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -249,12 +249,12 @@ export default { if (this.loadingProjectList.includes(this.project)) { this.$store.dispatch('app/transitionAnimations'); } - // if (this.currentPrdType === '02' && this.courseModel.lineCode === '14') { - // this.$router.push({ path: `/displayBaSiDi/demon`, query: query }); - // } else { - // this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query }); - // } - this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query }); + if (this.currentPrdType === '02' && this.courseModel.lineCode === '14') { + this.$router.push({ path: `/displayBaSiDi/demon`, query: query }); + } else { + this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query }); + } + // this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query }); launchFullscreen(); }).catch(error=>{ if (error.code == 10003) { diff --git a/src/views/newMap/displayBaSiDi/atr.vue b/src/views/newMap/displayBaSiDi/atr.vue index 38169464a..db495d133 100644 --- a/src/views/newMap/displayBaSiDi/atr.vue +++ b/src/views/newMap/displayBaSiDi/atr.vue @@ -352,9 +352,14 @@ export default { const step = { cmdType: CMD.Train.CMD_TRAIN_CALCULATE_INTERVAL, operate: 'Train_Calculate_Interval', - param: { trainNumber: this.trainNumber, interval: this.trainInterval}, + param: { calculateParam: {}}, over:true }; + if (this.intervalMode === 'trainNumber') { + step.param.calculateParam.trainNumber = this.trainNumber; + } else if (this.intervalMode === 'trainInterval') { + step.param.calculateParam.interval = this.trainInterval; + } this.$store.dispatch('training/nextNew', step).then(({valid, response}) => { if (valid) { this.trainInterval = response.data.intervalTime;