프로필 - 회사 (기본정보)에 추가 , 부서, 직급(세부정보)추가

This commit is contained in:
khk 2020-02-11 16:37:04 +09:00
parent 7094ebddfd
commit a2229f73ae
2 changed files with 27 additions and 13 deletions

View File

@ -59,6 +59,7 @@
<span class="number">{{ userInfo.employeeNum }}</span> <span class="number">{{ userInfo.employeeNum }}</span>
</mat-card-title> </mat-card-title>
<mat-card-subtitle> <mat-card-subtitle>
<span class="company">{{ userInfo.companyName | ucapStringEmptycheck }}</span>
<span class="deptName">{{ userInfo | ucapTranslate: 'deptName' }}</span> <span class="deptName">{{ userInfo | ucapTranslate: 'deptName' }}</span>
<span class="grade">{{ userInfo | ucapTranslate: 'grade' }}</span> <span class="grade">{{ userInfo | ucapTranslate: 'grade' }}</span>
</mat-card-subtitle> </mat-card-subtitle>
@ -177,6 +178,14 @@
<dt class="division">{{ 'profile.fieldCompany' | translate }}</dt> <dt class="division">{{ 'profile.fieldCompany' | translate }}</dt>
<dd>{{ userInfo.companyName | ucapStringEmptycheck }}</dd> <dd>{{ userInfo.companyName | ucapStringEmptycheck }}</dd>
</li> </li>
<li class="deptName">
<dt class="division">{{ 'search.fieldDeptartment' | translate }}</dt>
<dd>{{ userInfo | ucapTranslate: 'deptName' }}</dd>
</li>
<li class="grade">
<dt class="division">{{ 'search.fieldGrade' | translate }}</dt>
<dd>{{ userInfo | ucapTranslate: 'grade' }}</dd>
</li>
<li> <li>
<dt class="division"> <dt class="division">
{{ 'profile.fieldResponsibilities' | translate }} {{ 'profile.fieldResponsibilities' | translate }}

View File

@ -120,9 +120,11 @@ $login-max-height: 800px;
flex-flow: column; flex-flow: column;
span { span {
@include ellipsis(1); @include ellipsis(1);
&.deptName { font-size: 1em;
font-size: 1.2em; margin-bottom: 8px;
line-height: 1.4em; &.company {
font-weight: 600;
font-size: 1.1em;
} }
} }
} }
@ -170,13 +172,15 @@ $login-max-height: 800px;
ul { ul {
display: flex; display: flex;
flex-flow: column; flex-flow: column;
height: calc(100% - 80px);
overflow-y: auto;
li { li {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
height: 30px; height: 26px;
align-items: center; align-items: center;
flex-flow: row; flex-flow: row;
margin-bottom: 14px; margin-bottom: 10px;
dt { dt {
width: 100px; width: 100px;
font-weight: 800; font-weight: 800;
@ -224,16 +228,16 @@ $login-max-height: 800px;
::ng-deep .userInfo-call { ::ng-deep .userInfo-call {
position: relative; position: relative;
display: flex; display: flex;
flex: 0 0 auto; flex: 0 0 26px;
width: 34px; width: 26x;
height: 34px; height: 26px;
line-height: 34px; line-height: 26px;
justify-content: center; justify-content: center;
justify-items: center; justify-items: center;
.mat-button-wrapper { .mat-button-wrapper {
padding: 0; padding: 0;
width: 20px; width: 18px;
height: 20px; height: 18px;
justify-content: center; justify-content: center;
text-align: center; text-align: center;
svg { svg {
@ -252,8 +256,9 @@ $login-max-height: 800px;
&.mat-mini-fab { &.mat-mini-fab {
position: relative; position: relative;
display: flex; display: flex;
width: 40px; width: 36px;
height: 40px; height: 36px;
flex: 0 0 36px;
//line-height: 40px; //line-height: 40px;
.mat-button-wrapper { .mat-button-wrapper {
padding: 0; padding: 0;