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

src/views/components/StatusIcon/statusIcon.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="icon-box" :style="{top: offset+'px'}">
+  <div id="textStatus" class="icon-box" :style="{top: offset+'px'}">
     <div class="textStatus" :style="{background: holdBackground}" @mouseenter="showHoldStatus" @mouseleave="hideHoldStatus">H</div>
     <div class="textStatus" :style="{background: jumpBackground}" @mouseenter="showJumpStatus" @mouseleave="hideJumpStatus">S</div>
     <pop-tip v-show="popShow" :position="position" :tip="tip" />

src/views/newMap/displayNew/index.vue

@@ -13,6 +13,7 @@
         :data-error="dataError"
         :script-id="scriptId"
         :show-station="showStation"
+        :text-status-height="textStatusHeight"
         @hidepanel="hidepanel"
         @passflow="passflow"
         @quitQuest="quitQuest"
@@ -161,7 +162,8 @@ export default {
                 '04': '02', 	// 司机 => 行调
                 '05': ''		// 派班 => null
             },
-            planRunning:false
+            planRunning:false,
+            textStatusHeight: 0
         };
     },
     computed:{
@@ -521,6 +523,7 @@ export default {
                 const menuTool = document.getElementById('menuTool');
                 const menuBottom = document.getElementById('menuButton');
                 const menuButtonsBox = document.getElementById('menuButtons_box');
+                const textStatus = document.getElementById('textStatus');
                 if (menuBar) {
                     this.offset = (menuBar.offsetHeight || 0) + 15;
                 }
@@ -534,6 +537,9 @@ export default {
                 if (menuButtonsBox) {
                     this.tipBottom = (menuButtonsBox.offsetHeight || 0) + 15;
                 }
+                if (textStatus) {
+                    this.textStatusHeight = textStatus.offsetHeight || 0;
+                }
             });
         },
         setCenter(code) {

src/views/newMap/displayNew/menuDemon.vue

@@ -6,7 +6,7 @@
         <span v-if="countTime" class="display-score">{{ $t('display.demon.trialTime') }} {{ countTime }}</span>
       </el-row>
     </div>
-    <div v-if="!dataError" class="display_top_draft" :style="{top: offset+'px'}">
+    <div v-if="!dataError" class="display_top_draft" :style="{top: offset+textStatusHeight+'px'}">
       <div class="btn_hover" @click="menuClick">菜单</div>
       <!-- :style="`transform: translateX(-${btnWidth}px)`" -->
       <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
@@ -85,6 +85,12 @@ export default {
             default() {
                 return false;
             }
+        },
+        textStatusHeight: {
+            type: Number,
+            default() {
+                return 0;
+            }
         }
     },
     data() {