From c2cd9e73d5226ce3d20503e174d4f8f8ee3965e8 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 27 Nov 2020 14:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=B3=BB=E7=BB=9F=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/ningbo_01/menus/menuSignal.vue      |  4 +-
 .../theme/ningbo_01/operationConfig.js        |  4 +-
 src/views/newMap/displayNew/exam/index.vue    | 67 +++++++++++--------
 .../newMap/displayNew/exam/tipExamList.vue    | 53 +++++++++++----
 src/views/newMap/displayNew/index.vue         |  6 +-
 5 files changed, 87 insertions(+), 47 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
index 60c3de3f8..44fa2beed 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -77,7 +77,7 @@ export default {
                     {
                         label: '人工解锁进路', // 信号机引导取消
                         handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
+                        cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
                     },
                     {
                         label: '信号封锁',
@@ -129,7 +129,7 @@ export default {
                     {
                         label: '人工解锁进路', // 信号机引导取消
                         handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
+                        cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
                     },
                     {
                         label: '信号重开',
diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js
index 2f5746222..1bbf78210 100644
--- a/src/jmapNew/theme/ningbo_01/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_01/operationConfig.js
@@ -687,8 +687,8 @@ export default {
             trainingType: 'Signal',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '318', tip: '鼠标右键菜单选择【人工解锁进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '318', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【人工解锁进路】' },
+                { deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
         {
diff --git a/src/views/newMap/displayNew/exam/index.vue b/src/views/newMap/displayNew/exam/index.vue
index efb5863d4..8a9f9c1b5 100644
--- a/src/views/newMap/displayNew/exam/index.vue
+++ b/src/views/newMap/displayNew/exam/index.vue
@@ -12,17 +12,19 @@
         <el-button type="success" :disabled="isDisable || dataError" :loading="startLoading" @click="start">{{ $t('display.startBtn') }}</el-button>
       </el-button-group>
     </div>
-    <tip-exam-list :offset-bottom="offsetBottom" @refresh="refresh" />
+    <tip-exam-list :offset-bottom="offsetBottom" />
+    <!-- @refresh="refresh"  -->
   </div>
 </template>
 
 <script>
-import { getTrainingDetailNew } from '@/api/jmap/training';
+// import { getTrainingDetailNew } from '@/api/jmap/training';
 import TipExamList from './tipExamList';
 import { Notification } from 'element-ui';
 import { startTrainingNew } from '@/api/jmap/training';
 import { timeFormat } from '@/utils/date';
 import { refreshExamList, finishOneExamQuestion } from '@/api/management/userexam';
+import { EventBus } from '@/scripts/event-bus';
 
 export default {
     name: 'MenuExam',
@@ -49,6 +51,7 @@ export default {
         return {
             isDisable: false,
             startLoading: false,
+            locateDeviceCode:null,
             training: {
                 id: '',
                 name: '',
@@ -73,14 +76,22 @@ export default {
     watch: {
         '$store.state.map.mapViewLoadedCount': function() {
             this.$store.dispatch('exam/countUsedTime');
+            this.locateDeviceCode && this.$store.dispatch('exam/setCenter', this.locateDeviceCode); // 设置考题对象居中
         },
         $route() {
-            this.initData();
+            // this.initData();
+            this.isDisable = false;
+            this.$store.dispatch('training/end', null);
+            this.$store.dispatch('training/reset');
+            this.$store.dispatch('menuOperation/setButtonOperation', null);
+            this.$store.dispatch('training/setStopCountTime');
+            this.$store.dispatch('training/setTrainingStart', false);
+            EventBus.$emit('viewLoading', false);
         }
     },
-    mounted() {
-        this.initData();
-    },
+    // mounted() {
+    //     this.initData();
+    // },
     methods: {
         tipInfo(opt) {
             if (opt && opt.hasOwnProperty('color') && opt.hasOwnProperty('message')) {
@@ -171,28 +182,28 @@ export default {
                 }
             });
         },
-        refresh() {
-            this.isDisable = false;
-            this.$store.dispatch('training/end', null);
-        },
-        // 课程和考试系统
-        async initData() {
-            if (parseInt(this.$route.query.trainingId)) {
-                const resp = await getTrainingDetailNew(this.$route.query.trainingId);
-                this.$store.dispatch('exam/setCenter', resp.data.locateDeviceCode); // 设置考题对象居中
-                if (resp && resp.code == 200) {
-                    const detail = resp.data;
-                    await this.$store.dispatch('training/setPrdType', this.prdTypeMap[detail.prdType]);
-
-                    await this.$store.dispatch('training/setTrainingData', detail); // 设置实训信息
-                } else {
-                    this.$messageBox(`获取实训步骤数据失败`);
-                    this.endViewLoading();
-                }
-            } else {
-                this.endViewLoading();
-            }
-        },
+        // refresh() {
+        //     this.isDisable = false;
+        //     this.$store.dispatch('training/end', null);
+        // },
+        // // 课程和考试系统
+        // async initData() {
+        //     if (parseInt(this.$route.query.trainingId)) {
+        //         const resp = await getTrainingDetailNew(this.$route.query.trainingId);
+        //         if (resp && resp.code == 200) {
+        //             const detail = resp.data;
+        //             this.locateDeviceCode = resp.data.locateDeviceCode;
+        //             debugger;
+        //             await this.$store.dispatch('training/setPrdType', this.prdTypeMap[detail.prdType]);
+        //             await this.$store.dispatch('training/setTrainingData', detail); // 设置实训信息
+        //         } else {
+        //             this.$messageBox(`获取实训步骤数据失败`);
+        //             this.endViewLoading();
+        //         }
+        //     } else {
+        //         this.endViewLoading();
+        //     }
+        // },
         // 结束加载状态
         endViewLoading(isSuccess) {
             if (!isSuccess) {
diff --git a/src/views/newMap/displayNew/exam/tipExamList.vue b/src/views/newMap/displayNew/exam/tipExamList.vue
index ba6e09447..3e08c5dda 100644
--- a/src/views/newMap/displayNew/exam/tipExamList.vue
+++ b/src/views/newMap/displayNew/exam/tipExamList.vue
@@ -82,6 +82,7 @@
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
 import { refreshExamList } from '@/api/management/userexam';
+// loadTrainingInSimulation
 import { getTrainingDetailNew } from '@/api/jmap/training';
 
 export default {
@@ -113,7 +114,13 @@ export default {
             },
             detailShow: false,
             examIndex: 0,
-            scanInter:null
+            scanInter:null,
+            prdTypeMap: {
+                '01': '01', 	// 现地 => 现地
+                '02': '02', 	// 行调 => 行调
+                '04': '02', 	// 司机 => 行调
+                '05': ''		// 派班 => null
+            }
         };
     },
     computed: {
@@ -151,7 +158,7 @@ export default {
             });
         },
         // 获取试题详情
-        selectedTraining(obj) {
+        selectedTraining(obj, type = null) {
             this.trainingList.forEach((item, index) => {
                 if (item.id == obj.id) {
                     this.examIndex = index;
@@ -159,21 +166,41 @@ export default {
                 }
             });
             if (obj) {
-                getTrainingDetailNew(obj.trainingId).then(res => {
+                // if (type) {
+                getTrainingDetailNew(obj.trainingId).then(resp => {
                     this.courseModel = {
-                        id: res.data.id,
-                        name: res.data.name,
-                        maxDuration: res.data.maxDuration,
-                        remarks: res.data.remarks,
-                        minDuration: res.data.minDuration,
-                        updateTime: res.data.updateTime
+                        id: resp.data.id,
+                        name: resp.data.name,
+                        maxDuration: resp.data.maxDuration,
+                        remarks: resp.data.remarks,
+                        minDuration: resp.data.minDuration,
+                        updateTime: resp.data.updateTime
                     };
-                    // this.$store.dispatch('exam/setCenter', res.data.locateDeviceCode);
+                    this.$store.dispatch('training/setPrdType', this.prdTypeMap[resp.data.prdType]);
+                    this.$store.dispatch('exam/setCenter', resp.data.locateDeviceCode);
+                    this.$store.dispatch('training/setTrainingData', resp.data); // 设置实训信息
                 }).catch(error => {
                     this.$message.error(this.$t('display.exam.getTestInformation') + ':' + error.message);
                 });
+                // } else {
+                //     loadTrainingInSimulation(this.$route.query.group, this.$route.query.trainingId).then(resp => {
+                //         // getTrainingDetailNew(obj.trainingId).then(res => {
+                //         this.courseModel = {
+                //             id: resp.data.id,
+                //             name: resp.data.name,
+                //             maxDuration: resp.data.maxDuration,
+                //             remarks: resp.data.remarks,
+                //             minDuration: resp.data.minDuration,
+                //             updateTime: resp.data.updateTime
+                //         };
+                //         this.$store.dispatch('training/setPrdType', this.prdTypeMap[resp.data.prdType]);
+                //         this.$store.dispatch('exam/setCenter', resp.data.locateDeviceCode);
+                //         this.$store.dispatch('training/setTrainingData', resp.data); // 设置实训信息
+                //     }).catch(error => {
+                //         this.$message.error(this.$t('display.exam.getTestInformation') + ':' + error.message);
+                //     });
+                // }
             }
-
             this.jump(obj);
         },
         getTrainDetail(obj) {
@@ -200,7 +227,7 @@ export default {
                     obj.trainingId = response.data.userExamQuestionsVOs[0].trainingId;
                     obj.id = response.data.userExamQuestionsVOs[0].id;
                 }
-                this.selectedTraining(obj);
+                this.selectedTraining(obj, 'first');
                 this.scanCommit();
             }).catch(error => {
                 // 如果时50009则表示考试已完成，不能再次进行y
@@ -271,7 +298,7 @@ export default {
                 noPreLogout: this.$route.query.noPreLogout
             };
             this.$router.replace({query: query});
-            this.$emit('refresh');
+            // this.$emit('refresh');
         },
         overExam() {
             this.$store.dispatch('exam/isOver').then(isOver => {
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 6baa92778..d470e502c 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -30,7 +30,7 @@ import MenuTrainList from '@/views/newMap/displayNew/menuTrainList';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 
 import { clearSimulation, getSimulationInfoNew, ranAsPlan, exitRunPlan } from '@/api/simulation';
-import { loadNewMapDataByGroup } from '@/utils/loaddata';
+import { loadNewMapDataByGroup, loadMapDataById } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 
 export default {
@@ -118,7 +118,7 @@ export default {
             }
         },
         $route() {
-            if (!this.isLesson) {
+            if (!this.isLesson && !this.isExam) {
                 this.initLoadData();
             }
         }
@@ -225,6 +225,7 @@ export default {
         loadMapData() {
             if (parseInt(this.mapId)) {
                 this.loadNewMapDataByGroup(this.group);
+                // this.loadNewMapDataByGroup(this.mapId);
             } else {
                 this.endViewLoading();
             }
@@ -234,6 +235,7 @@ export default {
             try {
                 this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
                 await loadNewMapDataByGroup(group);
+                // await loadMapDataById(group);
                 await this.$store.dispatch('training/setMapDefaultState');
             } catch (error) {
                 this.$messageBox(`获取地图数据失败: ${error.message}`);