diff --git a/src/store/menu.ts b/src/store/menu.ts
index d1d8f8c4..fbb54394 100644
--- a/src/store/menu.ts
+++ b/src/store/menu.ts
@@ -5,7 +5,7 @@ import { cloneDeep, isArray } from 'lodash-es'
import { usePermissionStore } from './permission'
import router from '@/router'
import { onlyMessage } from '@/utils/comm'
-// import { AccountMenu, NotificationRecordCode, NotificationSubscriptionCode } from '@/router/menu'
+import { AccountMenu, NotificationRecordCode, NotificationSubscriptionCode } from '@/router/menu'
import { USER_CENTER_MENU_CODE } from '@/utils/consts'
import {isNoCommunity} from "@/utils/utils";
@@ -109,6 +109,7 @@ export const useMenuStore = defineStore({
permission.permissions = {}
const { menusData, silderMenus } = filterAsyncRouter(resultData)
+
this.menus = findCodeRoute([...resultData]) // AccountMenu
Object.keys(this.menus).forEach((item) => {
const _item = this.menus[item]
@@ -125,7 +126,7 @@ export const useMenuStore = defineStore({
}
})
// menusData.push(AccountMenu)
- this.siderMenus = silderMenus.filter((item: { name: string }) => ![USER_CENTER_MENU_CODE].includes(item.name))
+ this.siderMenus = silderMenus.filter((item: { name: string }) => ![USER_CENTER_MENU_CODE, NotificationRecordCode, NotificationSubscriptionCode].includes(item.name))
res(menusData)
}
})
diff --git a/src/views/link/DashBoard/components/Cpu.vue b/src/views/link/DashBoard/components/Cpu.vue
index 59192c47..f7c0cc4f 100644
--- a/src/views/link/DashBoard/components/Cpu.vue
+++ b/src/views/link/DashBoard/components/Cpu.vue
@@ -38,18 +38,26 @@
v-if="isEmpty"
style="height: 200px; margin-top: 100px"
/>
-
+
+
+
+
+
+
+
m
+
+
\ No newline at end of file
diff --git a/src/views/link/DashBoard/components/TopCard.vue b/src/views/link/DashBoard/components/TopCard.vue
index 3a924893..869448d6 100644
--- a/src/views/link/DashBoard/components/TopCard.vue
+++ b/src/views/link/DashBoard/components/TopCard.vue
@@ -1,43 +1,47 @@
@@ -115,6 +119,7 @@ const getData = () => {
};
onMounted(() => {
+ console.log('isNoCommunity')
if (isNoCommunity) {
serverNode().then((resp: any) => {
if (resp.success) {
@@ -143,19 +148,21 @@ watch(
emit('serviceChange', val)
},
);
+
\ No newline at end of file
diff --git a/src/views/link/DashBoard/components/tool.ts b/src/views/link/DashBoard/components/tool.ts
index be73f058..846ed48a 100644
--- a/src/views/link/DashBoard/components/tool.ts
+++ b/src/views/link/DashBoard/components/tool.ts
@@ -1,4 +1,4 @@
-import dayjs from 'dayjs';
+import dayjs, { Dayjs } from 'dayjs';
import * as echarts from 'echarts';
// export const getInterval = (type: string) => {
@@ -41,6 +41,8 @@ export const getTimeByType = (type: string) => {
return dayjs().subtract(29, 'days');
case 'year':
return dayjs().subtract(365, 'days');
+ case 'day':
+ return dayjs().subtract(24, 'hours');
default:
return dayjs().startOf('day');
}
@@ -58,14 +60,14 @@ export const networkParams = (val: any) => {
let _time = '1h';
let _limit = 12;
let format = 'HH';
-
- const dt = Number(val.time.time[1]) - Number(val.time.time[0]);
+ // @ts-ignore
+ const dt = dayjs(val.time.time[1]) - dayjs(val.time.time[0])
const hour = 60 * 60 * 1000;
const days = hour * 24;
const months = days * 30;
const year = 365 * days;
- if (dt <= hour) {
+ if (dt <= (hour + 10)) {
format = 'mm:ss';
_time = '1m';
_limit = 30;
diff --git a/yarn.lock b/yarn.lock
index 87f32034..b60217f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3837,8 +3837,8 @@ jetlinks-ui-components@^1.0.23:
jetlinks-ui-components@^1.0.25:
version "1.0.25"
- resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.25.tgz#b783da3fe05c1420b2ee5707868a67baa90559f7"
- integrity sha512-4HJM9Wi8gFfBgYFPjCO7JpmEAXVtDUf5u5lnXTQUt1QkGh0QCzFSBGBIStFs6HE5oY3oIIS3ZWoAjvXElpnNZg==
+ resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.25.tgz#fa730dc39f4072f35c34c00d41d343b0da4a99a5"
+ integrity sha512-/iz4p86BxmEAPxgTNkr7RqnMdRHQ6vEUKzIlyddtQIvQjuZXTxImh+Ik+V6yxtQVElI8Fjk3l7fiYZZ0E68MSw==
dependencies:
"@vueuse/core" "^9.12.0"
"@vueuse/router" "^9.13.0"