From 1cfa17eb5bfb8d29778bdbb8cebd2808275e26fd Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Tue, 26 Jul 2022 06:06:12 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=BC=EC=9D=BC=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mock-api/apps/report/daily/api.ts | 8 +- src/app/mock-api/apps/report/daily/data.ts | 60 +-- .../components/list.component.html | 311 +++++++------- .../daily/components/list.component.html | 388 +++++++----------- .../report/daily/components/list.component.ts | 23 +- .../admin/report/daily/models/daily.ts | 60 +-- 6 files changed, 385 insertions(+), 465 deletions(-) diff --git a/src/app/mock-api/apps/report/daily/api.ts b/src/app/mock-api/apps/report/daily/api.ts index 1809429..928ce02 100644 --- a/src/app/mock-api/apps/report/daily/api.ts +++ b/src/app/mock-api/apps/report/daily/api.ts @@ -33,7 +33,7 @@ export class ReportDailyMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'lastDayHoldingMoney'; const order = request.params.get('order') || 'asc'; const page = parseInt(request.params.get('page') ?? '1', 10); const size = parseInt(request.params.get('size') ?? '10', 10); @@ -42,7 +42,11 @@ export class ReportDailyMockApi { let dailys: any[] | null = cloneDeep(this._dailys); // Sort the dailys - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'lastDayHoldingMoney' || + sort === 'memberCharge' || + sort === 'memberExchange' + ) { dailys.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/report/daily/data.ts b/src/app/mock-api/apps/report/daily/data.ts index 7a16563..c0bc71b 100644 --- a/src/app/mock-api/apps/report/daily/data.ts +++ b/src/app/mock-api/apps/report/daily/data.ts @@ -2,32 +2,38 @@ export const dailys = [ { - id: 'on00', - totalPartnerCount: '5', - totalHoldingMoney: 303675, - totalComp: 108933, - total: 412608, - branchCount: 1, - divisionCount: 1, - officeCount: 1, - storeCount: 1, - memberCount: 1, - nickname: 'on00', - accountHolder: '11', - phoneNumber: '010-1111-1111', - calculateType: '롤링', - ownCash: 50000, - ownComp: 1711, - ownCoupon: 50000, - gameMoney: 0, - todayComp: 0, - totalDeposit: 0, - totalWithdraw: 0, - balance: 0, - registDate: '2022-06-12 15:38', - finalSigninDate: '', - ip: '', - state: '정상', - note: '', + id: '8fcce528-d878-4cc8-99f7-bd3451ed5402', + processDate: '2022-06-20', + lastDayHoldingMoney: 22846133, + memberCharge: 0, + memberExchange: 0, + memberProfitLoss: 0, + partnerCharge: 0, + partnerExchange: 0, + partnerProfitLoss: 0, + totalProfitLoss: 0, + passiveMoney: 0, + passiveComp: 0, + casinoBetting: 0, + casinoTie: 0, + casinoCancel: 0, + casinoAvailable: 0, + casinoWinning: 0, + casinoWinLoss: 0, + casinoCommission: 0, + casinoBetWinCalculate: 0, + slotBetting: 160000, + slotCancel: 0, + slotAvailable: 160000, + slotWinning: 90280, + slotWinLoss: 69720, + slotCommission: 8000, + slotBetWinCalculate: 61720, + powerballBetting: 0, + powerballWinning: 0, + powerballWinLoss: 0, + powerballCommission: 0, + powerballBetWinCalculate: 0, + totalBetWinCalculate: 61720, }, ]; 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 212d28c..2b25670 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 @@ -14,165 +14,164 @@ 현재접속자&쪽지전송 - - - -
- -
- - -
- -
-
번호
-
상부
-
- 아이디 -
- 닉네임 -
-
- 등급 -
- 레벨 -
-
현재위치
- - - - - - -
- - - -
-
{{ 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/report/daily/components/list.component.html b/src/app/modules/admin/report/daily/components/list.component.html index 567a713..1b2ff2f 100644 --- a/src/app/modules/admin/report/daily/components/list.component.html +++ b/src/app/modules/admin/report/daily/components/list.component.html @@ -13,110 +13,32 @@
일일현황
- - - + + +
+
+ +
+ +
- - - 40 - 60 - 80 - 100 + + + 전체 + 파워볼 + 카지노 + 슬롯 - - - LV.1 - LV.2 - LV.3 - LV.4 - - - - - 정상 - 대기 - 탈퇴 - 휴면 - 블랙 - 정지 - - - - - 카지노제한 - 슬롯제한 - - - - - 계좌입금 - - - - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
@@ -157,29 +102,30 @@
- - - - - - - - - - - - - - - - - - - - +
처리날짜
+
이전일보유금
+
회원입출금
+
파트너입출금
+ + + + + + + + + + + + + + + + + + +
@@ -187,142 +133,88 @@
-