Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

# Conflicts:
#	src/scripts/cmdPlugin/ValidateHandler.js

src/jmapNew/theme/haerbin_01/menus/menuButton.vue

@@ -26,9 +26,8 @@
                 :data="tempData"
                 border
                 :cell-style="tableStyle"
-                style="width: 100%;background: #E0E0E0;border: none;outline: none;"
+                style="width: 100%;background: #E0E0E0;border: none;outline: none; height: 56px"
                 size="mini"
-                height="56"
                 class="haerbin_table"
                 highlight-current-row
                 :show-header="false"
@@ -107,7 +106,7 @@ export default {
                 { name: '重复开放', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menu, show: false },
                 { name: '封锁信号', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menu, show: false },
                 { name: '解封信号', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menu, show: false },
-                { name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.cancelAutoTrigger.menu, show: false }
+                { name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menu, show: false }
             ],
             routeParamList: [
                 { name: 'ATP进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menu, show: false },

src/jmapNew/theme/haerbin_01/menus/menuSection.vue

@@ -42,34 +42,7 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                Local: [
+                Local: [],
-                    // {
-                    //     label: '区段故障解锁',
-                    //     handler: this.fault,
-                    //     cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    // },
-                    {
-                        label: '区段封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
-                    },
-                    {
-                        label: '区段解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
-                    },
-                    {
-                        label: '区段设置限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-
-                    },
-                    {
-                        label: '区段取消限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
-                    }
-                ],
                 Center: [
                     // {
                     //     label: '区段故障解锁',

src/scripts/cmdPlugin/ValidateHandler.js

@@ -52,7 +52,6 @@ class ValidateHandler {
         const order = Handler.getOrder();
 
         let valid = false;
-        // debugger;
         if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
             if (operate && steps[0] &&
                 operate.code == steps[0].code &&

src/views/newMap/displayNew/index.vue

@@ -4,9 +4,30 @@
       <transition name="el-zoom-in-bottom">
         <map-system-draft ref="mapCanvas" @back="back" />
       </transition>
-      <menu-exam v-if="isExam" ref="menuExam" :offset="offset" :offset-bottom="offsetBottom" :group="group" />
+      <menu-exam
+        v-if="isExam"
+        ref="menuExam"
+        :offset="offset"
+        :offset-bottom="offsetBottom"
+        :group="group"
+        :show-station="showStation"
+        :station-list="stationList"
+        :show-select-station="showSelectStation"
+        @switchStationMode="switchStationMode"
+      />
 
-      <menu-lesson v-if="isLesson" ref="lessonMenu" :offset="offset" :offset-bottom="offsetBottom" :group="group" :training-obj="trainingObj" />
+      <menu-lesson
+        v-if="isLesson"
+        ref="lessonMenu"
+        :offset="offset"
+        :offset-bottom="offsetBottom"
+        :group="group"
+        :training-obj="trainingObj"
+        :show-station="showStation"
+        :station-list="stationList"
+        :show-select-station="showSelectStation"
+        @switchStationMode="switchStationMode"
+      />
 
       <menu-demon
         v-if="isDemon"

src/views/newMap/displayNew/menuExam.vue

@@ -3,6 +3,9 @@
     <div class="display-card" :style="{top: offset + 'px'}">
       <el-row style="vertical-align:middle; ">
         <span class="display-time">{{ formatUsedTime }}</span>
+        <el-select v-if="showSelectStation" v-model="showStation" style="width: 100px;position: fixed; right: 10px;" size="small" @change="switchStationMode">
+          <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
       </el-row>
     </div>
     <div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
@@ -41,6 +44,24 @@ export default {
         offsetBottom: {
             type: Number,
             required: true
+        },
+        showSelectStation: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        },
+        stationList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
+        showStation: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
@@ -152,6 +173,9 @@ export default {
         refresh() {
             this.isDisable = false;
             this.$store.dispatch('training/end', null);
+        },
+        switchStationMode(val) {
+            this.$emit('switchStationMode', val);
         }
     }
 };

src/views/newMap/displayNew/menuLesson.vue

@@ -9,6 +9,9 @@
         </el-radio-group>
         <span class="display-time">{{ formatUsedTime }}</span>
         <span v-if="demoMode === TrainingMode.TEST" class="display-score">{{ $t('display.lesson.score') }}{{ formatScore }}</span>
+        <el-select v-if="showSelectStation" v-model="showStation" style="width: 100px; position: fixed; right: 10px;" size="small" @change="switchStationMode">
+          <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
       </el-row>
     </div>
     <div id="teachGroupButton" class="display-draft" :style="{bottom: offsetBottom + 'px'}">
@@ -55,6 +58,24 @@ export default {
         offsetBottom: {
             type: Number,
             required: true
+        },
+        showSelectStation: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        },
+        stationList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
+        showStation: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
@@ -201,6 +222,9 @@ export default {
             } else {
                 buttons.setAttribute('style', '');
             }
+        },
+        switchStationMode(val) {
+            this.$emit('switchStationMode', val);
         }
     }
 };