diff --git a/apps/web-antd/src/api/core/log.ts b/apps/web-antd/src/api/core/log.ts index 92d4063..6b4eae1 100644 --- a/apps/web-antd/src/api/core/log.ts +++ b/apps/web-antd/src/api/core/log.ts @@ -46,6 +46,7 @@ export interface UserLogInfo { Ban?: number; Face?:number; Order: UserLogOrder[]; + ChessMap?:string; Heatmap?: heatType[]; } diff --git a/apps/web-antd/src/api/core/statistics.ts b/apps/web-antd/src/api/core/statistics.ts index 9469c2c..8812966 100644 --- a/apps/web-antd/src/api/core/statistics.ts +++ b/apps/web-antd/src/api/core/statistics.ts @@ -4,6 +4,11 @@ import { requestClient } from '#/api/request'; export interface OperationParam{ AppId: number; ServerList?: number[]; + Emit?:string[]; +} + +export async function getStatisticsOrder(data : OperationParam) { + return requestClient.post('/statistics/order', data); } export async function getStatisticsLevel(data : OperationParam) { diff --git a/apps/web-antd/src/api/core/user.ts b/apps/web-antd/src/api/core/user.ts index 00c1e86..ada50a0 100644 --- a/apps/web-antd/src/api/core/user.ts +++ b/apps/web-antd/src/api/core/user.ts @@ -13,6 +13,8 @@ export interface UserListParam { ServerId: number; pageSize: number; currentPage: number; + StartTime?: number; + EndTime?: number; } diff --git a/apps/web-antd/src/component/index.ts b/apps/web-antd/src/component/index.ts index 8c6f8fe..000393e 100644 --- a/apps/web-antd/src/component/index.ts +++ b/apps/web-antd/src/component/index.ts @@ -3,6 +3,7 @@ import calendar from "./calendar/index.vue"; import eventModal from "./modal/event.vue"; import assetModal from "./modal/asset.vue"; import orderComponent from "./modal/orderComponent.vue"; +import chessComponent from "./modal/chessComponent.vue"; import type {dataType} from "./calendar/index.vue"; -export { eventTable, calendar, eventModal, assetModal, orderComponent }; +export { eventTable, calendar, eventModal, assetModal, orderComponent, chessComponent }; export type { dataType }; diff --git a/apps/web-antd/src/component/modal/chessComponent.vue b/apps/web-antd/src/component/modal/chessComponent.vue new file mode 100644 index 0000000..3599a58 --- /dev/null +++ b/apps/web-antd/src/component/modal/chessComponent.vue @@ -0,0 +1,55 @@ + + + diff --git a/apps/web-antd/src/locales/langs/zh-CN/page.json b/apps/web-antd/src/locales/langs/zh-CN/page.json index f3dd26f..4c57dc9 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/page.json +++ b/apps/web-antd/src/locales/langs/zh-CN/page.json @@ -30,7 +30,8 @@ "operation": { "title": "运营管理", "level": "等级分布", - "mail": "邮件管理" + "mail": "邮件管理", + "order": "订单管理" }, "log": { "event": { diff --git a/apps/web-antd/src/model/type.ts b/apps/web-antd/src/model/type.ts index 6509bb7..7b1e151 100644 --- a/apps/web-antd/src/model/type.ts +++ b/apps/web-antd/src/model/type.ts @@ -38,3 +38,11 @@ export interface Order { url?: string; } +export interface Chess{ + Id: number; + Icon: string; + Pos: number; + Lock: number; +} + + diff --git a/apps/web-antd/src/router/routes/modules/operation.ts b/apps/web-antd/src/router/routes/modules/operation.ts index bf42b97..c9e2bdb 100644 --- a/apps/web-antd/src/router/routes/modules/operation.ts +++ b/apps/web-antd/src/router/routes/modules/operation.ts @@ -33,6 +33,16 @@ const routes: RouteRecordRaw[] = [ icon: 'lucide:mail', title: $t('page.operation.mail'), }, + }, + { + name: 'Order', + path: '/order', + component: () => import('#/views/operation/order/index.vue'), + meta: { + affixTab: true, + icon: 'lets-icons:order', + title: $t('page.operation.order'), + }, } ], diff --git a/apps/web-antd/src/views/operation/order/index.vue b/apps/web-antd/src/views/operation/order/index.vue new file mode 100644 index 0000000..5f967bf --- /dev/null +++ b/apps/web-antd/src/views/operation/order/index.vue @@ -0,0 +1,11 @@ + + diff --git a/apps/web-antd/src/views/operation/order/table.vue b/apps/web-antd/src/views/operation/order/table.vue new file mode 100644 index 0000000..d48a72c --- /dev/null +++ b/apps/web-antd/src/views/operation/order/table.vue @@ -0,0 +1,160 @@ + + + diff --git a/apps/web-antd/src/views/userlog/userlist/user-header.vue b/apps/web-antd/src/views/userlog/userlist/user-header.vue index d7a51af..03d3509 100644 --- a/apps/web-antd/src/views/userlog/userlist/user-header.vue +++ b/apps/web-antd/src/views/userlog/userlist/user-header.vue @@ -52,7 +52,7 @@ const banStatus = computed(() => {