From 53dd2e8c980eff93d99b05aef03e1cf532391547 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Tue, 26 Jul 2022 04:04:52 +0000 Subject: [PATCH] =?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/game/slot/api.ts | 4 +- src/app/mock-api/apps/game/slot/data.ts | 29 +- .../bank/deposit/components/list.component.ts | 2 +- .../components/list.component.ts | 2 +- .../components/list.component.ts | 2 +- .../withdraw/components/list.component.ts | 2 +- .../game/casino/components/list.component.ts | 2 +- .../evolution/components/list.component.ts | 14 +- .../powerball/components/list.component.ts | 2 +- .../game/slot/components/list.component.html | 368 +++++++----------- .../game/slot/components/list.component.ts | 23 +- .../modules/admin/game/slot/models/slot.ts | 32 +- .../casino-money/components/list.component.ts | 2 +- .../coupon-log/components/list.component.ts | 2 +- .../components/list.component.ts | 2 +- .../coupon/components/list.component.ts | 2 +- .../components/list.component.ts | 2 +- .../unconnected/components/list.component.ts | 2 +- 18 files changed, 182 insertions(+), 312 deletions(-) diff --git a/src/app/mock-api/apps/game/slot/api.ts b/src/app/mock-api/apps/game/slot/api.ts index 8674385..70846d0 100644 --- a/src/app/mock-api/apps/game/slot/api.ts +++ b/src/app/mock-api/apps/game/slot/api.ts @@ -33,7 +33,7 @@ export class GameSlotMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; 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,7 @@ export class GameSlotMockApi { let slots: any[] | null = cloneDeep(this._slots); // Sort the slots - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if (sort === 'signinId' || sort === 'nickname' || sort === 'gameId') { slots.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/game/slot/data.ts b/src/app/mock-api/apps/game/slot/data.ts index 7ff66da..78cdfed 100644 --- a/src/app/mock-api/apps/game/slot/data.ts +++ b/src/app/mock-api/apps/game/slot/data.ts @@ -2,40 +2,19 @@ export const slots = [ { - startDate: '2022-06-01 00:00', - finishDate: '2022-06-21 23:59', - availableBetting: 11545000, - bettingMoney: 11811000, - winningMoney: 11405200, - cancel: 0, - betWinCancel: 405800, - mainofficeRolling: 58114, - branchRolling: 34514, - divisionRolling: 23058, - officeRolling: 22982, - storeRolling: 11787, - memberRolling: 80295, - totalrolling: 230750, + id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', highRank: '[매장]kgon5', gameId: 'ks1_1007', - id: 'aa100', + signinId: 'aa100', nickname: 'aa100', gameName: '프라그마틱슬롯', gameInfo1: '스타라이트 프린세스', gameInfo2: '', gameInfo3: '62afded8114e77723a93caa2', - form: '배팅', + gameType: '배팅', betting: 800, - profitLoss: 0, - beforeWinning: 69831, - winning: 0, - afterWinning: 69831, beforeBetting: 187730, afterBetting: 186903, - finalMoney: 69831, - bettingInfo1: 'Banker', - bettingInfo2: 8000, - bettingInfo3: 0, data: '', comp: 'Y', mainofficeName: 'kgon1', @@ -57,6 +36,6 @@ export const slots = [ memberPercent: '', memberPoint: '', bettingTime: '2022-06-20 11:43:37', - registrationTime: '2022-06-20 11:45:02', + registrationDate: '2022-06-20 11:45:02', }, ]; diff --git a/src/app/modules/admin/bank/deposit/components/list.component.ts b/src/app/modules/admin/bank/deposit/components/list.component.ts index d2467d6..1186de7 100644 --- a/src/app/modules/admin/bank/deposit/components/list.component.ts +++ b/src/app/modules/admin/bank/deposit/components/list.component.ts @@ -120,7 +120,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (this._sort && this._paginator) { // Set the initial sort this._sort.sort({ - id: 'nickname', + id: 'signinId', start: 'asc', disableClear: true, }); diff --git a/src/app/modules/admin/bank/partner-calculate/components/list.component.ts b/src/app/modules/admin/bank/partner-calculate/components/list.component.ts index c1ab8ba..36e75cb 100644 --- a/src/app/modules/admin/bank/partner-calculate/components/list.component.ts +++ b/src/app/modules/admin/bank/partner-calculate/components/list.component.ts @@ -120,7 +120,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (this._sort && this._paginator) { // Set the initial sort this._sort.sort({ - id: 'nickname', + id: 'partnerDepositId', start: 'asc', disableClear: true, }); diff --git a/src/app/modules/admin/bank/web-calculate/components/list.component.ts b/src/app/modules/admin/bank/web-calculate/components/list.component.ts index b8b1bf6..4a7d071 100644 --- a/src/app/modules/admin/bank/web-calculate/components/list.component.ts +++ b/src/app/modules/admin/bank/web-calculate/components/list.component.ts @@ -120,7 +120,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (this._sort && this._paginator) { // Set the initial sort this._sort.sort({ - id: 'nickname', + id: 'webDepositId', start: 'asc', disableClear: true, }); diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.ts b/src/app/modules/admin/bank/withdraw/components/list.component.ts index d57dbaa..2e47f5d 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.ts +++ b/src/app/modules/admin/bank/withdraw/components/list.component.ts @@ -116,7 +116,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (this._sort && this._paginator) { // Set the initial sort this._sort.sort({ - id: 'nickname', + id: 'signinId', start: 'asc', disableClear: true, }); diff --git a/src/app/modules/admin/game/casino/components/list.component.ts b/src/app/modules/admin/game/casino/components/list.component.ts index f9ee910..67fcfd5 100644 --- a/src/app/modules/admin/game/casino/components/list.component.ts +++ b/src/app/modules/admin/game/casino/components/list.component.ts @@ -118,7 +118,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (this._sort && this._paginator) { // Set the initial sort this._sort.sort({ - id: 'nickname', + id: 'signinId', start: 'asc', disableClear: true, }); diff --git a/src/app/modules/admin/game/evolution/components/list.component.ts b/src/app/modules/admin/game/evolution/components/list.component.ts index 0a8b511..36bb39f 100644 --- a/src/app/modules/admin/game/evolution/components/list.component.ts +++ b/src/app/modules/admin/game/evolution/components/list.component.ts @@ -40,18 +40,22 @@ import { EvolutionService } from '../services/evolution.service'; /* language=SCSS */ ` .inventory-grid { - grid-template-columns: 60px auto 40px; + /* 상부 유저 게임 금액 최종 */ + grid-template-columns: 100px 140px auto 100px 100px; @screen sm { - grid-template-columns: 60px auto 60px 72px; + /* 상부 유저 게임 금액 최종 배팅 */ + grid-template-columns: 100px 140px auto 100px 100px 140px; } @screen md { - grid-template-columns: 60px 60px auto 112px 72px; + /* 상부 유저 게임 금액 최종 배팅 데이터 콤프 */ + grid-template-columns: 100px 140px auto 100px 100px 140px 100px 20px; } @screen lg { - grid-template-columns: 60px 60px auto 112px 96px 96px 72px; + /* 상부 유저 게임 금액 최종 배팅 데이터 콤프 롤링 배팅시간 */ + grid-template-columns: 100px 140px auto 100px 100px 140px 100px 20px 140px 100px; } } `, @@ -114,7 +118,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (this._sort && this._paginator) { // Set the initial sort this._sort.sort({ - id: 'nickname', + id: 'signinId', start: 'asc', disableClear: true, }); diff --git a/src/app/modules/admin/game/powerball/components/list.component.ts b/src/app/modules/admin/game/powerball/components/list.component.ts index 7d97406..6482287 100644 --- a/src/app/modules/admin/game/powerball/components/list.component.ts +++ b/src/app/modules/admin/game/powerball/components/list.component.ts @@ -120,7 +120,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (this._sort && this._paginator) { // Set the initial sort this._sort.sort({ - id: 'nickname', + id: 'signinId', start: 'asc', disableClear: true, }); diff --git a/src/app/modules/admin/game/slot/components/list.component.html b/src/app/modules/admin/game/slot/components/list.component.html index eee3cf2..68a9146 100644 --- a/src/app/modules/admin/game/slot/components/list.component.html +++ b/src/app/modules/admin/game/slot/components/list.component.html @@ -10,48 +10,75 @@ -
Slot
+
슬롯배팅리스트
- - + +
+ 2022-01-01 00:00~ + 2022-06-21 23:59 + 까지의 총 유효배팅:12,440,000   + 배팅금액:12,751,000   + 당첨:12,199,950   + 취소:10,000   + 배팅-당첨-취소:542,050   + 본사롤링:60,202   + 대본롤링:36,390   + 부본롤링:24,828   + 총판롤링:24,752   + 매장롤링:13,451   + 회원롤링:81,037   + 롤링합계:240,660 +
+ +
+ + +
+ +
+ + +
+ +
- + 카지노 슬롯 - + 전체 - 프라그마틱 슬롯 - 마이크로게이밍 슬롯 + 프라그마틱슬롯 + 마이크로게이밍슬롯 하바네로 부운고 플레이손 @@ -63,17 +90,17 @@ 릴렉스 블루프린트 ELK - 아시안게이밍 슬롯 - CQ9 슬롯 + 아시안게이밍슬롯 + CQ9슬롯 레드타이거 - 드래곤 소프트 + 드래곤소프트 스피어헤드 엘리시움 - - - 전체금액 + + + 전체 배팅100만미만 배팅100-300만 배팅300-500만 @@ -81,8 +108,8 @@ 당첨1000만초과 - - + + 아이디 게임아이디 닉네임 @@ -91,7 +118,8 @@ - +
@@ -130,33 +159,19 @@
-
- - - - +
상부
+
유저
+
게임
+
형식
- - - - - - -
@@ -164,185 +179,66 @@
- -