浏览代码

调整菜单

ssvfdn 2 月之前
父节点
当前提交
bec971f690

+ 1 - 1
apps/web-antd/src/api/core/menu.ts

@@ -6,5 +6,5 @@ import { requestClient } from '#/api/request';
  * 获取用户所有菜单
  */
 export async function getAllMenusApi() {
-  return requestClient.get<RouteRecordStringComponent[]>('/menu/all');
+  return requestClient.get<RouteRecordStringComponent[]>('/menu/get_user_menus');
 }

+ 2 - 0
apps/web-antd/src/preferences.ts

@@ -10,6 +10,8 @@ export const overridesPreferences = defineOverridesPreferences({
   app: {
     name: import.meta.env.VITE_APP_TITLE,
     enableRefreshToken: false,
+      // accessMode: 'backend',
+
   },
   theme: {
     mode: 'light'

+ 1 - 0
apps/web-antd/src/router/guard.ts

@@ -95,6 +95,7 @@ function setupAccessGuard(router: Router) {
     const userInfo = userStore.userInfo || (await authStore.fetchUserInfo());
     const userRoles = userInfo.roles ?? [];
 
+
     // 生成菜单和路由
     const { accessibleMenus, accessibleRoutes } = await generateAccess({
       roles: userRoles,

+ 29 - 29
apps/web-antd/src/router/routes/modules/demos.ts

@@ -1,29 +1,29 @@
-import type { RouteRecordRaw } from 'vue-router';
-
-import { $t } from '#/locales';
-
-const routes: RouteRecordRaw[] = [
-  {
-    meta: {
-      icon: 'ic:baseline-view-in-ar',
-      keepAlive: true,
-      order: 1000,
-      title: $t('demos.title'),
-    },
-    name: 'Demos',
-    path: '/demos',
-    children: [
-      {
-        meta: {
-          title: $t('demos.antd'),
-            keepAlive: true
-        },
-        name: 'AntDesignDemos',
-        path: '/demos/ant-design',
-        component: () => import('#/views/demos/antd/index.vue'),
-      },
-    ],
-  },
-];
-
-export default routes;
+// import type { RouteRecordRaw } from 'vue-router';
+//
+// import { $t } from '#/locales';
+//
+// const routes: RouteRecordRaw[] = [
+//   {
+//     meta: {
+//       icon: 'ic:baseline-view-in-ar',
+//       keepAlive: true,
+//       order: 1000,
+//       title: $t('demos.title'),
+//     },
+//     name: 'Demos',
+//     path: '/demos',
+//     children: [
+//       {
+//         meta: {
+//           title: $t('demos.antd'),
+//             keepAlive: true
+//         },
+//         name: 'AntDesignDemos',
+//         path: '/demos/ant-design',
+//         component: () => import('#/views/demos/antd/index.vue'),
+//       },
+//     ],
+//   },
+// ];
+//
+// export default routes;

+ 8 - 2
apps/web-antd/src/views/dashboard/analytics/index.vue

@@ -93,8 +93,14 @@ const getData = async function () {
 	let res = await getOverviewDashboard();
 	overviewItems.forEach(item => {
 		let key = item.key;
-		item['value'] = res?.today[key] || 0;
-		item['totalValue'] = res?.yesterday[key] || 0;
+		if(!res.today) {
+			res.today = {};
+		}
+		if(!res.yesterday) {
+			res.yesterday = {};
+		}
+		item['value'] = res.today[key] || 0;
+		item['totalValue'] = res.yesterday[key] || 0;
 	})
 }
 getData();