diff --git a/agent/app/service/monitor.go b/agent/app/service/monitor.go index 985fbb9f0..c3cdb8e08 100644 --- a/agent/app/service/monitor.go +++ b/agent/app/service/monitor.go @@ -635,21 +635,18 @@ func saveXPUDataToDB() { } } func loadGPUInfoInt(val string) int { - valItem := strings.ReplaceAll(val, "MiB", "") - valItem = strings.ReplaceAll(valItem, "C", "") - valItem = strings.ReplaceAll(valItem, "%", "") - valItem = strings.TrimSpace(valItem) - data, _ := strconv.Atoi(valItem) + val = strings.TrimSuffix(val, "%") + val = strings.TrimSpace(val) + data, _ := strconv.Atoi(val) return data } func loadGPUInfoFloat(val string) float64 { - valItem := strings.ReplaceAll(val, "W", "") - valItem = strings.ReplaceAll(valItem, "MB", "") - valItem = strings.ReplaceAll(valItem, "MiB", "") - valItem = strings.ReplaceAll(valItem, "C", "") - valItem = strings.ReplaceAll(valItem, "°C", "") - valItem = strings.ReplaceAll(valItem, "%", "") - valItem = strings.TrimSpace(valItem) - data, _ := strconv.ParseFloat(valItem, 64) + val = strings.TrimSpace(val) + suffixes := []string{"W", "MB", "MiB", "°C", "C", "%"} + for _, suffix := range suffixes { + val = strings.TrimSuffix(val, suffix) + } + val = strings.TrimSpace(val) + data, _ := strconv.ParseFloat(val, 64) return data } diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index c49633d48..ed032caf0 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1210,6 +1210,7 @@ const message = { defaultIO: 'Default Disk', defaultIOHelper: 'Default disk option displayed in monitoring and overview interfaces', cleanMonitor: 'Clear Monitoring Records', + cleanHelper: 'This operation will clear all monitoring records including GPU. Continue?', avgLoad: 'Load average', loadDetail: 'Load detail', diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts index ae4d5b774..663b4754e 100644 --- a/frontend/src/lang/modules/es-es.ts +++ b/frontend/src/lang/modules/es-es.ts @@ -1218,6 +1218,7 @@ const message = { defaultIO: 'Disco Predeterminado', defaultIOHelper: 'Opción de disco predeterminada mostrada en las interfaces de monitoreo y resumen', cleanMonitor: 'Limpiar Registros de Monitoreo', + cleanHelper: 'Esta operación borrará todos los registros de monitoreo, incluidos los de GPU. ¿Continuar?', avgLoad: 'Carga promedio', loadDetail: 'Detalle de carga', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index 9236015b5..7948b091a 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -1174,6 +1174,7 @@ const message = { defaultIO: 'デフォルトディスク', defaultIOHelper: '監視および概要インターフェースに表示されるデフォルトのディスクオプション', cleanMonitor: '監視記録をクリア', + cleanHelper: 'この操作により、GPUを含むすべての監視記録がクリアされます。続行しますか?', avgLoad: 'ロード平均', loadDetail: '詳細を読み込みます', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index 8e91df6a6..d3559328c 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -1166,6 +1166,7 @@ const message = { defaultIO: '기본 디스크', defaultIOHelper: '모니터링 및 개요 인터페이스에 표시되는 기본 디스크 옵션', cleanMonitor: '모니터링 기록 지우기', + cleanHelper: '이 작업은 GPU를 포함한 모든 모니터링 기록을 지웁니다. 계속하시겠습니까?', avgLoad: '평균 부하', loadDetail: '부하 세부사항', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index 7a6756ac5..46ab45002 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -1204,6 +1204,7 @@ const message = { defaultIO: 'Cakera Lalai', defaultIOHelper: 'Pilihan cakera lalai yang dipaparkan dalam antara muka pemantauan dan gambaran keseluruhan', cleanMonitor: 'Kosongkan Rekod Pemantauan', + cleanHelper: 'Operasi ini akan membersihkan semua rekod pemantauan termasuk GPU. Teruskan?', avgLoad: 'Purata beban', loadDetail: 'Butiran beban', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index 1b450c395..aa752f4cd 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -1198,6 +1198,7 @@ const message = { defaultIO: 'Disco Padrão', defaultIOHelper: 'Opção de disco padrão exibida nas interfaces de monitoramento e visão geral', cleanMonitor: 'Limpar Registros de Monitoramento', + cleanHelper: 'Esta operação limpará todos os registros de monitoramento, incluindo GPU. Continuar?', avgLoad: 'Média de carga', loadDetail: 'Detalhes da carga', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 0e42d990a..944d8e16d 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -1200,6 +1200,7 @@ const message = { defaultIO: 'Диск по Умолчанию', defaultIOHelper: 'Опция диска по умолчанию, отображаемая в интерфейсах мониторинга и обзора', cleanMonitor: 'Очистить Записи Мониторинга', + cleanHelper: 'Эта операция очистит все записи мониторинга, включая GPU. Продолжить?', avgLoad: 'Средняя нагрузка', loadDetail: 'Детали нагрузки', diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts index 219dfc44e..a1a23c58a 100644 --- a/frontend/src/lang/modules/tr.ts +++ b/frontend/src/lang/modules/tr.ts @@ -1225,6 +1225,7 @@ const message = { defaultIO: 'Varsayılan Disk', defaultIOHelper: 'İzleme ve genel bakış arayüzlerinde görüntülenen varsayılan disk seçeneği', cleanMonitor: 'İzleme Kayıtlarını Temizle', + cleanHelper: 'Bu işlem GPU dahil tüm izleme kayıtlarını temizleyecektir. Devam etmek istiyor musunuz?', avgLoad: 'Ortalama yük', loadDetail: 'Yük detayı', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index 0b33eddd5..438fcc692 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -1145,6 +1145,7 @@ const message = { defaultIO: '預設磁碟', defaultIOHelper: '預設監控和概覽介面顯示的磁碟選項', cleanMonitor: '清空監控記錄', + cleanHelper: '該操作將清空包括 GPU 在內的所有監控記錄,是否繼續?', avgLoad: '平均負載', loadDetail: '負載詳情', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 745a39e41..4c6db5acc 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1151,6 +1151,7 @@ const message = { defaultIO: '默认磁盘', defaultIOHelper: '默认监控和概览界面显示的磁盘选项', cleanMonitor: '清空监控记录', + cleanHelper: '该操作将清空包括 GPU 在内的所有监控记录,是否继续?', avgLoad: '平均负载', loadDetail: '负载详情', diff --git a/frontend/src/views/ai/gpu/index.vue b/frontend/src/views/ai/gpu/index.vue index 6f1c80385..2d6324578 100644 --- a/frontend/src/views/ai/gpu/index.vue +++ b/frontend/src/views/ai/gpu/index.vue @@ -27,6 +27,7 @@ + @@ -154,6 +155,7 @@ import { GlobalStore } from '@/store'; import { shortcuts } from '@/utils/shortcuts'; import { Host } from '@/api/interface/host'; import i18n from '@/lang'; +import { routerToName } from '@/utils/router'; const globalStore = GlobalStore(); @@ -292,6 +294,10 @@ function initPowerCharts(baseDate: any, items: any) { }; } +const quickJump = () => { + routerToName('HostMonitorSetting'); +}; + function initXpuPowerCharts(baseDate: any, items: any) { let list = items.map(function (item: any) { return { value: Number(item.used.toFixed(2)), data: item }; diff --git a/frontend/src/views/host/monitor/setting/index.vue b/frontend/src/views/host/monitor/setting/index.vue index 0d72573f8..508da634a 100644 --- a/frontend/src/views/host/monitor/setting/index.vue +++ b/frontend/src/views/host/monitor/setting/index.vue @@ -142,7 +142,7 @@ const onChangeIO = () => { }; const onClean = async () => { - ElMessageBox.confirm(i18n.global.t('commons.msg.clean'), i18n.global.t('monitor.cleanMonitor'), { + ElMessageBox.confirm(i18n.global.t('monitor.cleanHelper'), i18n.global.t('monitor.cleanMonitor'), { confirmButtonText: i18n.global.t('commons.button.confirm'), cancelButtonText: i18n.global.t('commons.button.cancel'), type: 'info',