Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ const changeNode = (command: string) => {
globalStore.currentNode = 'local';
globalStore.currentNodeAddr = item.addr;
loadGlobalSetting();
localStorage.removeItem('dashboardCache');
localStorage.removeItem('upgradeChecked');
loadProductProFromDB();
routerToNameWithQuery('home', { t: Date.now() });
return;
Expand All @@ -200,6 +202,8 @@ const changeNode = (command: string) => {
return;
}
loadGlobalSetting();
localStorage.removeItem('dashboardCache');
localStorage.removeItem('upgradeChecked');
globalStore.currentNode = command || 'local';
globalStore.currentNodeAddr = item.addr;
loadProductProFromDB();
Expand Down Expand Up @@ -238,10 +242,6 @@ const logout = () => {
})
.then(async () => {
await logOutApi();
sessionStorage.removeItem('dashboardCache');
localStorage.removeItem('dashboardCache');
sessionStorage.removeItem('upgradeChecked');
localStorage.removeItem('upgradeChecked');
router.push({ name: 'entrance', params: { code: globalStore.entrance } });
globalStore.setLogStatus(false);
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
Expand Down
21 changes: 5 additions & 16 deletions frontend/src/views/home/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,6 @@ const DASHBOARD_CACHE_TTL = {
netOptions: 60 * 60 * 1000,
ioOptions: 60 * 60 * 1000,
};
const UPGRADE_CHECK_KEY = 'upgradeChecked';
const UPGRADE_CHECK_EXPIRE = 24 * 60 * 60 * 1000;

const statusRef = ref();
const appRef = ref();
Expand Down Expand Up @@ -586,11 +584,9 @@ const toggleSensitiveInfo = () => {

const refreshDashboard = async () => {
clearDashboardCache();
localStorage.removeItem(UPGRADE_CHECK_KEY);
hasRefreshedOptionsOnHover.value = false;
await onLoadBaseInfo(false, 'all');
await Promise.allSettled([onLoadSimpleNode(), onLoadNetworkOptions(true), onLoadIOOptions(true), loadSafeStatus()]);
await loadUpgradeStatus();
};

const jumpPanel = (row: any) => {
Expand Down Expand Up @@ -733,15 +729,12 @@ const hideEntrance = () => {
};

const loadUpgradeStatus = async () => {
const checkedAt = Number(localStorage.getItem(UPGRADE_CHECK_KEY));
if (checkedAt && Date.now() - checkedAt < UPGRADE_CHECK_EXPIRE) return;
const res = await loadUpgradeInfo();
if (res && (res.data.testVersion || res.data.newVersion || res.data.latestVersion)) {
globalStore.hasNewVersion = true;
} else {
globalStore.hasNewVersion = false;
}
localStorage.setItem(UPGRADE_CHECK_KEY, Date.now().toString());
};

const loadSafeStatus = async () => {
Expand Down Expand Up @@ -799,25 +792,21 @@ const refreshOptionsOnHover = async () => {
const scheduleDeferredFetch = () => {
setTimeout(() => {
onLoadSimpleNode();
}, 200);
setTimeout(() => {
onLoadNetworkOptions();
}, 400);
setTimeout(() => {
onLoadIOOptions();
}, 600);
setTimeout(() => {
loadUpgradeStatus();
}, 800);
};

const fetchData = async () => {
window.addEventListener('focus', onFocus);
window.addEventListener('blur', onBlur);
hasRefreshedOptionsOnHover.value = false;
await loadSafeStatus();
await onLoadBaseInfo(true, 'all');
loadSafeStatus();
onLoadBaseInfo(true, 'all');
scheduleDeferredFetch();
setTimeout(() => {
loadUpgradeStatus();
}, 2000);
};

const loadWelcome = async () => {
Expand Down
5 changes: 1 addition & 4 deletions frontend/src/views/home/status/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,7 @@
<template v-for="(item, index) of currentInfo.xpuData" :key="index">
<el-col :xs="6" :sm="6" :md="3" :lg="3" :xl="3" align="center" v-if="isShow('xpu', index)">
<el-popover :hide-after="20" :teleported="false" :width="400" v-if="chartsOption[`xpu${index}`]">
<el-descriptions :title="item.deviceName" direction="vertical" :column="4" size="small">
<el-descriptions-item :label="$t('monitor.gpuUtil')">
{{ item.memoryUtil }}
</el-descriptions-item>
<el-descriptions :title="item.deviceName" direction="vertical" :column="3" size="small">
<el-descriptions-item :label="$t('monitor.temperature')">
{{ item.temperature }}
</el-descriptions-item>
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/views/login/components/login-form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ import { useI18n } from 'vue-i18n';
import { encryptPassword } from '@/utils/util';
import { getXpackSettingForTheme } from '@/utils/xpack';
import { routerToName } from '@/utils/router';
import { changeToLocal } from '@/utils/node';
import { changeToLocal, setDefaultNodeInfo } from '@/utils/node';

const i18n = useI18n();
const themeConfig = computed(() => globalStore.themeConfig);
Expand Down Expand Up @@ -345,6 +345,9 @@ const login = (formEl: FormInstance | undefined) => {
tabsStore.removeAllTabs();
changeToLocal();
MsgSuccess(i18n.t('commons.msg.loginSuccess'));
setDefaultNodeInfo();
localStorage.removeItem('dashboardCache');
localStorage.removeItem('upgradeChecked');
routerToName('home');
document.onkeydown = null;
} catch (res) {
Expand Down Expand Up @@ -386,6 +389,9 @@ const mfaLogin = async (auto: boolean) => {
tabsStore.removeAllTabs();
MsgSuccess(i18n.t('commons.msg.loginSuccess'));
changeToLocal();
setDefaultNodeInfo();
localStorage.removeItem('dashboardCache');
localStorage.removeItem('upgradeChecked');
routerToName('home');
document.onkeydown = null;
} catch (res) {
Expand Down
Loading