ERP Weblink 추가. 및 코끼리 디자인 적용.

This commit is contained in:
leejinho 2020-03-10 10:59:06 +09:00
parent 209e445618
commit 1d1400da46
8 changed files with 35 additions and 15 deletions

View File

@ -192,6 +192,14 @@ export const decodeUrlInfoDaesang: APIDecoder<DaesangUrlInfoResponse> = (
url: arr.length > 1 ? arr[1] : arr[0] url: arr.length > 1 ? arr[1] : arr[0]
}); });
} }
if (!!res.WebLinkERP) {
const arr = res.WebLinkERP.split(',');
webLink.push({
key: WebLinkType.Erp,
title: arr.length > 1 ? arr[0] : '',
url: arr.length > 1 ? arr[1] : arr[0]
});
}
return { return {
statusCode: res.StatusCode, statusCode: res.StatusCode,

View File

@ -101,6 +101,15 @@
> >
<span class="weblink Personal-news">NEWS</span> <span class="weblink Personal-news">NEWS</span>
</button> </button>
<button
mat-icon-button
*ngSwitchCase="WebLinkType.Erp"
class="button"
[matTooltip]="link.title"
(click)="onClickWebLink(link)"
>
<span class="weblink erp">ERP</span>
</button>
<button <button
mat-icon-button mat-icon-button
*ngSwitchCase="WebLinkType.Mail" *ngSwitchCase="WebLinkType.Mail"
@ -129,11 +138,6 @@
> >
<span class="weblink approved">결제</span> <span class="weblink approved">결제</span>
</button> </button>
<!--웹링크 ASP추가-->
<button mat-icon-button class="button" [matTooltip]="link.title"
(click)="onClickWebLink(link)">
<span class="weblink sap">SAP</span>
</button>
</ng-container> </ng-container>
</div> </div>
<span <span

View File

@ -96,13 +96,12 @@
text-indent: 0; text-indent: 0;
} }
&.sms, &.sms,
&.sap { &.erp {
text-indent: 0; text-indent: 0;
letter-spacing: -1px; letter-spacing: -1px;
} }
&.ep, &.ep,
&.it-service, &.it-service {
{
text-indent: 0; text-indent: 0;
font-size: 13px; font-size: 13px;
} }

View File

