From edc9fee0a77afd371053c910fa654551d162da72 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 11 Oct 2021 14:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=A1=8C=E8=BD=A6=E9=97=B4=E9=9A=94=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/cmdPlugin/CommandHandler.js  |  2 +-
 src/views/demonstration/detail/index.vue | 12 ++++++------
 src/views/newMap/displayBaSiDi/atr.vue   |  7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

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;