diff --git a/web/src/interfaces/database/user-setting.ts b/web/src/interfaces/database/user-setting.ts index 933f80d..e2dded1 100644 --- a/web/src/interfaces/database/user-setting.ts +++ b/web/src/interfaces/database/user-setting.ts @@ -38,7 +38,7 @@ export interface ISystemStatus { storage: Storage; database: Database; redis: Redis; - task_executor_heartbeat: Record; + // task_executor_heartbeat: Record; } interface Redis { diff --git a/web/src/pages/user-setting/setting-system/index.tsx b/web/src/pages/user-setting/setting-system/index.tsx index 9c41154..abad403 100644 --- a/web/src/pages/user-setting/setting-system/index.tsx +++ b/web/src/pages/user-setting/setting-system/index.tsx @@ -1,19 +1,13 @@ import SvgIcon from '@/components/svg-icon'; import { useFetchSystemStatus } from '@/hooks/user-setting-hooks'; -import { - ISystemStatus, - TaskExecutorHeartbeatItem, -} from '@/interfaces/database/user-setting'; +import { ISystemStatus } from '@/interfaces/database/user-setting'; +import { toFixed } from '@/utils/common-util'; import { Badge, Card, Flex, Spin, Typography } from 'antd'; import classNames from 'classnames'; import lowerCase from 'lodash/lowerCase'; import upperFirst from 'lodash/upperFirst'; import { useEffect } from 'react'; - -import { toFixed } from '@/utils/common-util'; -import { isObject } from 'lodash'; import styles from './index.less'; -import TaskBarChat from './task-bar-chat'; const { Text } = Typography; @@ -28,11 +22,9 @@ const TitleMap = { storage: 'Object Storage', redis: 'Redis', database: 'Database', - task_executor_heartbeats: 'Task Executor', }; const IconMap = { - es: 'es', doc_engine: 'storage', redis: 'redis', storage: 'minio', @@ -56,15 +48,16 @@ const SystemInfo = () => { {Object.keys(systemStatus).map((key) => { const info = systemStatus[key as keyof ISystemStatus]; - return ( {key === 'task_executor_heartbeats' ? ( - +
) : ( + // + // 各组件Icon { key={key} > {key === 'task_executor_heartbeats' ? ( - isObject(info) ? ( - } - > - ) : ( - - {typeof info.error === 'string' ? info.error : ''} - - ) +
) : ( Object.keys(info) .filter((x) => x !== 'status') @@ -103,6 +88,7 @@ const SystemInfo = () => { className={styles.text} > {upperFirst(lowerCase(x))}: + {/* 卡片具体文字数值 */} { const pathName = useSecondPathName(); const { logout } = useLogout(); const { t } = useTranslate('setting'); - const { version, fetchSystemVersion } = useFetchSystemVersion(); - - useEffect(() => { - if (location.host !== Domain) { - fetchSystemVersion(); - } - }, [fetchSystemVersion]); function getItem( label: string, @@ -43,9 +34,7 @@ const SideBar = () => { label: ( {t(label)} - - {label === 'system' && version} - + {label === 'system'} ), type,