diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts index c14e7432e..4d04e4a50 100644 --- a/packages/ui/certd-client/src/router/source/modules/certd.ts +++ b/packages/ui/certd-client/src/router/source/modules/certd.ts @@ -94,6 +94,59 @@ export const certdResources = [ keepAlive: true, }, }, + { + title: "certd.sysResources.enterpriseManager", + name: "EnterpriseManager", + path: "/sys/enterprise", + redirect: "/sys/enterprise/project", + meta: { + icon: "ion:cart-outline", + permission: "sys:settings:edit", + show: () => { + const settingStore = useSettingStore(); + return settingStore.isEnterprise; + }, + keepAlive: true, + }, + children: [ + { + title: "certd.sysResources.projectManager", + name: "ProjectManager", + path: "/sys/enterprise/project", + component: "/sys/enterprise/project/index.vue", + meta: { + show: true, + icon: "ion:cart", + permission: "sys:settings:edit", + keepAlive: true, + }, + }, + { + title: "certd.sysResources.projectMemberManager", + name: "ProjectMemberManager", + path: "/sys/enterprise/project/member", + component: "/sys/enterprise/project/member/index.vue", + meta: { + isMenu: false, + show: true, + icon: "ion:cart", + permission: "sys:settings:edit", + }, + }, + { + title: "certd.sysResources.enterpriseSetting", + name: "EnterpriseSetting", + path: "/sys/enterprise/setting", + redirect: "/sys/settings?tab=mode", + meta: { + isMenu: true, + show: true, + icon: "ion:cart", + permission: "sys:settings:edit", + }, + }, + ], + }, { title: "certd.settings", name: "MineSetting", diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts index 83881c993..aab7e077b 100644 --- a/packages/ui/certd-client/src/router/source/modules/sys.ts +++ b/packages/ui/certd-client/src/router/source/modules/sys.ts @@ -187,59 +187,6 @@ export const sysResources = [ keepAlive: true, }, }, - { - title: "certd.sysResources.enterpriseManager", - name: "EnterpriseManager", - path: "/sys/enterprise", - redirect: "/sys/enterprise/project", - meta: { - icon: "ion:cart-outline", - permission: "sys:settings:edit", - show: () => { - const settingStore = useSettingStore(); - return settingStore.isEnterprise; - }, - keepAlive: true, - }, - children: [ - { - title: "certd.sysResources.projectManager", - name: "ProjectManager", - path: "/sys/enterprise/project", - component: "/sys/enterprise/project/index.vue", - meta: { - show: true, - icon: "ion:cart", - permission: "sys:settings:edit", - keepAlive: true, - }, - }, - { - title: "certd.sysResources.projectMemberManager", - name: "ProjectMemberManager", - path: "/sys/enterprise/project/member", - component: "/sys/enterprise/project/member/index.vue", - meta: { - isMenu: false, - show: true, - icon: "ion:cart", - permission: "sys:settings:edit", - }, - }, - { - title: "certd.sysResources.enterpriseSetting", - name: "EnterpriseSetting", - path: "/sys/enterprise/setting", - redirect: "/sys/settings?tab=mode", - meta: { - isMenu: true, - show: true, - icon: "ion:cart", - permission: "sys:settings:edit", - }, - }, - ], - }, { title: "certd.sysResources.suiteManager", name: "SuiteManager", diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx index 871d79085..f864ff728 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx @@ -295,11 +295,6 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply width: 100, }, }, - projectId: { - title: t("certd.fields.projectName"), - type: "number", - dict: projectDict, - }, title: { title: t("certd.fields.pipelineName"), type: "link", @@ -634,6 +629,11 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply }, }, }, + projectId: { + title: t("certd.fields.projectName"), + type: "number", + dict: projectDict, + }, updateTime: { title: t("certd.fields.updateTime"), type: "datetime", diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue index 501a6b5c3..494c62424 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue @@ -1,7 +1,7 @@