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

右上角用户昵称样式调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2019-10-23 16:09:44 +08:00
parent b0c589cd2a
commit 0b23a7f9a0
5 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
<template> <template>
<div class="avatar-container" style="right: 80px;"> <div class="avatar-container">
<!-- style="right: 80px;" -->
<el-menu-item v-for="item in entryList" v-show="!item.hidden" :key="item.name" class="avatar-wrapper" index="" @click="item.handle"> <el-menu-item v-for="item in entryList" v-show="!item.hidden" :key="item.name" class="avatar-wrapper" index="" @click="item.handle">
<span style="color: white;">{{ $t(item.name) }}</span> <span style="color: white;">{{ $t(item.name) }}</span>
</el-menu-item> </el-menu-item>

6
src/layout/components/Logout.vue
View File

@ -84,8 +84,10 @@ export default {
.avatar-container { .avatar-container {
height: $height; height: $height;
display: inline-block; display: inline-block;
position: absolute; // position: absolute;
right: 35px; position: relative;
right: 0px;
// right: 35px;
.avatar-wrapper { .avatar-wrapper {
cursor: pointer; cursor: pointer;

27
src/layout/components/Navbar.vue
View File

@ -68,13 +68,16 @@
</el-submenu> </el-submenu>
</template> </template>
</template> </template>
<quick-entry v-if="isShow" ref="quickEntry" /> <div class="rightGroup">
<div class="avatar-container" style="right: 80px;" v-if="!isShow" @click="goToTraining"> <quick-entry v-if="isShow" ref="quickEntry" />
<el-menu-item class="avatar-wrapper" index=""> <!-- style="right: 80px;" -->
<span style="color: white;">城市轨道交通实训平台</span> <div class="avatar-container" v-if="!isShow" @click="goToTraining">
</el-menu-item> <el-menu-item class="avatar-wrapper" index="">
<span style="color: white;">城市轨道交通实训平台</span>
</el-menu-item>
</div>
<user-logout ref="userLogout" />
</div> </div>
<user-logout ref="userLogout" />
</el-menu> </el-menu>
</template> </template>
@ -168,6 +171,12 @@ export default {
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
$height: 61px; $height: 61px;
.rightGroup{
position: absolute;
right: 35px;
display: inline-block;
}
.navbar { .navbar {
height: $height; height: $height;
line-height: $height; line-height: $height;
@ -191,8 +200,10 @@ export default {
.avatar-container { .avatar-container {
height: $height; height: $height;
display: inline-block; display: inline-block;
position: absolute; position: relative;
right: 35px; margin-right:10px;
// position: absolute;
// right: 35px;
.avatar-wrapper { .avatar-wrapper {
cursor: pointer; cursor: pointer;

6
src/views/approval/runPlan/index.vue
View File

@ -35,11 +35,11 @@
data: [] data: []
} }
}, },
'scriptName':{ 'name':{
type: 'text', type: 'text',
label: this.$t('approval.runPlanName') label: this.$t('approval.runPlanName')
}, },
'userName': { 'creatorName': {
type: 'text', type: 'text',
label: this.$t('approval.applicant') label: this.$t('approval.applicant')
} }
@ -66,7 +66,7 @@
}, },
{ {
title: this.$t('approval.applicant'), title: this.$t('approval.applicant'),
prop: 'userName' prop: 'creatorName'
}, },
{ {
title: this.$t('approval.applyTime'), title: this.$t('approval.applyTime'),

4
src/views/approval/script/index.vue
View File

@ -1,8 +1,6 @@
<template> <template>
<div> <div>
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" /> <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
<!-- <script-operate ref='applyPassed' @reloadTable="reloadTable" @create="handleConfirmPass" :title="$t('approval.passedScript')" type="applyPassed">
</script-operate> -->
<script-operate ref='applyReject' @reloadTable="reloadTable" @create="handleConfirmReject" :title="$t('approval.rejectScript')"> <script-operate ref='applyReject' @reloadTable="reloadTable" @create="handleConfirmReject" :title="$t('approval.rejectScript')">
</script-operate> </script-operate>
</div> </div>
@ -37,7 +35,7 @@
data: [] data: []
} }
}, },
'scriptName':{ 'name':{
type: 'text', type: 'text',
label: this.$t('approval.scriptName') label: this.$t('approval.scriptName')
}, },