diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts
index 19a7c6e..73d208a 100644
--- a/src/router/elegant/routes.ts
+++ b/src/router/elegant/routes.ts
@@ -47,7 +47,8 @@ export const generatedRoutes: GeneratedRoute[] = [
title: 'about',
i18nKey: 'route.about',
icon: 'fluent:book-information-24-regular',
- order: 10
+ order: 10,
+ hideInMenu: true
}
},
{
@@ -58,7 +59,8 @@ export const generatedRoutes: GeneratedRoute[] = [
title: 'function',
i18nKey: 'route.function',
icon: 'icon-park-outline:all-application',
- order: 6
+ order: 6,
+ hideInMenu: true
},
children: [
{
@@ -200,7 +202,8 @@ export const generatedRoutes: GeneratedRoute[] = [
i18nKey: 'route.manage',
icon: 'carbon:cloud-service-management',
order: 9,
- roles: ['R_ADMIN']
+ roles: ['R_ADMIN'],
+ hideInMenu: true
},
children: [
{
@@ -262,7 +265,8 @@ export const generatedRoutes: GeneratedRoute[] = [
meta: {
title: 'multi-menu',
i18nKey: 'route.multi-menu',
- order: 8
+ order: 8,
+ hideInMenu: true
},
children: [
{
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 8984785..1c15eb3 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -17,7 +17,8 @@ const customRoutes: CustomRoute[] = [
title: 'exception',
i18nKey: 'route.exception',
icon: 'ant-design:exception-outlined',
- order: 7
+ order: 7,
+ hideInMenu: true
},
children: [
{
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 31a743e..e13b5f8 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -119,6 +119,7 @@ declare namespace Api {
/** Task Retry Job */
type CardCount = {
jobTask: JobTask;
+ workFlowTask: JobTask;
retryTask: RetryTask;
retryTaskBarList: RetryTaskBarList[];
onLineService: OnlineService;
diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts
index b2c55c9..b31add1 100644
--- a/src/typings/components.d.ts
+++ b/src/typings/components.d.ts
@@ -23,7 +23,6 @@ declare module 'vue' {
IconIcRoundPlus: typeof import('~icons/ic/round-plus')['default']
IconIcRoundRefresh: typeof import('~icons/ic/round-refresh')['default']
IconIcRoundSearch: typeof import('~icons/ic/round-search')['default']
- IconLocalBanner: typeof import('~icons/local/banner')['default']
IconLocalLogo: typeof import('~icons/local/logo')['default']
'IconMaterialSymbols:closeFullscreenRounded': typeof import('~icons/material-symbols/close-fullscreen-rounded')['default']
'IconMaterialSymbols:openInFullRounded': typeof import('~icons/material-symbols/open-in-full-rounded')['default']
@@ -37,7 +36,6 @@ declare module 'vue' {
LangSwitch: typeof import('./../components/common/lang-switch.vue')['default']
LookForward: typeof import('./../components/custom/look-forward.vue')['default']
MenuToggler: typeof import('./../components/common/menu-toggler.vue')['default']
- NBadge: typeof import('naive-ui')['NBadge']
NBreadcrumb: typeof import('naive-ui')['NBreadcrumb']
NBreadcrumbItem: typeof import('naive-ui')['NBreadcrumbItem']
NButton: typeof import('naive-ui')['NButton']
@@ -62,8 +60,6 @@ declare module 'vue' {
NInput: typeof import('naive-ui')['NInput']
NInputGroup: typeof import('naive-ui')['NInputGroup']
NInputNumber: typeof import('naive-ui')['NInputNumber']
- NList: typeof import('naive-ui')['NList']
- NListItem: typeof import('naive-ui')['NListItem']
NLoadingBarProvider: typeof import('naive-ui')['NLoadingBarProvider']
NMenu: typeof import('naive-ui')['NMenu']
NMessageProvider: typeof import('naive-ui')['NMessageProvider']
@@ -85,7 +81,6 @@ declare module 'vue' {
NTabPane: typeof import('naive-ui')['NTabPane']
NTabs: typeof import('naive-ui')['NTabs']
NTag: typeof import('naive-ui')['NTag']
- NThing: typeof import('naive-ui')['NThing']
NTooltip: typeof import('naive-ui')['NTooltip']
NTree: typeof import('naive-ui')['NTree']
OperateDrawer: typeof import('./../components/common/operate-drawer.vue')['default']
diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue
index 781f6d4..c21580a 100644
--- a/src/views/_builtin/login/modules/pwd-login.vue
+++ b/src/views/_builtin/login/modules/pwd-login.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/modules/pie-retry-chart.vue b/src/views/home/modules/pie-retry-chart.vue
index 5d63341..8f3649f 100644
--- a/src/views/home/modules/pie-retry-chart.vue
+++ b/src/views/home/modules/pie-retry-chart.vue
@@ -21,7 +21,8 @@ const appStore = useAppStore();
const { domRef, updateOptions } = useEcharts(() => ({
tooltip: {
- trigger: 'item'
+ trigger: 'item',
+ formatter: '{a}
{b}: {d}%'
},
legend: {
bottom: '1%',
@@ -60,23 +61,46 @@ const { domRef, updateOptions } = useEcharts(() => ({
]
}));
-const getData = () => {
- updateOptions(opts => {
- const retryTask = props.modelValue.retryTask;
- const jobTask = props.modelValue.jobTask;
- const totalNum = props.type === 0 ? retryTask.totalNum : jobTask.totalNum;
- opts.series[0].data = [
- { name: $t('common.success'), value: props.type === 0 ? retryTask.finishNum : jobTask.successNum / totalNum },
- { name: $t('common.running'), value: props.type === 0 ? retryTask.runningNum : jobTask.failNum / totalNum },
- {
- name: $t('page.manage.retryTask.status.maxRetryTimes'),
- value: props.type === 0 ? retryTask.maxCountNum : jobTask.stopNum / totalNum
- },
- {
- name: $t('page.manage.retryTask.status.pauseRetry'),
- value: props.type === 0 ? retryTask.suspendNum : jobTask.cancelNum / totalNum
- }
- ];
+const getData = async () => {
+ await new Promise(resolve => {
+ setTimeout(resolve, 1);
+ });
+
+ if (!props.modelValue) {
+ await getData();
+ return;
+ }
+
+ updateOptions((opts, factory) => {
+ const originOpts = factory();
+ opts.series[0].name = originOpts.series[0].name;
+ if (props.type === 0) {
+ const retryTask = props.modelValue.retryTask;
+ opts.series[0].data = [
+ { name: $t('common.success'), value: retryTask.finishNum / retryTask.totalNum },
+ { name: $t('common.running'), value: retryTask.runningNum / retryTask.totalNum },
+ { name: $t('page.manage.retryTask.status.maxRetryTimes'), value: retryTask.maxCountNum / retryTask.totalNum },
+ { name: $t('page.manage.retryTask.status.pauseRetry'), value: retryTask.suspendNum / retryTask.totalNum }
+ ];
+ }
+ if (props.type === 1) {
+ const jobTask = props.modelValue.jobTask;
+ opts.series[0].data = [
+ { name: $t('common.success'), value: jobTask.successNum / jobTask.totalNum },
+ { name: $t('common.fail'), value: jobTask.failNum / jobTask.totalNum },
+ { name: $t('common.stop'), value: jobTask.stopNum / jobTask.totalNum },
+ { name: $t('common.cancel'), value: jobTask.cancelNum / jobTask.totalNum }
+ ];
+ }
+ if (props.type === 2) {
+ const workFlowTask = props.modelValue.workFlowTask;
+ opts.series[0].data = [
+ { name: $t('common.success'), value: workFlowTask.successNum / workFlowTask.totalNum },
+ { name: $t('common.fail'), value: workFlowTask.failNum / workFlowTask.totalNum },
+ { name: $t('common.stop'), value: workFlowTask.stopNum / workFlowTask.totalNum },
+ { name: $t('common.cancel'), value: workFlowTask.cancelNum / workFlowTask.totalNum }
+ ];
+ }
return opts;
});
};
diff --git a/src/views/home/modules/retry-tab.vue b/src/views/home/modules/retry-tab.vue
index 0afd6b3..15859cc 100644
--- a/src/views/home/modules/retry-tab.vue
+++ b/src/views/home/modules/retry-tab.vue
@@ -24,7 +24,6 @@ const data = ref();
const groupOptions = ref();
const tabParams = ref({
type: 'WEEK',
- groupName: 'Default',
page: 1,
size: 6
});
@@ -67,6 +66,7 @@ watch(
const onUpdateTab = (value: string) => {
if (value === 'retryTask') {
type.value = 0;
+ tabParams.value.mode = undefined;
}
if (value === 'jobTask') {
type.value = 1;