diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index f309e15..fac8415 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -44,6 +44,7 @@ "ant-design-vue": "catalog:", "cal-heatmap": "^4.2.4", "dayjs": "catalog:", + "json-editor-vue": "^0.18.1", "pinia": "catalog:", "pixi.js": "8.11.0-main.efa7feb", "prettier-eslint": "^16.4.2", diff --git a/apps/web-antd/src/api/core/activity.ts b/apps/web-antd/src/api/core/activity.ts index b0dfe64..e855afe 100644 --- a/apps/web-antd/src/api/core/activity.ts +++ b/apps/web-antd/src/api/core/activity.ts @@ -11,6 +11,7 @@ export interface ActivityData { level?: number; cfg?: string; extra?: string; + tag?: string; } export interface ActivityListParam { @@ -18,6 +19,7 @@ export interface ActivityListParam { ServerId: number; PageSize: number; CurrentPage: number; + activityType?: number; } export interface EditActivityParam { @@ -25,9 +27,14 @@ export interface EditActivityParam { Cfg : ActivityData; } +export interface ResgetActivityListApi{ + total: number; + data: ActivityData[]; +} + export async function getActivityListApi(p:ActivityListParam) { - return requestClient.post('/activity/list', p); + return requestClient.post('/activity/list', p); } export async function editActivityApi(p: EditActivityParam) { diff --git a/apps/web-antd/src/api/core/statistics.ts b/apps/web-antd/src/api/core/statistics.ts index 806abf3..9e158dd 100644 --- a/apps/web-antd/src/api/core/statistics.ts +++ b/apps/web-antd/src/api/core/statistics.ts @@ -15,6 +15,7 @@ export interface languageParam{ EndTime?: string; SearchField?: string; SearchValue?: string; + len_limit?: string; } export async function getStatisticsOrder(data : OperationParam) { diff --git a/apps/web-antd/src/store/order.ts b/apps/web-antd/src/store/order.ts index 7b8f6e1..496ac21 100644 --- a/apps/web-antd/src/store/order.ts +++ b/apps/web-antd/src/store/order.ts @@ -29,6 +29,7 @@ export const triggerTypeData: Record = { }; export const activityTypeData: Record = { + 0: '不限', 1: '挖矿活动', 2: '猜颜色', 3: '赛跑活动', diff --git a/apps/web-antd/src/store/util.ts b/apps/web-antd/src/store/util.ts index a186e0a..9f7d2e4 100644 --- a/apps/web-antd/src/store/util.ts +++ b/apps/web-antd/src/store/util.ts @@ -102,4 +102,19 @@ export const formatItems = (items: string) => { //console.error('Failed to parse items:', e); return []; } +} + +export const parseNumber = (param: any) => { + try{ + switch(typeof(param)){ + case 'string': + return parseInt(param, 10); + case 'number': + return param; + default: + return 0; + } + }catch(e){ + return 0; + } } \ No newline at end of file diff --git a/apps/web-antd/src/views/language/language.vue b/apps/web-antd/src/views/language/language.vue index 991aa10..a9d8179 100644 --- a/apps/web-antd/src/views/language/language.vue +++ b/apps/web-antd/src/views/language/language.vue @@ -1,6 +1,6 @@