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

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2019-11-28 12:44:18 +08:00
commit 9edbec9d62
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/layout/components/Entry.vue
View File

@ -1,25 +1,25 @@
<template>
<div style="display:inline-block">
<div class="avatar-container" style="display:inline-block;margin-right:10px">
<el-menu-item v-for="item in entryList" v-show="!item.hidden" :key="item.name" class="avatar-wrapper" :index="$route.fullPath" @click="item.handle">
<el-menu-item v-for="item in entryList" v-show="!item.hidden" :key="item.name" class="avatar-wrapper" :index="$route.fullPath" :style="item.style" @click="item.handle">
<el-tooltip v-if="item.tip" effect="dark" :content="$t('login.clickSwitchLanguage')" placement="bottom-end">
<span style="color: white;">{{ item.name }}</span>
</el-tooltip>
<el-dropdown v-else-if="isShown && item.isHelp" class="avatar-container" trigger="hover" :show-timeout="100" style="height:58px">
<div class="avatar-wrapper">
<span style="color: white;">
{{ $t(item.name) }}
</span>
<i class="el-icon-caret-bottom" style="color: #909399;" />
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<el-dropdown-item>
<span style="display:block;" @click="goToCaseShow">西安铁路职业技术学院</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span v-else style="color: white;">{{ $t(item.name) }}</span>
</el-menu-item>
<el-dropdown v-if="isShown" class="avatar-container" trigger="hover" :show-timeout="100" style="height:58px">
<div class="avatar-wrapper">
<span style="color: white;">
{{ $t('global.caseShow') }}
</span>
<i class="el-icon-caret-bottom" style="color: #909399;" />
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<el-dropdown-item>
<span style="display:block;" @click="goToCaseShow">西安铁路职业技术学院</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<deomon-list ref="deomonList" />
<qcode ref="qcode" />
</div>
@ -52,6 +52,12 @@ export default {
handle: this.goToTraining,
hidden: !getSessionStorage('project').startsWith('design')
},
{
name: 'global.caseShow',
handle: this.goToCaseShow,
isHelp:true,
style:'padding-right:0px;'
},
{
name: 'global.scan',
handle: this.qcodeEntry,
@ -62,18 +68,14 @@ export default {
handle: this.quickEntry,
hidden: getSessionStorage('project').startsWith('design')
},
{
name: 'global.help',
handle: this.goToHelp
},
// {
// name: 'global.caseShow',
// handle: this.goToCaseShow
// },
{
name: LangStorage.getLang('zh') === 'zh' ? 'English' : '中文',
handle: this.switchLanguage,
tip: true
},
{
name: 'global.help',
handle: this.goToHelp
}
],