diff --git a/apps/web-antd/src/api/core/server.ts b/apps/web-antd/src/api/core/server.ts index dd90881..25bde18 100644 --- a/apps/web-antd/src/api/core/server.ts +++ b/apps/web-antd/src/api/core/server.ts @@ -5,6 +5,10 @@ export interface AppData { AppId : number; AppName : string; WsHost? : string; + NodeName?: string; + MysqlName?: string; + Topic?: string; + tz?: string; Status?: string; Update?:number; Loading?:boolean; 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 5e7e30a..4dab830 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/page.json +++ b/apps/web-antd/src/locales/langs/zh-CN/page.json @@ -9,7 +9,10 @@ "dashboard": { "title": "服务器管理", "analytics": "分析台", - "server-list": "服务器列表" + "server-list": "区服列表", + "node-list": "节点列表", + "mysql-list": "MySQL列表", + "app-list": "应用列表" }, "userlog":{ "title": "玩家管理", diff --git a/apps/web-antd/src/model/app.ts b/apps/web-antd/src/model/app.ts new file mode 100644 index 0000000..6cb07a5 --- /dev/null +++ b/apps/web-antd/src/model/app.ts @@ -0,0 +1,12 @@ +export interface AppInfo { + id:number; + AppName: string; + WsHost : string; + WsPort : number; + NodeId : number; + MysqlId : number; + Database : string; + Topic : string; + Path:string; + tz : string; +} diff --git a/apps/web-antd/src/model/node.ts b/apps/web-antd/src/model/node.ts new file mode 100644 index 0000000..a7a36d4 --- /dev/null +++ b/apps/web-antd/src/model/node.ts @@ -0,0 +1,12 @@ +export interface NodeInfo { + id:number; + AppName: string; + WsHost : string; + WsPort : number; + NodeId : number; + MysqlId : number; + Database : string; + Topic : string; + Path:string; + tz : string; +} diff --git a/apps/web-antd/src/router/routes/modules/dashboard.ts b/apps/web-antd/src/router/routes/modules/dashboard.ts index 4ea05ef..4a55b32 100644 --- a/apps/web-antd/src/router/routes/modules/dashboard.ts +++ b/apps/web-antd/src/router/routes/modules/dashboard.ts @@ -30,10 +30,40 @@ const routes: RouteRecordRaw[] = [ component: () => import('#/views/dashboard/serverList/index.vue'), meta: { affixTab: true, - icon: 'lucide:area-chart', + icon: 'lucide:gamepad', title: $t('page.dashboard.server-list'), }, }, + { + name: 'AppList', + path: '/app-list', + component: () => import('#/views/dashboard/appList/index.vue'), + meta: { + affixTab: true, + icon: 'lucide:app-window', + title: $t('page.dashboard.app-list'), + }, + }, + { + name: 'NodeList', + path: '/node-list', + component: () => import('#/views/dashboard/nodeList/index.vue'), + meta: { + affixTab: true, + icon: 'lucide:server', + title: $t('page.dashboard.node-list'), + }, + }, + { + name: 'MysqlList', + path: '/mysql-list', + component: () => import('#/views/dashboard/mysqlList/index.vue'), + meta: { + affixTab: true, + icon: 'lucide:database', + title: $t('page.dashboard.mysql-list'), + }, + }, ], }, ]; diff --git a/apps/web-antd/src/views/dashboard/appList/addServer.vue b/apps/web-antd/src/views/dashboard/appList/addServer.vue new file mode 100644 index 0000000..aad756a --- /dev/null +++ b/apps/web-antd/src/views/dashboard/appList/addServer.vue @@ -0,0 +1,169 @@ + + + diff --git a/apps/web-antd/src/views/dashboard/appList/appList.vue b/apps/web-antd/src/views/dashboard/appList/appList.vue new file mode 100644 index 0000000..2b4922f --- /dev/null +++ b/apps/web-antd/src/views/dashboard/appList/appList.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/apps/web-antd/src/views/dashboard/appList/index.vue b/apps/web-antd/src/views/dashboard/appList/index.vue new file mode 100644 index 0000000..4376f09 --- /dev/null +++ b/apps/web-antd/src/views/dashboard/appList/index.vue @@ -0,0 +1,85 @@ + + diff --git a/apps/web-antd/src/views/dashboard/mysqlList/addServer.vue b/apps/web-antd/src/views/dashboard/mysqlList/addServer.vue new file mode 100644 index 0000000..ca79570 --- /dev/null +++ b/apps/web-antd/src/views/dashboard/mysqlList/addServer.vue @@ -0,0 +1,154 @@ + + + \ No newline at end of file diff --git a/apps/web-antd/src/views/dashboard/mysqlList/appList.vue b/apps/web-antd/src/views/dashboard/mysqlList/appList.vue new file mode 100644 index 0000000..ad62756 --- /dev/null +++ b/apps/web-antd/src/views/dashboard/mysqlList/appList.vue @@ -0,0 +1,149 @@ + + + + + \ 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 new file mode 100644 index 0000000..4f2d747 --- /dev/null +++ b/apps/web-antd/src/views/dashboard/mysqlList/index.vue @@ -0,0 +1,226 @@ + + diff --git a/apps/web-antd/src/views/dashboard/nodeList/addServer.vue b/apps/web-antd/src/views/dashboard/nodeList/addServer.vue new file mode 100644 index 0000000..ca79570 --- /dev/null +++ b/apps/web-antd/src/views/dashboard/nodeList/addServer.vue @@ -0,0 +1,154 @@ + + + \ No newline at end of file diff --git a/apps/web-antd/src/views/dashboard/nodeList/appList.vue b/apps/web-antd/src/views/dashboard/nodeList/appList.vue new file mode 100644 index 0000000..ad62756 --- /dev/null +++ b/apps/web-antd/src/views/dashboard/nodeList/appList.vue @@ -0,0 +1,149 @@ + + + + + \ 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 new file mode 100644 index 0000000..4f2d747 --- /dev/null +++ b/apps/web-antd/src/views/dashboard/nodeList/index.vue @@ -0,0 +1,226 @@ + + diff --git a/apps/web-antd/src/views/userlog/assetlog/asset-table.vue b/apps/web-antd/src/views/userlog/assetlog/asset-table.vue index dd6e826..0614c31 100644 --- a/apps/web-antd/src/views/userlog/assetlog/asset-table.vue +++ b/apps/web-antd/src/views/userlog/assetlog/asset-table.vue @@ -41,13 +41,13 @@ const formatItemName = (cellValue: number) => { return cellValue; } } -const date = dayjs(); const d = ref({ sum : 0, psum : 0, nsum : 0, }); const startDate = dayjs().startOf('day'); +const endDate = dayjs().endOf('day'); const formOptions: VbenFormProps = { // 所有表单项共用,可单独在表单内覆盖 commonConfig: { @@ -101,7 +101,7 @@ const formOptions: VbenFormProps = { }, { component: 'DatePicker', - defaultValue: date, + defaultValue: endDate, componentProps: { format: 'YYYY-MM-DD', }, diff --git a/apps/web-antd/src/views/userlog/eventlog/event-table.vue b/apps/web-antd/src/views/userlog/eventlog/event-table.vue index 7232f00..2dd16e6 100644 --- a/apps/web-antd/src/views/userlog/eventlog/event-table.vue +++ b/apps/web-antd/src/views/userlog/eventlog/event-table.vue @@ -12,8 +12,8 @@ import { Page } from '@vben/common-ui'; import dayjs from 'dayjs'; const state = inject('globalState', globalState); -const date = dayjs(); const startDate = dayjs().startOf('day'); +const endDate = dayjs().endOf('day'); interface RowType { Uid: string; Event: string; @@ -63,7 +63,7 @@ const formOptions: VbenFormProps = { }, { component: 'DatePicker', - defaultValue: date, + defaultValue: endDate, componentProps: { format: 'YYYY-MM-DD', }, 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 fc8b507..178b4f7 100644 --- a/apps/web-antd/src/views/userlog/userlist/user-header.vue +++ b/apps/web-antd/src/views/userlog/userlist/user-header.vue @@ -40,10 +40,10 @@ withDefaults(defineProps(), {

- + - + diff --git a/packages/@core/base/design/src/design-tokens/default.css b/packages/@core/base/design/src/design-tokens/default.css index c81ace7..ffe3d89 100644 --- a/packages/@core/base/design/src/design-tokens/default.css +++ b/packages/@core/base/design/src/design-tokens/default.css @@ -70,7 +70,6 @@ /* Default border color */ --border: 240 5.9% 90%; - /* Border color for inputs such as ,