From a381bfdcd869893c31b358e7492d35ef37df6689 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 15 Jun 2020 13:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E8=AE=A1=E5=88=92=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=E5=88=9D=E5=A7=8B=E5=8C=96=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=8D=E9=99=90=E5=88=B6=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/display.js                                  | 1 +
 src/i18n/langs/en/joinTraining.js                             | 1 +
 src/i18n/langs/zh/display.js                                  | 1 +
 src/i18n/langs/zh/joinTraining.js                             | 1 +
 .../fuzhou_01/menus/dialog/childDialog/confirmControl.vue     | 4 ++--
 src/views/newMap/displayNew/menuDemon.vue                     | 2 +-
 src/views/newMap/displayNew/menuPractice.vue                  | 2 +-
 src/views/newMap/displayNew/menuScript.vue                    | 2 +-
 src/views/newMap/jointTrainingNew/menuDemon.vue               | 2 +-
 9 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/i18n/langs/en/display.js b/src/i18n/langs/en/display.js
index 9b1b5ccbf..aaf218f8a 100644
--- a/src/i18n/langs/en/display.js
+++ b/src/i18n/langs/en/display.js
@@ -50,6 +50,7 @@ export default {
         exitScript: 'Exit Script',
         drivingByPlan: 'Driving By Plan',
         exitPlan: 'Exit Plan',
+        initialize: 'initialize',
         back: 'Back',
         threeDimensionalView: 'Three-Dimensional View',
         threeDimensionalStation: 'Three-Dimensional Station',
diff --git a/src/i18n/langs/en/joinTraining.js b/src/i18n/langs/en/joinTraining.js
index 137a6da4c..3576f9804 100644
--- a/src/i18n/langs/en/joinTraining.js
+++ b/src/i18n/langs/en/joinTraining.js
@@ -15,6 +15,7 @@ export default {
     driverPerspective: 'Driver perspective',
     drivingByPlan: 'Driving by plan',
     exitPlan: 'Exit plan',
+    initialize: 'initialize',
     runGraphPreview: 'Run graph preview',
     runGraphLoading: 'Run graph loading',
     faultSetting: 'Fault setting',
diff --git a/src/i18n/langs/zh/display.js b/src/i18n/langs/zh/display.js
index 2e43ca30a..ce7c63035 100644
--- a/src/i18n/langs/zh/display.js
+++ b/src/i18n/langs/zh/display.js
@@ -50,6 +50,7 @@ export default {
         exitScript: '退出剧本',
         drivingByPlan: '按计划行车',
         exitPlan: '退出计划',
+        initialize: '初始化',
         back: '返回',
         threeDimensionalView: '三维视图',
         threeDimensionalStation: '三维车站',
diff --git a/src/i18n/langs/zh/joinTraining.js b/src/i18n/langs/zh/joinTraining.js
index dcd8e44c8..b9101d6fd 100644
--- a/src/i18n/langs/zh/joinTraining.js
+++ b/src/i18n/langs/zh/joinTraining.js
@@ -15,6 +15,7 @@ export default {
     driverPerspective: '司机视角',
     drivingByPlan: '按计划行车',
     exitPlan: '退出计划',
+    initialize: '初始化',
     runGraphPreview: '运行图预览',
     runGraphLoading: '运行图加载',
     faultSetting: '故障设置',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
index db0298ce5..f40bb7454 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
@@ -162,7 +162,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -182,7 +182,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 68ed595d1..bc9c97560 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -19,7 +19,7 @@
         </template>
         <template v-else>
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
-          <el-button type="danger" :disabled="!isDisable || dataError" @click="end">{{ $t('display.demon.exitPlan') }}</el-button>
+          <el-button type="danger" :disabled="dataError" @click="end">{{ $t('display.demon.initialize') }}</el-button>
         </template>
         <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
       </el-button-group>
diff --git a/src/views/newMap/displayNew/menuPractice.vue b/src/views/newMap/displayNew/menuPractice.vue
index a11b241f4..7d1b638d9 100644
--- a/src/views/newMap/displayNew/menuPractice.vue
+++ b/src/views/newMap/displayNew/menuPractice.vue
@@ -13,7 +13,7 @@
         <!-- v-if="!isScriptCommand"  -->
         <!-- v-if="!isScriptCommand"  -->
         <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">按计划行车</el-button>
-        <el-button type="danger" :disabled="!isDisable" @click="end">退出计划</el-button>
+        <el-button type="danger" :disabled="dataError" @click="end">初始化</el-button>
         <el-button type="primary" @click="back">返回</el-button>
       </el-button-group>
     </div>
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index 728bf134d..789431329 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -8,7 +8,7 @@
             </el-button-group> -->
       <el-button-group>
         <el-button v-if="!isScriptCommand" type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
-        <el-button v-if="!isScriptCommand" type="danger" :disabled="!isDisable" @click="end">退出计划</el-button>
+        <el-button v-if="!isScriptCommand" type="danger" :disabled="dataError" @click="end">初始化</el-button>
         <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
       </el-button-group>
     </div>
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 5bc048a97..c2d525305 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -8,7 +8,7 @@
         <el-button v-if="isStationSupervisor && !dataError" type="jmap3dcctv" @click="jlmap3dcctv">cctv</el-button>
         <template v-if="isAdmin && project != 'refereeJsxt'">
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
-          <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
+          <el-button type="danger" :disabled="dataError" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
         </template>
         <!-- <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button> -->
       </el-button-group>