From ac05654672563af0631c174673209a939af1185e Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 9 Feb 2023 09:40:18 +0800
Subject: [PATCH] =?UTF-8?q?BUG:=E5=AE=9E=E8=AE=AD=E6=9C=AA=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E7=82=B9=E5=87=BB=E4=BA=86=E7=90=86=E8=AE=BA?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E7=84=B6=E5=90=8E=E5=86=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=A2=98=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/Station/index.js    | 1 -
 src/views/newMap/display/exam/examPanel.vue | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js
index 94b45a416..3bfc9d237 100644
--- a/src/jmapNew/shape/graph/Station/index.js
+++ b/src/jmapNew/shape/graph/Station/index.js
@@ -1022,7 +1022,6 @@ export default class Station extends Group {
     handleGuideLock(model) {
         const sGuideLock = store.getters['map/getDeviceByCode'](model.sGuideLockCode);
         const xGuideLock = store.getters['map/getDeviceByCode'](model.xGuideLockCode);
-        console.log(model, model.sGuideMasterLock, model.xGuideMasterLock);
         sGuideLock && sGuideLock.instance && sGuideLock.instance.handleGuideLock(model.sguideMasterLock);
         xGuideLock && xGuideLock.instance && xGuideLock.instance.handleGuideLock(model.xguideMasterLock);
     }
diff --git a/src/views/newMap/display/exam/examPanel.vue b/src/views/newMap/display/exam/examPanel.vue
index a252fdff3..15cbff8f6 100644
--- a/src/views/newMap/display/exam/examPanel.vue
+++ b/src/views/newMap/display/exam/examPanel.vue
@@ -115,16 +115,16 @@ export default {
             this.$store.dispatch('trainingNew/setExamSwitch', true);
         },
         async questionSelect(index, type) {
+            if (this.$store.state.trainingNew.trainingSwitch) {
+                this.$message.error('请先结束当前实训后再加载新的实训！');
+                return;
+            }
             this.currentQuestionIndex = index;
             this.currentQuestionType = type;
             if (type === 1) {
                 this.$refs.theoryQuestion.doShow();
                 this.$store.dispatch('trainingNew/setTrainingDetail', null);
             } else if (type === 2) {
-                if (this.$store.state.trainingNew.trainingSwitch) {
-                    this.$message.error('请先结束当前实训后再加载新的实训！');
-                    return;
-                }
                 try {
                     const training = this.questionList[1][this.currentQuestionIndex];
                     const detailResp = await getPublishTrainingDetail(training.questionId);