From d06583773a2f15999699ff912fa76662538efad9 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:46:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=A6=82=E8=A7=88?= =?UTF-8?q?=E9=A1=B5=E7=A3=81=E7=9B=98=E6=98=BE=E7=A4=BA=20(#7023)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/modules/en.ts | 1 + frontend/src/lang/modules/tw.ts | 1 + frontend/src/lang/modules/zh.ts | 1 + frontend/src/layout/components/AppFooter.vue | 2 +- frontend/src/views/home/index.vue | 6 +- frontend/src/views/home/status/index.vue | 75 ++++++++++---------- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 57333aff4..8a45dab62 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -11,6 +11,7 @@ const message = { true: 'true', false: 'false', example: 'e.g.:', + fit2cloud: 'FIT2CLOUD', button: { create: 'Create ', add: 'Add ', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index 1c91e43cc..f772c8a60 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -10,6 +10,7 @@ const message = { true: '是', false: '否', example: '例：', + fit2cloud: '飛致雲', button: { create: '創建', add: '添加', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index df91ec8f5..b953c73cb 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -10,6 +10,7 @@ const message = { true: '是', false: '否', example: '例：', + fit2cloud: '飞致云', button: { create: '创建', add: '添加', diff --git a/frontend/src/layout/components/AppFooter.vue b/frontend/src/layout/components/AppFooter.vue index 76ba5bcd1..19f49c4c7 100644 --- a/frontend/src/layout/components/AppFooter.vue +++ b/frontend/src/layout/components/AppFooter.vue @@ -2,7 +2,7 @@
- Copyright © 2014-2024 飞致云 + Copyright © 2014-2024 {{ $t('commons.fit2cloud') }}
diff --git a/frontend/src/views/home/index.vue b/frontend/src/views/home/index.vue index fa0a3e520..3f609bf21 100644 --- a/frontend/src/views/home/index.vue +++ b/frontend/src/views/home/index.vue @@ -290,7 +290,6 @@ const isSafety = ref(); const chartOption = ref('network'); let timer: NodeJS.Timer | null = null; let isInit = ref(true); -let isStatusInit = ref(true); let isActive = ref(true); const ioReadBytes = ref>([]); @@ -429,8 +428,7 @@ const onLoadBaseInfo = async (isInit: boolean, range: string) => { currentInfo.value.uptime = resData.uptime; loadAppCurrentInfo(); - isStatusInit.value = false; - statusRef.value.acceptParams(currentInfo.value, baseInfo.value, isStatusInit.value); + statusRef.value.acceptParams(currentInfo.value, baseInfo.value); appRef.value.acceptParams(); if (isInit) { timer = setInterval(async () => { @@ -443,7 +441,7 @@ const onLoadBaseInfo = async (isInit: boolean, range: string) => { const loadAppCurrentInfo = async () => { await Promise.all([onLoadCurrentInfo('gpu'), onLoadCurrentInfo('basic'), onLoadCurrentInfo('ioNet')]); - statusRef.value.acceptParams(currentInfo.value, baseInfo.value, isStatusInit.value); + statusRef.value.acceptParams(currentInfo.value, baseInfo.value); }; const onLoadCurrentInfo = async (scope: string) => { diff --git a/frontend/src/views/home/status/index.vue b/frontend/src/views/home/status/index.vue index 5ef9f1b86..8d5f74227 100644 --- a/frontend/src/views/home/status/index.vue +++ b/frontend/src/views/home/status/index.vue @@ -112,7 +112,7 @@ {{ loadStatus(currentInfo.loadUsagePercent) }} @@ -262,18 +246,12 @@ {{ item.deviceName }} - - + + {{ $t('tabs.more') }} - + {{ $t('tabs.hide') }} @@ -288,6 +266,7 @@ import router from '@/routers'; import i18n from '@/lang'; import { nextTick, ref } from 'vue'; const showMore = ref(false); +const totalCount = ref(); const baseInfo = ref({ websiteNumber: 0, @@ -355,7 +334,7 @@ const cpuShowAll = ref(); const chartsOption = ref({ cpu: null, memory: null, load: null }); -const acceptParams = (current: Dashboard.CurrentInfo, base: Dashboard.BaseInfo, isInit: boolean): void => { +const acceptParams = (current: Dashboard.CurrentInfo, base: Dashboard.BaseInfo): void => { currentInfo.value = current; baseInfo.value = base; chartsOption.value['cpu'] = { @@ -389,14 +368,15 @@ const acceptParams = (current: Dashboard.CurrentInfo, base: Dashboard.BaseInfo, } currentInfo.value.xpuData = currentInfo.value.xpuData || []; for (let i = 0; i < currentInfo.value.xpuData.length; i++) { - chartsOption.value['gpu' + i] = { - title: 'GPU-' + currentInfo.value.xpuData[i].deviceID, + chartsOption.value['xpu' + i] = { + title: 'XPU-' + currentInfo.value.xpuData[i].deviceID, data: formatNumber(Number(currentInfo.value.xpuData[i].memoryUtil.replaceAll('%', ''))), }; } - if (currentInfo.value.diskData.length + currentInfo.value.gpuData.length > 5) { - showMore.value = isInit ? false : showMore.value || false; - } + + totalCount.value = + currentInfo.value.diskData.length + currentInfo.value.gpuData.length + currentInfo.value.xpuData.length; + showMore.value = localStorage.getItem('dashboard_show') === 'more'; }); }; @@ -413,10 +393,29 @@ function loadStatus(val: number) { return i18n.global.t('home.runJam'); } +const isShow = (val: string, index: number) => { + let showCount = totalCount.value < 6 ? 5 : 4; + switch (val) { + case 'disk': + return showMore.value || index < showCount; + case 'gpu': + let gpuCount = showCount - currentInfo.value.diskData.length; + return showMore.value || index < gpuCount; + case 'xpu': + let xpuCount = showCount - currentInfo.value.diskData.length - currentInfo.value.gpuData.length; + return showMore.value || index < xpuCount; + } +}; + const goGPU = () => { router.push({ name: 'GPU' }); }; +const changeShowMore = (show: boolean) => { + showMore.value = show; + localStorage.setItem('dashboard_show', show ? 'more' : 'hide'); +}; + const loadWidth = () => { if (!cpuShowAll.value || currentInfo.value.cpuPercent.length < 32) { return 310;