From c6c8e5d792bc58febe7e10ed059b4630a5ebb4a3 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Tue, 26 Jul 2022 08:21:18 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=ED=98=84=EC=9E=AC=EC=A0=91=EC=86=8D?= =?UTF-8?q?=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mock-api/apps/member/current-user/data.ts | 3 + .../components/list.component.html | 464 +++++++++++------- .../current-user/components/list.component.ts | 17 + .../current-user/models/current-user.ts | 2 + 4 files changed, 318 insertions(+), 168 deletions(-) diff --git a/src/app/mock-api/apps/member/current-user/data.ts b/src/app/mock-api/apps/member/current-user/data.ts index ca0d8d0..1bcc183 100644 --- a/src/app/mock-api/apps/member/current-user/data.ts +++ b/src/app/mock-api/apps/member/current-user/data.ts @@ -14,5 +14,8 @@ export const currentUsers = [ ownComp: 3111, rank: '회원', siteAddress: 'web4nova114.com', + writer: '관리자', + content: + '--선택--\n5008\n**입금계좌문의시(가상계좌1)**\n**출금비밀번호문의시**\n----탈퇴,졸업관련----\n**졸업안내\n----입금관련문의----\n>>타인명의입금시\n----환전관련문의----\n**환전지연안내(환전량 증가)\n**은행점검(뱅킹장애)등으로 충환전지연안내\n서버점검안내\n서버점검완료안내', }, ]; diff --git a/src/app/modules/admin/member/current-user/components/list.component.html b/src/app/modules/admin/member/current-user/components/list.component.html index 2b25670..b761735 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.html +++ b/src/app/modules/admin/member/current-user/components/list.component.html @@ -1,176 +1,304 @@ -
- -
- -
- -
- -
- 현재접속자&쪽지전송 -
-
- -
- -
- - -
- -
-
번호
-
상부
-
- 아이디 -
- 닉네임 -
-
- 등급 -
- 레벨 -
-
현재위치
- - - - - - -
- - - -
-
{{ currentUser.index }}
-
{{ currentUser.highRank }}
-
-
- {{ currentUser.signinId }} -
-
- {{ currentUser.nickname }} -
- {{ currentUser.currentLocation }} -
-
- {{ currentUser.rank }} -
- {{ currentUser.level }} -
-
{{ currentUser.currentLocation }}
- - - - - - -
- - -
- - - - - - +
+
+
+
- There are no data! -
- -
- -
-
-
- 현재 접속자 & 전체회원 쪽지보내기 -
-
- - -
- - 제목 - - + +
+ +
+ +
+ +
+ 현재접속자&쪽지전송 +
+ +
+ +
+ + +
+ +
+
번호
+
상부
+
+ 아이디 +
+ 닉네임 +
+
+ 등급 +
+ 레벨 +
+
현재위치
+ + + + + + +
+ + + +
+
{{ currentUser.index }}
+
{{ currentUser.highRank }}
+
+
+ {{ currentUser.signinId }} +
+
+ {{ currentUser.nickname }} +
+ {{ currentUser.currentLocation }} +
+
+ {{ currentUser.rank }} +
+ {{ currentUser.level }} +
+
{{ currentUser.currentLocation }}
+ + + + + + +
+ + +
+ + + + + + +
+ There are no data! +
+
-
- - 글쓴이 - - +
+
+
+
+
+ 현재 접속자 & 전체회원 쪽지보내기
-
- - 내용 - - +
+
+ + +
+ 구분 + + + 전체 + + + 현재접속자 + + + 본사 + + + 대본 + + + 부본 + + + 총판 + + + 매장 + + + 회원 + + +
+
+ 대본아이디 + + + 대본하부회원 + + + + + 선택 + kgon2 + bbc100 + test00 + qwer11 + zxcv123 + on01 + + +
+
+ 부본아이디 + + + 부본하부회원 + + + + + 선택 + kgon3 + test33 + aa2315 + test770 + zxcv12 + on02 + + +
+
+ + 제목 + + +
+
+ + 글쓴이 + + +
+ + + 내용 + + +
+ +
+
+ +
+ +
-
- - - -
- - +
+
diff --git a/src/app/modules/admin/member/current-user/components/list.component.ts b/src/app/modules/admin/member/current-user/components/list.component.ts index be34900..ee3cb66 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.ts +++ b/src/app/modules/admin/member/current-user/components/list.component.ts @@ -77,6 +77,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { searchInputControl = new FormControl(); selectedCurrentUser?: CurrentUser; pagination?: CurrentUserPagination; + targetForm!: FormGroup; private _unsubscribeAll: Subject = new Subject(); @@ -99,6 +100,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { * On init */ ngOnInit(): void { + this.targetForm = this._formBuilder.group({ + writer: [''], + content: [''], + }); // Get the pagination this._currentUserService.pagination$ .pipe(takeUntil(this._unsubscribeAll)) @@ -111,6 +116,18 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { }); // Get the products + this._currentUserService.currentUsers$ + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe((curUsers: any[] | undefined) => { + if (!curUsers) { + return; + } + + this.targetForm.patchValue(curUsers[0]); + // Mark for check + this._changeDetectorRef.markForCheck(); + }); + this.currentUsers$ = this._currentUserService.currentUsers$; } diff --git a/src/app/modules/admin/member/current-user/models/current-user.ts b/src/app/modules/admin/member/current-user/models/current-user.ts index be2ab03..8864686 100644 --- a/src/app/modules/admin/member/current-user/models/current-user.ts +++ b/src/app/modules/admin/member/current-user/models/current-user.ts @@ -11,4 +11,6 @@ export interface CurrentUser { ownComp?: number; rank?: string; siteAddress?: string; + writer?: string; + content?: string; } From c8bdcce0a67776fb1146bb3e0630118bef236927 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Tue, 26 Jul 2022 08:35:42 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=ED=98=84=EC=9E=AC=EC=A0=91=EC=86=8D?= =?UTF-8?q?=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/list.component.html | 272 ++++++++++-------- .../current-user/components/list.component.ts | 16 +- 2 files changed, 155 insertions(+), 133 deletions(-) diff --git a/src/app/modules/admin/member/current-user/components/list.component.html b/src/app/modules/admin/member/current-user/components/list.component.html index b761735..37ce9e7 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.html +++ b/src/app/modules/admin/member/current-user/components/list.component.html @@ -17,134 +17,156 @@
현재접속자&쪽지전송
- -
- -
- - -
- -
-
번호
-
상부
-
- 아이디 -
- 닉네임 -
-
- 등급 -
- 레벨 -
-
현재위치
- - - - - - +
+ +
+ +
+ + +
+ +
+
번호
+
상부
+
+ 아이디 +
+ 닉네임
- - - -
-
{{ currentUser.index }}
-
{{ currentUser.highRank }}
-
-
- {{ currentUser.signinId }} -
-
- {{ currentUser.nickname }} -
- {{ currentUser.currentLocation }} -
-
- {{ currentUser.rank }} -
- {{ currentUser.level }} -
-
{{ currentUser.currentLocation }}
- - - - - - -
- - +
+ 등급 +
+ 레벨 +
+
현재위치
+ + + + + + +
- - - - - - -
- There are no data! + + + +
+
{{ currentUser.index }}
+
{{ currentUser.highRank }}
+
+
+ {{ currentUser.signinId }} +
+
+ {{ currentUser.nickname }} +
+ {{ currentUser.currentLocation }} +
+
+ {{ currentUser.rank }} +
+ {{ currentUser.level }} +
+
{{ currentUser.currentLocation }}
+ + + + + + + +
+ +
- -
+ + + + + + +
+ There are no data! +
+
diff --git a/src/app/modules/admin/member/current-user/components/list.component.ts b/src/app/modules/admin/member/current-user/components/list.component.ts index ee3cb66..0feebfc 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.ts +++ b/src/app/modules/admin/member/current-user/components/list.component.ts @@ -42,22 +42,22 @@ import { Router } from '@angular/router'; /* language=SCSS */ ` .inventory-grid { - /* CB 관리 요율 상부 아이디 */ - grid-template-columns: 20px 40px 40px 100px auto; + /* 번호 상부 아이디 등급 위치 */ + grid-template-columns: 20px 40px auto 40px 140px; @screen sm { - /* CB 관리 요율 상부 아이디 등급 */ - grid-template-columns: 20px 40px 40px 100px auto 40px 140px 140px; + /* 번호 상부 아이디 등급 위치 보유금 */ + grid-template-columns: 20px 40px auto 40px 140px 140px; } @screen md { - /* CB 관리 요율 상부 아이디 등급 예금주 보유금 게임중머니 총입출 */ - grid-template-columns: 20px 40px 40px 100px auto 40px 140px 140px; + /* 번호 상부 아이디 등급 위치 보유금 게임중 사이트 */ + grid-template-columns: 20px 40px auto 40px 140px 140px 140px 140px; } @screen lg { - /* 번호 상부 아이디 등급 보유금 게임중머니 사이트 쪽지 배팅 로그아웃 */ - grid-template-columns: 20px 100px auto 40px 140px 140px 140px 140px 140px 140px; + /* 번호 상부 아이디 등급 위치 보유금 게임중 사이트 카지노 배팅 로그아웃 */ + grid-template-columns: 20px 100px auto 40px 140px 140px 140px 140px 140px 140px 140px; } } `,