joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-08-07 14:12:45 +08:00
commit 18f2265e36
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/components/StatusIcon/statusIcon.vue
View File

@ -1,5 +1,5 @@
<template> <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: holdBackground}" @mouseenter="showHoldStatus" @mouseleave="hideHoldStatus">H</div>
<div class="textStatus" :style="{background: jumpBackground}" @mouseenter="showJumpStatus" @mouseleave="hideJumpStatus">S</div> <div class="textStatus" :style="{background: jumpBackground}" @mouseenter="showJumpStatus" @mouseleave="hideJumpStatus">S</div>
<pop-tip v-show="popShow" :position="position" :tip="tip" /> <pop-tip v-show="popShow" :position="position" :tip="tip" />

8
src/views/newMap/displayNew/index.vue
View File

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

8
src/views/newMap/displayNew/menuDemon.vue
View File

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