@ -408,11 +408,16 @@ export class TopBarComponent implements OnInit, OnDestroy {
const loginPw2 = this.loginInfo.loginPw; const loginPw2 = this.loginInfo.loginPw;
const loginId = this.loginInfo.loginId; const loginId = this.loginInfo.loginId;
const token = this.loginRes.tokenString; const token = this.loginRes.tokenString;
const erpPw = this.daesangCipherService.encryptForSapErp(
'aes256-daesang-key!!',
this.loginRes.userInfo.employeeNum
);
const url = link.url const url = link.url
.replace(/(\(%USER_TOKEN%\))/g, token) .replace(/(\(%USER_TOKEN%\))/g, token)
.replace(/(\(%USER_ID%\))/g, loginId) .replace(/(\(%USER_ID%\))/g, loginId)
.replace(/(\(%USER_PASS%\))/g, loginPw); .replace(/(\(%USER_PASS%\))/g, loginPw)
.replace(/(\(%ENC_PASSWD%\))/g, erpPw);
let width = 1160; let width = 1160;
let height = 800; let height = 800;
@ -461,6 +466,8 @@ export class TopBarComponent implements OnInit, OnDestroy {
/** 결재Count URL */ /** 결재Count URL */
case WebLinkType.Payment: case WebLinkType.Payment:
/** 결재링크 URL */ /** 결재링크 URL */
case WebLinkType.Erp:
/** Erp URL */
case WebLinkType.ChgPassword: case WebLinkType.ChgPassword:
/** 비밀번호변경 URL ; PC 메신저만 해당 비밀번호 만료시 */ /** 비밀번호변경 URL ; PC 메신저만 해당 비밀번호 만료시 */
{ {

View File

@ -50,7 +50,7 @@ export class DaesangCipherService {
* const dec = this.daesangCipherService.decryptForSapErp('aes256-daesang-key!!',enc); * const dec = this.daesangCipherService.decryptForSapErp('aes256-daesang-key!!',enc);
* console.log('dec', dec); * console.log('dec', dec);
*/ */
encryptForSapErp(pvUserKey: string, employeeNum: number): string { encryptForSapErp(pvUserKey: string, employeeNum: string): string {
// const txt = '20200221090321_asdfghjk'; // 1QgLAiLqJ6Uo6bE4Qk1o3Yd6mfqxXSnmqXX%2FXLL7DoA%3D // const txt = '20200221090321_asdfghjk'; // 1QgLAiLqJ6Uo6bE4Qk1o3Yd6mfqxXSnmqXX%2FXLL7DoA%3D
// const txt = '20200221101444_asdfghjk'; // Lz1TIdGTQQMui%2BBHMdj8fatYYhXbwJEL%2BJ91C7jUWEs%3D // const txt = '20200221101444_asdfghjk'; // Lz1TIdGTQQMui%2BBHMdj8fatYYhXbwJEL%2BJ91C7jUWEs%3D
const str = moment().format('YYYYMMDDHHmmss') + '_' + employeeNum; const str = moment().format('YYYYMMDDHHmmss') + '_' + employeeNum;

View File

@ -28,5 +28,7 @@ export enum WebLinkType {
/** 결재링크 URL */ /** 결재링크 URL */
Payment = 'WebLinkPayment', Payment = 'WebLinkPayment',
/** 비밀번호변경 URL ; PC 메신저만 해당 비밀번호 만료시 */ /** 비밀번호변경 URL ; PC 메신저만 해당 비밀번호 만료시 */
ChgPassword = 'WebLinkChgPassword' ChgPassword = 'WebLinkChgPassword',
/** Erp */
Erp = 'WebLinkERP'
} }

View File

@ -24,9 +24,9 @@
> >
<i class="mid mdi-camera"></i> <i class="mid mdi-camera"></i>
</button> </button>
<button <!-- <button
mat-mini-fab mat-mini-fab
class="mat-elevation-z6 icon-button btn-elephane" class="mat-elevation-z6 icon-button btn-elephant"
*ngIf="!isMe" *ngIf="!isMe"
> >
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30" stroke-width="1.5" <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30" stroke-width="1.5"
@ -35,7 +35,7 @@
d="M29,17.3a21.32,21.32,0,0,0-.63-4.39A10.59,10.59,0,0,0,28,11.85c0-.14-.1-.27-.15-.41l-.16-.39a13,13,0,0,0-.81-1.52,11.29,11.29,0,0,0-1.59-2c-.2-.2-.4-.4-.62-.58s-.43-.36-.66-.53a10.83,10.83,0,0,0-1.82-1.09l-.39-.18c-.26-.11-.53-.21-.81-.31A11.06,11.06,0,0,0,6.62,13.71l0,.09v0s0,.07,0,.1v0a.52.52,0,0,0,0,.11h0a.43.43,0,0,1,0,.11h0a.32.32,0,0,1,0,.09v0s0,.05,0,.08h0a.1.1,0,0,1,0,0h0l-.05,0h0l0,0a1.42,1.42,0,0,1-.56-.62,1.84,1.84,0,0,1-.13-1.17A4,4,0,0,1,6,11.55L2.14,9.83h0a6.75,6.75,0,0,0-.84,1.78c-.05.14-.09.29-.13.45A6.18,6.18,0,0,0,1,13.31a5,5,0,0,0,.78,2.84c.08.13.17.26.26.38l.06.08c.09.11.17.22.27.33l0,0,.26.28.07.06.28.25,0,0a2.48,2.48,0,0,0,.26.19l.06,0,.3.19.05,0,.27.14.06,0,.29.13.06,0,.25.09,0,0,.29.09h.06l.24.06h0l.26.05h0l.23,0h0l.23,0h.94l.13.43c.07.19.15.38.23.57s.17.38.27.56a11.26,11.26,0,0,0,1,1.51c.13.16.25.32.39.48a5.34,5.34,0,0,0,.39.44A11.78,11.78,0,0,0,10.9,24.1c.27.2.54.39.83.57a11.72,11.72,0,0,0,1.78,1l.16.06h.19l.13,0h0l.1-.06h0a.39.39,0,0,0,.08-.1h0l.05-.11v0l0-.1h0s0-.06,0-.09v-.08h0v-1a3.27,3.27,0,0,1,.41-1.59,3.36,3.36,0,0,1,2.94-1.76h0a3.31,3.31,0,0,1,1,.16l.3.11a3.15,3.15,0,0,1,.57.31,2.48,2.48,0,0,1,.26.19A3.34,3.34,0,0,1,21,24.08v.79h0v.29l0,0v0a.43.43,0,0,1,0,0v0a.25.25,0,0,0,0,.07h0a.21.21,0,0,0,0,.06v0l0,0,0,0,0,0,0,0,0,0h.18l.09,0a11,11,0,0,0,1.65-.82c.27-.16.53-.34.78-.52a10.65,10.65,0,0,0,1.07-.93c.11-.12.22-.23.32-.35a7.25,7.25,0,0,0,.58-.76l.24-.4a6.43,6.43,0,0,0,.41-.88l.15-.46.15.64c0,.09,0,.18.05.27v.09l0,.18v.1l0,.19V22l0,.2v.05l0,.2v.07c0,.05,0,.09,0,.14v.07a.69.69,0,0,1,0,.13V23a.94.94,0,0,1,0,.16v0a.56.56,0,0,0,0,.12v0l0,.08v0l0,.06,0,0a.1.1,0,0,0,.05,0h.07l.05,0s0,0,0,0a.12.12,0,0,0,.05,0l0,0a.52.52,0,0,0,.08-.11A9.41,9.41,0,0,0,29,18.52C29,18.12,29,17.71,29,17.3ZM10.55,11.59a.86.86,0,1,1,0-1.71.85.85,0,0,1,.85.85A.86.86,0,0,1,10.55,11.59Zm9.79,4.79A5.27,5.27,0,0,1,17,18.07a2.67,2.67,0,0,1-2-.95,7.21,7.21,0,0,1-1.69-4.84c.07-1.18.76-4,5.58-4.94a4.18,4.18,0,0,1,.61,0v0a3.43,3.43,0,0,1,3.11,2.29C23.5,11.73,22.63,14.27,20.34,16.38Z" d="M29,17.3a21.32,21.32,0,0,0-.63-4.39A10.59,10.59,0,0,0,28,11.85c0-.14-.1-.27-.15-.41l-.16-.39a13,13,0,0,0-.81-1.52,11.29,11.29,0,0,0-1.59-2c-.2-.2-.4-.4-.62-.58s-.43-.36-.66-.53a10.83,10.83,0,0,0-1.82-1.09l-.39-.18c-.26-.11-.53-.21-.81-.31A11.06,11.06,0,0,0,6.62,13.71l0,.09v0s0,.07,0,.1v0a.52.52,0,0,0,0,.11h0a.43.43,0,0,1,0,.11h0a.32.32,0,0,1,0,.09v0s0,.05,0,.08h0a.1.1,0,0,1,0,0h0l-.05,0h0l0,0a1.42,1.42,0,0,1-.56-.62,1.84,1.84,0,0,1-.13-1.17A4,4,0,0,1,6,11.55L2.14,9.83h0a6.75,6.75,0,0,0-.84,1.78c-.05.14-.09.29-.13.45A6.18,6.18,0,0,0,1,13.31a5,5,0,0,0,.78,2.84c.08.13.17.26.26.38l.06.08c.09.11.17.22.27.33l0,0,.26.28.07.06.28.25,0,0a2.48,2.48,0,0,0,.26.19l.06,0,.3.19.05,0,.27.14.06,0,.29.13.06,0,.25.09,0,0,.29.09h.06l.24.06h0l.26.05h0l.23,0h0l.23,0h.94l.13.43c.07.19.15.38.23.57s.17.38.27.56a11.26,11.26,0,0,0,1,1.51c.13.16.25.32.39.48a5.34,5.34,0,0,0,.39.44A11.78,11.78,0,0,0,10.9,24.1c.27.2.54.39.83.57a11.72,11.72,0,0,0,1.78,1l.16.06h.19l.13,0h0l.1-.06h0a.39.39,0,0,0,.08-.1h0l.05-.11v0l0-.1h0s0-.06,0-.09v-.08h0v-1a3.27,3.27,0,0,1,.41-1.59,3.36,3.36,0,0,1,2.94-1.76h0a3.31,3.31,0,0,1,1,.16l.3.11a3.15,3.15,0,0,1,.57.31,2.48,2.48,0,0,1,.26.19A3.34,3.34,0,0,1,21,24.08v.79h0v.29l0,0v0a.43.43,0,0,1,0,0v0a.25.25,0,0,0,0,.07h0a.21.21,0,0,0,0,.06v0l0,0,0,0,0,0,0,0,0,0h.18l.09,0a11,11,0,0,0,1.65-.82c.27-.16.53-.34.78-.52a10.65,10.65,0,0,0,1.07-.93c.11-.12.22-.23.32-.35a7.25,7.25,0,0,0,.58-.76l.24-.4a6.43,6.43,0,0,0,.41-.88l.15-.46.15.64c0,.09,0,.18.05.27v.09l0,.18v.1l0,.19V22l0,.2v.05l0,.2v.07c0,.05,0,.09,0,.14v.07a.69.69,0,0,1,0,.13V23a.94.94,0,0,1,0,.16v0a.56.56,0,0,0,0,.12v0l0,.08v0l0,.06,0,0a.1.1,0,0,0,.05,0h.07l.05,0s0,0,0,0a.12.12,0,0,0,.05,0l0,0a.52.52,0,0,0,.08-.11A9.41,9.41,0,0,0,29,18.52C29,18.12,29,17.71,29,17.3ZM10.55,11.59a.86.86,0,1,1,0-1.71.85.85,0,0,1,.85.85A.86.86,0,0,1,10.55,11.59Zm9.79,4.79A5.27,5.27,0,0,1,17,18.07a2.67,2.67,0,0,1-2-.95,7.21,7.21,0,0,1-1.69-4.84c.07-1.18.76-4,5.58-4.94a4.18,4.18,0,0,1,.61,0v0a3.43,3.43,0,0,1,3.11,2.29C23.5,11.73,22.63,14.27,20.34,16.38Z"
transform="translate(-1 -4.29)" /> transform="translate(-1 -4.29)" />
</svg> </svg>
</button> </button> -->
<span <span
*ngIf="getWorkstatus(userInfo).length > 0" *ngIf="getWorkstatus(userInfo).length > 0"
class="work-status" class="work-status"

View File

@ -228,7 +228,7 @@ $login-max-height: 800px;
} }
} }
.btn-elephane { .btn-elephant {
position: absolute; position: absolute;
background-color: #ffffff !important; background-color: #ffffff !important;
justify-content: center; justify-content: center;