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 2022-06-17 17:29:54 +08:00
commit 4f855c3836
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/theme/datie_02/menus/index.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="menus" :style="{width: width + 'px'}">
<div v-if="isCtc" style="font-size: 14px;padding: 0 10px;background: #DEE3F3;line-height: 30px;position: absolute;width: 100%;z-index: 9;">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
<menu-bar v-if="isCtc" ref="menuBar" :date-strin="dateString1" :selected="selected" />
<div v-if="isCtc" style="position: absolute; top: 35px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">
<div v-if="isCtc" style="position: absolute; top: 64px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">
<div style="display: flex;">
<img :src="ctcBarIcon1" class="img-box">
<img :src="ctcBarIcon2" class="img-box">
@ -90,7 +91,6 @@ import CtcBarIcon15 from '@/assets/ctc_icon/pic15.png';
import CtcBarIcon16 from '@/assets/ctc_icon/pic16.png';
import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
// <div v-if="isCtc" style="font-size: 14px;padding: 0 10px;background: #DEE3F3;line-height: 30px;">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
export default {
name: 'Menus',

2
src/jmapNew/theme/datie_02/menus/menuBar.vue
View File

@ -1,6 +1,6 @@
<template>
<div id="menuBarChengdu3">
<menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
<menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%;top: 30px;" />
<station-control-convert ref="stationControlConvert" />
<password-box ref="passwordBox" @setLoginResult="getLoginResult" />
<view-name ref="viewName" />

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

@ -184,7 +184,7 @@ export default {
textStatus.style.top = this.offset - 15 + 'px';
}
if (this.$route.query.ctc) {
this.offset = 35;
this.offset = 65;
this.offsetBottom = 2;
}
});