diff --git a/apps/web-antd/src/api/core/server.ts b/apps/web-antd/src/api/core/server.ts index 25bde18..48e6e48 100644 --- a/apps/web-antd/src/api/core/server.ts +++ b/apps/web-antd/src/api/core/server.ts @@ -26,6 +26,20 @@ export interface ServerData { Reload?:boolean; } +export interface NodeData{ + NodeId?: number; + NodeName: string; + NodeIp: string; + NodeInternalIp: string; + NodeHardware: string; + NodeArea: string; + NodeOperator: string; + NodeStatus?: number; + NodeUser?: string; + NodePassword?: string; + NodeTz?: string; +} + export interface serverParam { AppId: number; Type?: number; @@ -35,6 +49,14 @@ export async function getAppListApi(){ return requestClient.post('/server/list'); } +export async function getNodeListApi(){ + return requestClient.post('/server/nodeList'); +} + +export async function addNode(n :NodeData){ + return requestClient.post('/server/addNode', n); +} + export async function getServerListApi(P: serverParam){ return requestClient.post('/server/serverList', P, {timeout: 120000}); } diff --git a/apps/web-antd/src/component/calendar/index.vue b/apps/web-antd/src/component/calendar/index.vue index b7fddba..443327f 100644 --- a/apps/web-antd/src/component/calendar/index.vue +++ b/apps/web-antd/src/component/calendar/index.vue @@ -10,7 +10,6 @@ import { CardHeader, CardTitle, } from '../../../../../packages/@core/ui-kit/shadcn-ui'; -import dayjs from 'dayjs'; interface Props { title: string; dataList: dataType[]; 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 4dab830..d5580f4 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/page.json +++ b/apps/web-antd/src/locales/langs/zh-CN/page.json @@ -47,6 +47,19 @@ "piggy_bank_income": "猪猪银行收益", "card_pack_open": "开启卡包", "get_new_card": "获得新卡牌", + "gift_free":"商店免费奖励", + "item_change":"物品变更", + "daily_task": "日常任务", + "weekly_task": "每周任务", + "level_up": "升级", + "property_level_up": "属性升级", + "time_limited_slot": "限时事件", + "buy_energy_diamond": "购买体力", + "time_limited_event_action": "限时事件操作", + "petname_set": "设置宠物名称", + "emoji_income": "获得表情包", + "avatarIcon_income": "获得头像框", + "gm": "GM操作", "nickname_set": "设置昵称" } } diff --git a/apps/web-antd/src/router/routes/modules/operation.ts b/apps/web-antd/src/router/routes/modules/operation.ts index 83c8ad6..bf42b97 100644 --- a/apps/web-antd/src/router/routes/modules/operation.ts +++ b/apps/web-antd/src/router/routes/modules/operation.ts @@ -20,7 +20,7 @@ const routes: RouteRecordRaw[] = [ component: () => import('#/views/operation/level/index.vue'), meta: { affixTab: true, - icon: 'lucide:area-chart', + icon: 'lucide:chart-no-axes-column-increasing', title: $t('page.operation.level'), }, }, @@ -30,7 +30,7 @@ const routes: RouteRecordRaw[] = [ component: () => import('#/views/operation/mail/index.vue'), meta: { affixTab: true, - icon: 'lucide:area-chart', + icon: 'lucide:mail', title: $t('page.operation.mail'), }, } diff --git a/apps/web-antd/src/router/routes/modules/userlog.ts b/apps/web-antd/src/router/routes/modules/userlog.ts index 9837dab..00badf3 100644 --- a/apps/web-antd/src/router/routes/modules/userlog.ts +++ b/apps/web-antd/src/router/routes/modules/userlog.ts @@ -7,7 +7,7 @@ const routes: RouteRecordRaw[] = [ { component: BasicLayout, meta: { - icon: 'lucide:file-clock', + icon: 'lucide:laugh', order: 1000, title: $t('page.userlog.title'), }, @@ -20,7 +20,7 @@ const routes: RouteRecordRaw[] = [ component: () => import('#/views/userlog/userlist/index.vue'), meta: { affixTab: true, - icon: 'lucide:area-chart', + icon: 'lucide:list', title: $t('page.userlog.userlist'), }, }, @@ -30,7 +30,7 @@ const routes: RouteRecordRaw[] = [ component: () => import('#/views/userlog/assetlog/index.vue'), meta: { affixTab: true, - icon: 'lucide:area-chart', + icon: 'solar:stars-bold', title: $t('page.userlog.assetlog'), }, }, @@ -40,7 +40,7 @@ const routes: RouteRecordRaw[] = [ component: () => import('#/views/userlog/eventlog/index.vue'), meta: { affixTab: true, - icon: 'lucide:area-chart', + icon: 'lucide:apple', title: $t('page.userlog.eventlog'), }, }, @@ -50,7 +50,7 @@ const routes: RouteRecordRaw[] = [ component: () => import('#/views/userlog/orderlog/index.vue'), meta: { affixTab: true, - icon: 'lucide:area-chart', + icon: 'solar:chat-round-money-bold', title: $t('page.userlog.orderlog'), }, }, diff --git a/apps/web-antd/src/views/dashboard/appList/addServer.vue b/apps/web-antd/src/views/dashboard/appList/addServer.vue index aad756a..922b4e2 100644 --- a/apps/web-antd/src/views/dashboard/appList/addServer.vue +++ b/apps/web-antd/src/views/dashboard/appList/addServer.vue @@ -5,11 +5,8 @@ import { useVbenModal } from '@vben/common-ui'; import { useVbenForm } from '#/adapter/form'; import dayjs from 'dayjs'; - - -const date = dayjs(); const [Form, FormApi] = useVbenForm({ - // 所有表单项共用,可单独在表单内覆盖 + // 所有表单项共用,可单独在表单内覆盖s commonConfig: { // 所有表单项 componentProps: { @@ -29,9 +26,9 @@ const [Form, FormApi] = useVbenForm({ placeholder: '1', }, formItemClass:'col-span-2', - fieldName: 'AppId', + fieldName: 'NodeId', rules: "required|integer", - label: 'AppId', + label: 'NodeId', }, { component: 'Input', @@ -164,6 +161,5 @@ defineExpose({ diff --git a/apps/web-antd/src/views/dashboard/appList/index.vue b/apps/web-antd/src/views/dashboard/appList/index.vue index 4376f09..000787f 100644 --- a/apps/web-antd/src/views/dashboard/appList/index.vue +++ b/apps/web-antd/src/views/dashboard/appList/index.vue @@ -1,8 +1,8 @@ \ No newline at end of file + diff --git a/apps/web-antd/src/views/dashboard/mysqlList/index.vue b/apps/web-antd/src/views/dashboard/mysqlList/index.vue index 4f2d747..14fbee3 100644 --- a/apps/web-antd/src/views/dashboard/mysqlList/index.vue +++ b/apps/web-antd/src/views/dashboard/mysqlList/index.vue @@ -1,226 +1,83 @@ diff --git a/apps/web-antd/src/views/dashboard/nodeList/addServer.vue b/apps/web-antd/src/views/dashboard/nodeList/addServer.vue index ca79570..921477f 100644 --- a/apps/web-antd/src/views/dashboard/nodeList/addServer.vue +++ b/apps/web-antd/src/views/dashboard/nodeList/addServer.vue @@ -1,13 +1,8 @@ \ No newline at end of file + diff --git a/apps/web-antd/src/views/dashboard/nodeList/index.vue b/apps/web-antd/src/views/dashboard/nodeList/index.vue index 4f2d747..14fbee3 100644 --- a/apps/web-antd/src/views/dashboard/nodeList/index.vue +++ b/apps/web-antd/src/views/dashboard/nodeList/index.vue @@ -1,226 +1,83 @@ diff --git a/apps/web-antd/src/views/userlog/userlist/user.vue b/apps/web-antd/src/views/userlog/userlist/user.vue index 6ffd5e0..e402fe3 100644 --- a/apps/web-antd/src/views/userlog/userlist/user.vue +++ b/apps/web-antd/src/views/userlog/userlist/user.vue @@ -193,7 +193,7 @@ watch(
- + diff --git a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-detail.vue b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-detail.vue index 11ca90d..39aab36 100644 --- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-detail.vue +++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-detail.vue @@ -33,7 +33,7 @@ defineEmits(['click']);
- 总充值金额: + 总充值金额:
@@ -46,7 +46,7 @@ defineEmits(['click']);
- 场景: + 场景:
@@ -59,7 +59,7 @@ defineEmits(['click']);
- 最后登录: + 最后登录:
@@ -72,7 +72,7 @@ defineEmits(['click']);
- 累计在线: + 累计在线:
@@ -85,7 +85,7 @@ defineEmits(['click']);
- 今日累计在线: + 今日累计在线:
@@ -98,7 +98,7 @@ defineEmits(['click']);
- Bonus: + Bonus:
@@ -115,7 +115,7 @@ defineEmits(['click']); diff --git a/packages/styles/src/antd/index.css b/packages/styles/src/antd/index.css index ff68d54..0ee8c1d 100644 --- a/packages/styles/src/antd/index.css +++ b/packages/styles/src/antd/index.css @@ -71,3 +71,6 @@ cursor: pointer; color: hsl(var(--ring)); } +.font-bold { + font-weight: bold; +}