From 0dd098213ccc9d31a092d82bf43774faa6bb7ff6 Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 10:28:02 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat(header):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E5=88=87=E6=8D=A2=E5=99=A8=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 stores/businessLine.ts：Pinia 状态管理，持久化到 localStorage - 新增 components/BusinessLineSwitcher.vue：企业微信式下拉切换器 - 修改 AppHeader.vue：在环境标签后集成切换器 - 预置 5 条业务线 mock 数据（LAS/Kodo/LTOKEN/灵矽/MAAS） - 更新 components.d.ts 自动类型声明 --- frontend/components.d.ts | 1 + .../src/components/BusinessLineSwitcher.vue | 230 ++++++++++++++++++ frontend/src/components/Layout/AppHeader.vue | 4 +- frontend/src/stores/businessLine.ts | 107 ++++++++ 4 files changed, 341 insertions(+), 1 deletion(-) create mode 100644 frontend/src/components/BusinessLineSwitcher.vue create mode 100644 frontend/src/stores/businessLine.ts diff --git a/frontend/components.d.ts b/frontend/components.d.ts index 6d63c3e..4380d44 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -11,6 +11,7 @@ declare module 'vue' { AppMain: typeof import('./src/components/Layout/AppMain.vue')['default'] AppSidebar: typeof import('./src/components/Layout/AppSidebar.vue')['default'] AuditLogTable: typeof import('./src/components/AuditLogTable.vue')['default'] + BusinessLineSwitcher: typeof import('./src/components/BusinessLineSwitcher.vue')['default'] ElButton: typeof import('element-plus/es')['ElButton'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] diff --git a/frontend/src/components/BusinessLineSwitcher.vue b/frontend/src/components/BusinessLineSwitcher.vue new file mode 100644 index 0000000..c13e03e --- /dev/null +++ b/frontend/src/components/BusinessLineSwitcher.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/frontend/src/components/Layout/AppHeader.vue b/frontend/src/components/Layout/AppHeader.vue index 3833271..41ca71d 100644 --- a/frontend/src/components/Layout/AppHeader.vue +++ b/frontend/src/components/Layout/AppHeader.vue @@ -5,6 +5,7 @@ xinfra 统一基础设施平台 ● 生产环境 +
@@ -23,7 +24,7 @@
{{ userInitial }}
{{ user?.display_name || '未登录' }}
-
LDAP · {{ user?.business_line || '' }}业务线
+
LDAP · {{ user?.business_line || '' }}
退出
@@ -36,6 +37,7 @@ import { useAuthStore } from '@/stores/auth' import { useTheme } from '@/composables/useTheme' import { useAuth } from '@/composables/useAuth' import { Moon, Sunny } from '@element-plus/icons-vue' +import BusinessLineSwitcher from '@/components/BusinessLineSwitcher.vue' const authStore = useAuthStore() const { logout } = useAuth() diff --git a/frontend/src/stores/businessLine.ts b/frontend/src/stores/businessLine.ts new file mode 100644 index 0000000..e7b69ab --- /dev/null +++ b/frontend/src/stores/businessLine.ts @@ -0,0 +1,107 @@ +import { defineStore } from 'pinia' +import { ref, computed } from 'vue' + +export interface BusinessLine { + id: string + name: string + ou: string + role: string + iconText: string + iconBg: string + iconColor: string + authorized: boolean +} + +const STORAGE_KEY = 'xinfra-current-bl' + +// TODO: 替换为真实 API 调用 +const MOCK_BUSINESS_LINES: BusinessLine[] = [ + { + id: 'las', + name: 'LAS 业务线', + ou: 'ou=las', + role: 'SRE', + iconText: 'LA', + iconBg: '#1A1430', + iconColor: '#C9A6FF', + authorized: true, + }, + { + id: 'kodo', + name: 'Kodo 业务线', + ou: 'ou=kodo', + role: '研发', + iconText: 'KO', + iconBg: '#0E1C2C', + iconColor: '#8EC8FF', + authorized: true, + }, + { + id: 'lingxi', + name: '灵矽 业务线', + ou: 'ou=lingxi', + role: '未授权', + iconText: 'LX', + iconBg: '#241B0A', + iconColor: '#FFC97A', + authorized: false, + }, + { + id: 'ltoken', + name: 'LTOKEN 业务线', + ou: 'ou=ltoken', + role: '研发', + iconText: 'LT', + iconBg: '#1A2A1A', + iconColor: '#A6FFB0', + authorized: true, + }, + { + id: 'maas', + name: 'MAAS 业务线', + ou: 'ou=maas', + role: '未授权', + iconText: 'MA', + iconBg: '#2A1A2A', + iconColor: '#FFB0E0', + authorized: false, + }, +] + +function loadSavedBL(): BusinessLine | null { + try { + const saved = localStorage.getItem(STORAGE_KEY) + if (saved) return JSON.parse(saved) + } catch { + // ignore + } + return null +} + +export const useBusinessLineStore = defineStore('businessLine', () => { + const businessLines = ref(MOCK_BUSINESS_LINES) + const currentBL = ref(loadSavedBL()) + + // 默认选中第一个已授权的业务线 + if (!currentBL.value) { + currentBL.value = businessLines.value.find((bl) => bl.authorized) || null + } + + const authorizedBLs = computed(() => + businessLines.value.filter((bl) => bl.authorized), + ) + + function switchBL(id: string) { + const bl = businessLines.value.find((b) => b.id === id) + if (!bl || !bl.authorized) return + currentBL.value = bl + localStorage.setItem(STORAGE_KEY, JSON.stringify(bl)) + } + + return { + businessLines, + currentBL, + authorizedBLs, + switchBL, + } +}) From f327f41733cf4ef8fd9fd0bd0a2ff7b07c343b34 Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 10:37:52 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat(service-catalog):=20=E5=AF=B9?= =?UTF-8?q?=E9=BD=90=E5=9F=BA=E7=A1=80=E6=9C=8D=E5=8A=A1=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 6 张服务卡片数据（Wayne/MySQL/openresty/PgSQL/Redis/接入新服务） - 容器服务（Wayne）点击打开发布弹窗（业务线/命名空间/集群/规格/服务名） - MySQL 点击打开标准化交付弹窗（架构/规格/版本/实例名 + YAML 预览） - openresty 可点击但提示"功能对接中" - PgSQL/Redis 置灰不可点击，提示"功能规划中" - 接入新服务置灰(0.5)无响应 - 弹窗确认后 toast 提示并跳转任务中心 --- frontend/src/views/service/Catalog.vue | 460 ++++++++++++++++++++++++- 1 file changed, 442 insertions(+), 18 deletions(-) diff --git a/frontend/src/views/service/Catalog.vue b/frontend/src/views/service/Catalog.vue index 1be61fb..959574f 100644 --- a/frontend/src/views/service/Catalog.vue +++ b/frontend/src/views/service/Catalog.vue @@ -3,59 +3,304 @@

基础服务目录

-

点击卡片，通过封装好的 ansible-playbook 一键部署标准化基础服务

+

点击卡片，通过封装好的 ansible-playbook 一键标准化交付，完成后自动注册进对应子系统

-
+
{{ service.icon }}
-

{{ service.name }}

+

{{ service.name }}

{{ service.description }}
{{ service.playbook }} - {{ service.version }} + {{ service.version }}
+ + + +
+
+
+

发布服务 · 跳 Wayne

+ +
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ + +
+
+ 凭 SSO 身份免登进入 Wayne，在 ns-las-prod 下部署服务；权限随业务线 / 角色自动具备，仅可操作被授权 namespace。 +
+
+
+ + +
+
+
+ + + + +
+
+
+

数据库标准化交付 · MySQL

+ +
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ + +
+
# ansible-runner 调用预览 +playbook: roles/mysql-deploy +tenant: {{ mysqlForm.bl }} +topology: {{ mysqlForm.topology === '1m2r' ? '1-master-2-replica' : '1-master-1-replica' }} +node_selector: business-line={{ mysqlForm.bl }} +storage_class: ceph-rbd-ssd +register_to: clouddm # 自动注册数据源，跳 CloudDM 上线
+
+
+ + +
+
+
+
From a185fac1b23bd7e0c707e65be066f09c3fda87c8 Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 10:53:08 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat(sidebar):=20=E9=87=8D=E7=BB=84?= =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=AF=BC=E8=88=AA=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 服务交付 → 业务交付：基础服务、任务中心 - 资源管理 → 资源纳管：资源管理(CMDB)、集群/容器池、业务线/配额 - 新增业务线/配额页面（Tenants.vue） - 集群页面标题对齐为「集群 / 容器池」 --- frontend/src/components/Layout/AppSidebar.vue | 35 ++--- frontend/src/router/index.ts | 8 +- frontend/src/views/cluster/ClusterList.vue | 4 +- frontend/src/views/resource/Tenants.vue | 122 ++++++++++++++++++ 4 files changed, 144 insertions(+), 25 deletions(-) create mode 100644 frontend/src/views/resource/Tenants.vue diff --git a/frontend/src/components/Layout/AppSidebar.vue b/frontend/src/components/Layout/AppSidebar.vue index d4111a5..573f92c 100644 --- a/frontend/src/components/Layout/AppSidebar.vue +++ b/frontend/src/components/Layout/AppSidebar.vue @@ -7,33 +7,24 @@
-
机房 & 网络
- - ⬡资源状态看板 - - - ◆集群 / 节点7 - -
-
-
资源管理
- - ▥资源管理CMDB - - - ◈服务管理Consul - -
-
-
服务交付
+
业务交付
- ▤基础服务目录 + ▤基础服务 ▧任务中心2 - - ⚙配置中心管理Apollo +
+
+
资源纳管
+ + ▥资源管理CMDB + + + ◆集群 / 容器池3 + + + ▦业务线 / 配额
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index e7e74ed..dd28c9e 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -68,7 +68,13 @@ const router = createRouter({ path: 'cluster', name: 'Cluster', component: () => import('@/views/cluster/ClusterList.vue'), - meta: { title: '集群 / 节点' }, + meta: { title: '集群 / 容器池' }, + }, + { + path: 'tenants', + name: 'Tenants', + component: () => import('@/views/resource/Tenants.vue'), + meta: { title: '业务线 / 配额' }, }, { path: 'service/catalog', diff --git a/frontend/src/views/cluster/ClusterList.vue b/frontend/src/views/cluster/ClusterList.vue index 0ddd7fe..b1b1b6a 100644 --- a/frontend/src/views/cluster/ClusterList.vue +++ b/frontend/src/views/cluster/ClusterList.vue @@ -2,8 +2,8 @@
-

集群 / 节点

-

按机房切分的 RKE2 集群，Calico BGP 扁平网络

+

集群 / 容器池

+

统一建设容器池 · RKE2 上建 Wayne 后新服务的标准发布流程 · Calico BGP 扁平网络

+ 加入新节点
diff --git a/frontend/src/views/resource/Tenants.vue b/frontend/src/views/resource/Tenants.vue new file mode 100644 index 0000000..46a7034 --- /dev/null +++ b/frontend/src/views/resource/Tenants.vue @@ -0,0 +1,122 @@ + + + + + From 506752747dfe9eaa31f1cc4ea6820ea132f68f7a Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 11:20:17 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feat(subsystem):=20=E5=AD=90=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=AF=BC=E8=88=AA=E5=A2=9E=E5=8A=A0=E5=8F=AF=E5=B1=95?= =?UTF-8?q?=E5=BC=80=E5=AD=90=20Tab=20=E4=B8=8E=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - AppSidebar: 统一入口组下子系统导航改为可展开列表，展示 6 个子系统子 Tab - 每个子 Tab 带功能描述前缀（如 多集群发布平台 Wayne）便于用户定位 - 新建 SubsystemDetail.vue 统一详情模板（统计卡片 + 门户卡片 + 打开按钮） - 新增路由 /subsystem/detail/:name - subsystem API mock 数据补充 label、domain、category 字段 - SubsystemCard 概览卡片同步显示 label + name 格式 --- frontend/src/api/subsystem.ts | 41 ++++- frontend/src/components/Layout/AppSidebar.vue | 105 ++++++++++- frontend/src/components/SubsystemCard.vue | 18 +- frontend/src/router/index.ts | 6 + .../src/views/subsystem/SubsystemDetail.vue | 172 ++++++++++++++++++ 5 files changed, 316 insertions(+), 26 deletions(-) create mode 100644 frontend/src/views/subsystem/SubsystemDetail.vue diff --git a/frontend/src/api/subsystem.ts b/frontend/src/api/subsystem.ts index a6d5866..3a68d10 100644 --- a/frontend/src/api/subsystem.ts +++ b/frontend/src/api/subsystem.ts @@ -5,9 +5,12 @@ import { redirectToSSO } from '@/utils/sso' export interface Subsystem { id: number name: string + label: string description: string icon: string url: string + domain: string + category: string status: 'integrated' | 'integrating' sso_enabled: boolean } @@ -21,54 +24,72 @@ const mockSubsystems: Subsystem[] = [ { id: 1, name: 'Wayne', - description: '多集群容器管理平台', + label: '多集群发布平台', + description: '业务容器发布、命名空间与配额管理，复用 Wayne 原生多租户能力。', icon: 'W', url: 'https://wayne.qiniu.com', + domain: 'wayne.xinfra.internal', + category: '容器管理', status: 'integrated', sso_enabled: true, }, { id: 2, name: 'CloudDM', - description: '数据库管理与SQL审核', + label: 'SQL 审核平台', + description: '数据库 SQL 上线统一审核，支持 LDAP 用户组到角色的自动映射。', icon: 'DM', url: 'https://clouddm.qiniu.com', + domain: 'clouddm.xinfra.internal', + category: '数据库', status: 'integrated', sso_enabled: true, }, { id: 3, name: 'CacheCloud', - description: 'Redis 云管理平台', + label: 'Redis 管理平台', + description: 'Redis 实例全生命周期管理，登录与监控运维统一入口。', icon: 'CC', url: 'https://cachecloud.qiniu.com', - status: 'integrated', + domain: 'cachecloud.xinfra.internal', + category: '缓存', + status: 'integrating', sso_enabled: true, }, { id: 4, name: 'Apollo', - description: '配置中心', + label: '配置中心', + description: '统一配置管理，按机房 Cluster 隔离，支持灰度发布、版本回滚与变更审计。', icon: 'AP', url: 'https://apollo.xinfra.internal', - status: 'integrated', + domain: 'apollo.xinfra.internal', + category: '配置中心', + status: 'integrating', sso_enabled: true, }, { id: 5, name: 'qpass', - description: '密码管理平台', + label: '七牛统一运维平台', + description: '夜莺、Zabbix、VictoriaMetrics 告警统一收敛与值班通知，按 P0/P1 分级推送。', icon: 'QP', url: 'https://qpass.xinfra.internal', + domain: 'qpass.xinfra.internal', + category: '告警值班', status: 'integrated', sso_enabled: true, }, { id: 6, name: 'Grafana', - description: '监控可视化平台', + label: '指标可视化平台', + description: '对接 VictoriaMetrics 数据源，K8s / 容器 / 业务指标统一仪表盘展示。', icon: 'GF', url: 'https://grafana.xinfra.internal', + domain: 'grafana.xinfra.internal', + category: '可观测性', status: 'integrated', sso_enabled: true, }, @@ -83,6 +104,10 @@ export const subsystemApi = { }) }, + getSubsystemByName(name: string): Subsystem | undefined { + return mockSubsystems.find((s) => s.name.toLowerCase() === name.toLowerCase()) + }, + async getSSOUrl(id: number): Promise> { const subsystem = mockSubsystems.find((s) => s.id === id) if (!subsystem) { diff --git a/frontend/src/components/Layout/AppSidebar.vue b/frontend/src/components/Layout/AppSidebar.vue index 573f92c..d7d816a 100644 --- a/frontend/src/components/Layout/AppSidebar.vue +++ b/frontend/src/components/Layout/AppSidebar.vue @@ -35,9 +35,28 @@
统一入口
- - ↗子系统导航 - +
+ + ↗子系统导航 + + + {{ portalExpanded ? '▾' : '▸' }} + +
+
+ + {{ sys.label }} {{ sys.name }} + + + ▦全部总览 + +
▦子系统赋权 @@ -58,6 +77,36 @@ diff --git a/frontend/src/components/SubsystemCard.vue b/frontend/src/components/SubsystemCard.vue index 31205c5..19c7c87 100644 --- a/frontend/src/components/SubsystemCard.vue +++ b/frontend/src/components/SubsystemCard.vue @@ -5,11 +5,11 @@ {{ system.icon }}
-

{{ system.name }}

-
{{ system.description }}
+

{{ system.label }} {{ system.name }}

+
{{ system.domain }}
-

{{ description }}

+

{{ system.description }}

{{ system.status === 'integrated' ? 'LDAP 原生配置接入 · 零代码' : 'LDAP 接入改造中' }} @@ -49,18 +49,6 @@ const iconColor = computed(() => { return colors[props.system.icon] || 'var(--text-mid)' }) -const description = computed(() => { - const descs: Record = { - Wayne: '业务容器发布、命名空间与配额管理，复用 Wayne 原生多租户能力。', - CloudDM: '数据库 SQL 上线统一审核，支持 LDAP 用户组到角色的自动映射。', - CacheCloud: 'Redis 实例全生命周期管理，登录与监控运维统一入口。', - Apollo: '统一配置管理，按机房 Cluster 隔离，支持灰度发布、版本回滚与变更审计。', - qpass: '夜莺、Zabbix、VictoriaMetrics 告警统一收敛与值班通知，按 P0/P1 分级推送。', - Grafana: '对接 VictoriaMetrics 数据源，K8s / 容器 / 业务指标统一仪表盘展示。', - } - return descs[props.system.name] || '' -}) - const handleClick = async () => { if (props.system.sso_enabled) { const { data } = await subsystemApi.getSSOUrl(props.system.id) diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index dd28c9e..3942ce2 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -34,6 +34,12 @@ const router = createRouter({ component: () => import('@/views/subsystem/Navigation.vue'), meta: { title: '子系统导航' }, }, + { + path: 'subsystem/detail/:name', + name: 'SubsystemDetail', + component: () => import('@/views/subsystem/SubsystemDetail.vue'), + meta: { title: '子系统详情' }, + }, { path: 'subsystem/authz', name: 'SubsystemAuthz', diff --git a/frontend/src/views/subsystem/SubsystemDetail.vue b/frontend/src/views/subsystem/SubsystemDetail.vue new file mode 100644 index 0000000..f5f49e8 --- /dev/null +++ b/frontend/src/views/subsystem/SubsystemDetail.vue @@ -0,0 +1,172 @@ + + + + + From 8fc4b0e0fbc64dedfca7d7850934dfb88170ee5f Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 11:23:41 +0800 Subject: [PATCH 05/10] =?UTF-8?q?refactor(resource):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=BA=B3=E7=AE=A1=E5=AD=90=20Tab=20=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 集群 / 容器池 → 集群与容器 - 业务线 / 配额 → 业务配额 - 同步更新侧边栏、路由 meta、页面标题 --- frontend/src/components/Layout/AppSidebar.vue | 4 ++-- frontend/src/router/index.ts | 4 ++-- frontend/src/views/cluster/ClusterList.vue | 2 +- frontend/src/views/resource/Tenants.vue | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/Layout/AppSidebar.vue b/frontend/src/components/Layout/AppSidebar.vue index d7d816a..49ca1e2 100644 --- a/frontend/src/components/Layout/AppSidebar.vue +++ b/frontend/src/components/Layout/AppSidebar.vue @@ -21,10 +21,10 @@ ▥资源管理CMDB - ◆集群 / 容器池3 + ◆集群与容器3 - ▦业务线 / 配额 + ▦业务配额
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 3942ce2..d340bc8 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -74,13 +74,13 @@ const router = createRouter({ path: 'cluster', name: 'Cluster', component: () => import('@/views/cluster/ClusterList.vue'), - meta: { title: '集群 / 容器池' }, + meta: { title: '集群与容器' }, }, { path: 'tenants', name: 'Tenants', component: () => import('@/views/resource/Tenants.vue'), - meta: { title: '业务线 / 配额' }, + meta: { title: '业务配额' }, }, { path: 'service/catalog', diff --git a/frontend/src/views/cluster/ClusterList.vue b/frontend/src/views/cluster/ClusterList.vue index b1b1b6a..21b4fb5 100644 --- a/frontend/src/views/cluster/ClusterList.vue +++ b/frontend/src/views/cluster/ClusterList.vue @@ -2,7 +2,7 @@
-

集群 / 容器池

+

集群与容器

统一建设容器池 · RKE2 上建 Wayne 后新服务的标准发布流程 · Calico BGP 扁平网络

+ 加入新节点 diff --git a/frontend/src/views/resource/Tenants.vue b/frontend/src/views/resource/Tenants.vue index 46a7034..f14cfb3 100644 --- a/frontend/src/views/resource/Tenants.vue +++ b/frontend/src/views/resource/Tenants.vue @@ -2,7 +2,7 @@
-

业务线 / 配额

+

业务配额

按业务线划分资源配额与隔离策略 · RBAC 权限随业务线自动具备

+ 新增业务线 From 49244c931cb51f1d8400ea1216efd23daa3af3fa Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 11:26:04 +0800 Subject: [PATCH 06/10] =?UTF-8?q?refactor(cluster,resource):=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=90=8C=E6=AD=A5=E6=8C=89=E9=92=AE=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ClusterList.vue: "加入新节点" → "同步" - Management.vue: "创建虚机" → "同步" --- frontend/src/views/cluster/ClusterList.vue | 2 +- frontend/src/views/resource/Management.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/cluster/ClusterList.vue b/frontend/src/views/cluster/ClusterList.vue index 21b4fb5..80b0536 100644 --- a/frontend/src/views/cluster/ClusterList.vue +++ b/frontend/src/views/cluster/ClusterList.vue @@ -5,7 +5,7 @@

集群与容器

统一建设容器池 · RKE2 上建 Wayne 后新服务的标准发布流程 · Calico BGP 扁平网络

- + 加入新节点 + 同步
diff --git a/frontend/src/views/resource/Management.vue b/frontend/src/views/resource/Management.vue index 9d9ad77..0d81789 100644 --- a/frontend/src/views/resource/Management.vue +++ b/frontend/src/views/resource/Management.vue @@ -5,7 +5,7 @@

资源管理

统一纳管物理机与虚机资源 · 基础数据来自 SINA CMDB

- + 创建虚机 + 同步
From 779c6e0269df64dc34c787888bb2151512214cec Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 11:27:48 +0800 Subject: [PATCH 07/10] =?UTF-8?q?refactor(sidebar):=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9B=B4=E5=90=8D=E4=B8=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 侧边栏导航 Tab 名称调整，更准确反映日志查看功能定位 --- frontend/src/components/Layout/AppSidebar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Layout/AppSidebar.vue b/frontend/src/components/Layout/AppSidebar.vue index 49ca1e2..510e4e6 100644 --- a/frontend/src/components/Layout/AppSidebar.vue +++ b/frontend/src/components/Layout/AppSidebar.vue @@ -12,7 +12,7 @@ ▤基础服务 - ▧任务中心2 + ▧任务日志2
From 4d4d1a9d01e18f5ac33ca53add42a1293d677c3b Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 11:29:02 +0800 Subject: [PATCH 08/10] =?UTF-8?q?refactor(sidebar):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=BA=95=E9=83=A8=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除 sidebar-foot 中的 v3 一期技术栈文案 --- frontend/src/components/Layout/AppSidebar.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/Layout/AppSidebar.vue b/frontend/src/components/Layout/AppSidebar.vue index 510e4e6..8dc252a 100644 --- a/frontend/src/components/Layout/AppSidebar.vue +++ b/frontend/src/components/Layout/AppSidebar.vue @@ -71,7 +71,6 @@
- xinfra v3 一期 · 七机房容器化
RKE2 · Calico BGP · Ceph · LAS
AWS TGW + WireGuard · LDAP 认证
From a9319e77b9dc3bde01275c2c8da75d88d8f4f249 Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 11:35:03 +0800 Subject: [PATCH 09/10] =?UTF-8?q?refactor(observable):=20=E6=8B=86?= =?UTF-8?q?=E5=88=86=E7=9B=91=E6=8E=A7=E5=91=8A=E8=AD=A6=E4=B8=BA=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 侧边栏"监控/日志/告警"拆分为"监控"和"告警"两个导航项 - Monitor.vue 移除日志相关内容，保留 VictoriaMetrics 和 Zabbix 面板 - 新增 Alert.vue 告警页面，展示当前告警、告警通道、告警记录 - 路由新增 /alert 路径，meta.title 设为"告警" --- frontend/src/components/Layout/AppSidebar.vue | 5 +- frontend/src/router/index.ts | 8 +- frontend/src/views/monitor/Alert.vue | 85 +++++++++++++++++++ frontend/src/views/monitor/Monitor.vue | 26 +----- 4 files changed, 99 insertions(+), 25 deletions(-) create mode 100644 frontend/src/views/monitor/Alert.vue diff --git a/frontend/src/components/Layout/AppSidebar.vue b/frontend/src/components/Layout/AppSidebar.vue index 8dc252a..5680ba2 100644 --- a/frontend/src/components/Layout/AppSidebar.vue +++ b/frontend/src/components/Layout/AppSidebar.vue @@ -30,7 +30,10 @@
可观测性
- ◎监控 / 日志 / 告警 + ◎监控 + + + ⚡告警
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index d340bc8..da4000f 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -110,7 +110,13 @@ const router = createRouter({ path: 'monitor', name: 'Monitor', component: () => import('@/views/monitor/Monitor.vue'), - meta: { title: '监控 / 日志 / 告警' }, + meta: { title: '监控' }, + }, + { + path: 'alert', + name: 'Alert', + component: () => import('@/views/monitor/Alert.vue'), + meta: { title: '告警' }, }, ], }, diff --git a/frontend/src/views/monitor/Alert.vue b/frontend/src/views/monitor/Alert.vue new file mode 100644 index 0000000..49f8b55 --- /dev/null +++ b/frontend/src/views/monitor/Alert.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/frontend/src/views/monitor/Monitor.vue b/frontend/src/views/monitor/Monitor.vue index 5fe24ab..38480ea 100644 --- a/frontend/src/views/monitor/Monitor.vue +++ b/frontend/src/views/monitor/Monitor.vue @@ -2,8 +2,8 @@
-

监控 / 日志 / 告警

-

VictoriaMetrics 指标 · Zabbix 硬件状态 · ELK 日志中心 · 夜莺（Nightingale）统一告警引擎对接 qpass

+

监控

+

VictoriaMetrics 指标 · Zabbix 硬件状态

@@ -67,32 +67,12 @@
-
-
-

日志 + 统一告警

- Filebeat → Kafka → ES → Kibana · VM + Zabbix → qpass -
-
-
- {{ log.time }}{{ log.message }} -
-
-
From 66352c08e5607a35be0b83a287f0a21959469d5c Mon Sep 17 00:00:00 2001 From: hezhaohui Date: Fri, 17 Jul 2026 11:36:20 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix(subsystem):=20=E4=BF=AE=E6=AD=A3=20qp?= =?UTF-8?q?ass=20=E6=8F=8F=E8=BF=B0=E4=B8=BA=E4=B8=83=E7=89=9B=E4=BA=91?= =?UTF-8?q?=E5=86=85=E9=83=A8=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - subsystem.ts: description 和 category 更新 - SubsystemDetail.vue: 详情页描述同步更新 --- frontend/src/api/subsystem.ts | 4 ++-- frontend/src/views/subsystem/SubsystemDetail.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/api/subsystem.ts b/frontend/src/api/subsystem.ts index 3a68d10..752b08c 100644 --- a/frontend/src/api/subsystem.ts +++ b/frontend/src/api/subsystem.ts @@ -73,11 +73,11 @@ const mockSubsystems: Subsystem[] = [ id: 5, name: 'qpass', label: '七牛统一运维平台', - description: '夜莺、Zabbix、VictoriaMetrics 告警统一收敛与值班通知，按 P0/P1 分级推送。', + description: '七牛云内部系统。', icon: 'QP', url: 'https://qpass.xinfra.internal', domain: 'qpass.xinfra.internal', - category: '告警值班', + category: '内部系统', status: 'integrated', sso_enabled: true, }, diff --git a/frontend/src/views/subsystem/SubsystemDetail.vue b/frontend/src/views/subsystem/SubsystemDetail.vue index f5f49e8..38315da 100644 --- a/frontend/src/views/subsystem/SubsystemDetail.vue +++ b/frontend/src/views/subsystem/SubsystemDetail.vue @@ -112,7 +112,7 @@ const detailDesc = computed(() => { CloudDM: '数据库 SQL 上线统一审核，支持 LDAP 用户组到角色的自动映射。变更记录可追溯，审计合规。', CacheCloud: 'Redis 实例全生命周期管理，登录与监控运维统一入口。按业务线隔离实例，统一密码管理。', Apollo: '统一管理多机房 Config Service Cluster 的配置发布、灰度、回滚与变更审计，所有机房配置项均可在此单一入口检索与编辑。', - qpass: '夜莺、Zabbix、VictoriaMetrics 告警统一收敛与值班通知，按 P0/P1 分级推送。值班表自动轮转。', + qpass: '七牛云内部系统。', Grafana: '对接 VictoriaMetrics 数据源，K8s / 容器 / 业务指标统一仪表盘展示。预置核心看板，支持自定义。', } return descs[system.value.name] || system.value.description