Browse Source

添加用户关联员工

pull/144/head
xuxiaoming 3 years ago
parent
commit
79e3db72ab
3 changed files with 19 additions and 60 deletions
  1. +13
    -54
      src/components/Header.vue
  2. +5
    -5
      src/components/Layout.vue
  3. +1
    -1
      yarn.lock

+ 13
- 54
src/components/Header.vue View File

@ -1,17 +1,13 @@
<template>
<div id="title-wrap">
<!-- <span><el-button icon="el-icon-d-arrow-left" circle /></span> -->
<img class="menu-img" :src="menuImg" @click="menuClick" />
<!-- <img class="logo-img" :src="logo" /> -->
<!-- <p class="title-test">{{ title }}</p> -->
<!-- <p class="separation-line" /> -->
<img class="customer-logo" :src="customerLogo" />
<!-- <p class="customer-name">{{ customerName }}</p> -->
<div class="user-info-wrap">
<el-dropdown>
<el-avatar
shape="square"
:size="40"
:size="25"
fit="contain"
:src="userInfo.avatar"
/>
@ -120,9 +116,9 @@ export default {
}
.el-dropdown {
float: right;
width: 40px;
height: 40px;
margin-top: 8px;
width: 25px;
height: 25px;
margin-top: 5px;
margin-right: 8px;
}
}
@ -133,37 +129,19 @@ export default {
float: left;
width: 40px;
height: 40px;
margin-top: 10px;
margin-top: 4px;
margin-left: 24px;
cursor: pointer;
}
.logo-img {
float: left;
width: 32px;
height: 32px;
margin-top: 21px;
margin-left: 32px;
}
.title-test {
float: left;
margin-left: 10px;
font-size: 22px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #ffffff;
line-height: 80px;
text-shadow: 0px -1px 0px #215c85;
font-style: oblique;
}
.user-info-wrap {
float: right;
min-width: 199px;
height: 56px;
height: 35px;
box-shadow: 0px 1px 3px 0px #1e514d;
border-radius: 2px;
border: 1px solid #2c998f;
margin-top: 2px;
margin-top: 7px;
margin-right: 16px;
.user-details-wrap {
float: right;
@ -173,6 +151,7 @@ export default {
margin: 0;
line-height: 18px;
text-align: right;
float: right;
span {
font-size: 16px;
font-family: PingFangSC-Semibold, PingFang SC;
@ -182,11 +161,10 @@ export default {
text-shadow: 0px 0px 0px #215c57;
}
}
.user-details {
line-height: 24px;
margin-top: 10px;
.user-details, .system-time {
line-height: 35px;
span {
margin-left: 24px;
margin-left: 20px;
}
}
.system-time {
@ -201,32 +179,13 @@ export default {
}
}
}
.separation-line {
float: left;
width: 1px;
height: 42px;
float: left;
margin: 19px 24px;
background: #ffffff;
}
.customer-logo {
float: left;
width: 185px;
height: 26px;
margin-top: 17px;
margin-top: 12px;
margin-left: 40px;
}
.customer-name {
float: left;
margin: 0;
min-width: 100px;
line-height: 80px;
font-size: 22px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #ffffff;
text-shadow: 0px -1px 0px #1e5353;
}
.item {
float: right;
height: 30px;


+ 5
- 5
src/components/Layout.vue View File

@ -39,7 +39,7 @@ export default {
width: 100%;
height: 100%;
box-sizing: border-box;
padding-top: 62px;
padding-top: 50px;
padding-left: 250px;
background: #f3f3f3;
#content-title {
@ -47,16 +47,16 @@ export default {
top: 0;
left: 0;
width: 100%;
height: 62px;
line-height: 62px;
height: 50px;
line-height: 50px;
background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
}
#content-nav-menu {
position: absolute;
top: 62px;
top: 50px;
left: 0;
width: 250px;
height: calc(100% - 62px);
height: calc(100% - 50px);
background: #eeeeee;
box-sizing: border-box;
padding-top: 12px;


+ 1
- 1
yarn.lock View File

@ -9139,4 +9139,4 @@ zrender@5.2.1:
resolved "https://registry.nlark.com/zrender/download/zrender-5.2.1.tgz#5f4bbda915ba6d412b0b19dc2431beaad05417bb"
integrity sha1-X0u9qRW6bUErCxncJDG+qtBUF7s=
dependencies:
tslib "2.3.0"
tslib "2.3.0"

Loading…
Cancel
Save