From 34f0dda2670ad87a63a3fc7c383adb2e46a7213f Mon Sep 17 00:00:00 2001 From: chansee97 Date: Wed, 27 Aug 2025 00:24:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=95=B4=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- locales/en_US.json | 4 +- locales/zh_CN.json | 4 +- src/AppMain.vue | 4 + src/{service => }/api/demo.ts | 2 +- src/api/index.ts | 7 + src/{service => }/api/login.ts | 2 +- src/{service => }/api/system/dict.ts | 2 +- src/{service => }/api/system/menu.ts | 2 +- src/{service => }/api/system/role.ts | 2 +- src/{service => }/api/system/user.ts | 2 +- src/{service => }/api/test.ts | 2 +- src/modules/navie-pro.ts | 14 + src/router/routes.static.ts | 111 +++----- src/service/index.ts | 7 - src/store/auth.ts | 6 +- src/store/dict.ts | 2 +- src/store/router/helper.ts | 6 +- src/store/router/index.ts | 2 +- src/typings/entities/menu.d.ts | 2 +- src/typings/route.d.ts | 2 +- src/{service/http => utils/alova}/alova.ts | 0 src/{service/http => utils/alova}/config.ts | 0 src/{service/http => utils/alova}/handle.ts | 2 +- src/{service/http => utils/alova}/index.ts | 0 src/{service/http => utils/alova}/type.d.ts | 0 .../home}/components/chart.vue | 0 .../workbench => build-in/home}/index.vue | 0 .../build-in/login/components/Login/index.vue | 2 +- .../dashboard/monitor/components/chart.vue | 130 --------- .../dashboard/monitor/components/chart2.vue | 107 -------- .../dashboard/monitor/components/chart3.vue | 60 ---- src/views/dashboard/monitor/index.vue | 258 ------------------ src/views/demo/dict/index.vue | 2 +- src/views/demo/fetch/components/Delete.vue | 2 +- src/views/demo/fetch/components/DownLoad.vue | 2 +- .../fetch/components/DownLoadWithProgress.vue | 2 +- .../demo/fetch/components/FailedRequest.vue | 2 +- src/views/setting/account/index.vue | 164 ----------- .../setting/{dictionary => dict}/columns.tsx | 0 .../components/DictModal.vue | 2 +- .../setting/{dictionary => dict}/index.vue | 2 +- src/views/setting/menu/columns.tsx | 2 +- .../setting/menu/components/MenuModal.vue | 17 +- src/views/setting/menu/index.vue | 24 +- .../setting/{account => user}/columns.tsx | 56 ++-- .../components/TableModal.vue | 2 +- src/views/setting/user/index.vue | 126 +++++++++ 48 files changed, 282 insertions(+), 869 deletions(-) rename src/{service => }/api/demo.ts (95%) create mode 100644 src/api/index.ts rename src/{service => }/api/login.ts (96%) rename src/{service => }/api/system/dict.ts (98%) rename src/{service => }/api/system/menu.ts (95%) rename src/{service => }/api/system/role.ts (95%) rename src/{service => }/api/system/user.ts (96%) rename src/{service => }/api/test.ts (97%) create mode 100644 src/modules/navie-pro.ts delete mode 100644 src/service/index.ts rename src/{service/http => utils/alova}/alova.ts (100%) rename src/{service/http => utils/alova}/config.ts (100%) rename src/{service/http => utils/alova}/handle.ts (93%) rename src/{service/http => utils/alova}/index.ts (100%) rename src/{service/http => utils/alova}/type.d.ts (100%) rename src/views/{dashboard/workbench => build-in/home}/components/chart.vue (100%) rename src/views/{dashboard/workbench => build-in/home}/index.vue (100%) delete mode 100644 src/views/dashboard/monitor/components/chart.vue delete mode 100644 src/views/dashboard/monitor/components/chart2.vue delete mode 100644 src/views/dashboard/monitor/components/chart3.vue delete mode 100644 src/views/dashboard/monitor/index.vue delete mode 100644 src/views/setting/account/index.vue rename src/views/setting/{dictionary => dict}/columns.tsx (100%) rename src/views/setting/{dictionary => dict}/components/DictModal.vue (99%) rename src/views/setting/{dictionary => dict}/index.vue (99%) rename src/views/setting/{account => user}/columns.tsx (70%) rename src/views/setting/{account => user}/components/TableModal.vue (98%) create mode 100644 src/views/setting/user/index.vue diff --git a/.env b/.env index e372f7c..8c37d17 100644 --- a/.env +++ b/.env @@ -11,7 +11,7 @@ VITE_ROUTE_MODE = web VITE_ROUTE_LOAD_MODE = static # 设置登陆后跳转地址 -VITE_HOME_PATH = /dashboard/workbench +VITE_HOME_PATH = /home # 本地存储前缀 VITE_STORAGE_PREFIX = diff --git a/locales/en_US.json b/locales/en_US.json index e0d3393..f348813 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -90,20 +90,18 @@ }, "route": { "appRoot": "Home", + "home": "Overview", "cardList": "Card list", "draggableList": "Draggable list", "commonList": "Common list", - "dashboard": "Dashboard", "demo": "Function example", "fetch": "Request example", "list": "List", - "monitor": "Monitoring", "multi": "Multi-level menu", "multi2": "Multi-level menu subpage", "multi2Detail": "Details page of multi-level menu", "multi3": "multi-level menu", "multi4": "Multi-level menu 3-1", - "workbench": "Workbench", "QRCode": "QR code", "about": "About", "clipboard": "Clipboard", diff --git a/locales/zh_CN.json b/locales/zh_CN.json index 547bc86..d627301 100644 --- a/locales/zh_CN.json +++ b/locales/zh_CN.json @@ -119,9 +119,7 @@ }, "route": { "appRoot": "首页", - "dashboard": "仪表盘", - "workbench": "工作台", - "monitor": "监控页", + "home": "概览", "multi": "多级菜单演示", "multi2": "多级菜单子页", "multi2Detail": "多级菜单的详情页", diff --git a/src/AppMain.vue b/src/AppMain.vue index 34ec3c0..66fe6e3 100644 --- a/src/AppMain.vue +++ b/src/AppMain.vue @@ -40,6 +40,10 @@ const naiveLocale = computed(() => { }) const propOverrides = { + ProSearchForm: { + labelPlacement: 'left', + cols: 4, + }, ProModalForm: { labelWidth: 120, labelPlacement: 'left', diff --git a/src/service/api/demo.ts b/src/api/demo.ts similarity index 95% rename from src/service/api/demo.ts rename to src/api/demo.ts index 06942ec..3aded9a 100644 --- a/src/service/api/demo.ts +++ b/src/api/demo.ts @@ -1,4 +1,4 @@ -import { request } from '../http' +import { request } from '../utils/alova' /* 示例列表接口 */ export function fetchUserList() { diff --git a/src/api/index.ts b/src/api/index.ts new file mode 100644 index 0000000..46e28d7 --- /dev/null +++ b/src/api/index.ts @@ -0,0 +1,7 @@ +export * from './login' +export * from './demo' +export * from './test' +export * from './system/user' +export * from './system/menu' +export * from './system/role' +export * from './system/dict' diff --git a/src/service/api/login.ts b/src/api/login.ts similarity index 96% rename from src/service/api/login.ts rename to src/api/login.ts index 3689489..c905886 100644 --- a/src/service/api/login.ts +++ b/src/api/login.ts @@ -1,4 +1,4 @@ -import { request } from '../http' +import { request } from '../utils/alova' interface LoginParams { userName: string diff --git a/src/service/api/system/dict.ts b/src/api/system/dict.ts similarity index 98% rename from src/service/api/system/dict.ts rename to src/api/system/dict.ts index 9791a52..eae96ac 100644 --- a/src/service/api/system/dict.ts +++ b/src/api/system/dict.ts @@ -1,4 +1,4 @@ -import { request } from '../../http' +import { request } from '../../utils/alova' // 字典类型查询参数接口 interface DictTypeQueryParams { diff --git a/src/service/api/system/menu.ts b/src/api/system/menu.ts similarity index 95% rename from src/service/api/system/menu.ts rename to src/api/system/menu.ts index 321e59e..1500547 100644 --- a/src/service/api/system/menu.ts +++ b/src/api/system/menu.ts @@ -1,4 +1,4 @@ -import { request } from '../../http' +import { request } from '../../utils/alova' /** * 创建菜单 diff --git a/src/service/api/system/role.ts b/src/api/system/role.ts similarity index 95% rename from src/service/api/system/role.ts rename to src/api/system/role.ts index 444a699..abaa004 100644 --- a/src/service/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,4 +1,4 @@ -import { request } from '../../http' +import { request } from '../../utils/alova' // 角色查询参数接口 interface RoleQueryParams { diff --git a/src/service/api/system/user.ts b/src/api/system/user.ts similarity index 96% rename from src/service/api/system/user.ts rename to src/api/system/user.ts index 68c9859..f06abac 100644 --- a/src/service/api/system/user.ts +++ b/src/api/system/user.ts @@ -1,4 +1,4 @@ -import { request } from '../../http' +import { request } from '../../utils/alova' // 用户查询参数接口 interface UserQueryParams { diff --git a/src/service/api/test.ts b/src/api/test.ts similarity index 97% rename from src/service/api/test.ts rename to src/api/test.ts index 1077687..d302d9c 100644 --- a/src/service/api/test.ts +++ b/src/api/test.ts @@ -1,4 +1,4 @@ -import { blankInstance, request } from '../http' +import { blankInstance, request } from '@/utils/alova' /* get方法测试 */ export function fetchGet(params?: any) { diff --git a/src/modules/navie-pro.ts b/src/modules/navie-pro.ts new file mode 100644 index 0000000..ac480c7 --- /dev/null +++ b/src/modules/navie-pro.ts @@ -0,0 +1,14 @@ +import { + create, + ProInput, + ProSelect, +} from 'pro-naive-ui' +import type { App } from 'vue' + +const proNaive = create({ + components: [ProInput, ProSelect], +}) + +export function install(app: App) { + app.use(proNaive) +} diff --git a/src/router/routes.static.ts b/src/router/routes.static.ts index e0639d1..f444e53 100644 --- a/src/router/routes.static.ts +++ b/src/router/routes.static.ts @@ -1,37 +1,14 @@ export const staticRoutes: AppRoute.RowRoute[] = [ { - name: 'dashboard', - path: '/dashboard', - title: '仪表盘', - requiresAuth: true, + name: 'home', + path: '/home', + title: '概览', icon: 'icon-park-outline:analysis', - menuType: 'dir', - componentPath: null, - id: 1, - parentId: null, - }, - { - name: 'workbench', - path: '/dashboard/workbench', - title: '工作台', - requiresAuth: true, - icon: 'icon-park-outline:alarm', pinTab: true, menuType: 'page', - componentPath: '/dashboard/workbench/index.vue', - id: 101, - parentId: 1, - }, - { - name: 'monitor', - path: '/dashboard/monitor', - title: '监控页', - requiresAuth: true, - icon: 'icon-park-outline:anchor', - menuType: 'page', - componentPath: '/dashboard/monitor/index.vue', - id: 102, - parentId: 1, + component: '/build-in/home/index.vue', + id: 1, + parentId: 0, }, { name: 'multi', @@ -40,7 +17,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:list', menuType: 'dir', - componentPath: null, + component: null, id: 2, parentId: null, }, @@ -51,7 +28,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:list', menuType: 'page', - componentPath: '/demo/multi/multi-2/index.vue', + component: '/demo/multi/multi-2/index.vue', id: 201, parentId: 2, }, @@ -64,7 +41,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ hide: true, activeMenu: '/multi/multi-2', menuType: 'page', - componentPath: '/demo/multi/multi-2/detail/index.vue', + component: '/demo/multi/multi-2/detail/index.vue', id: 20101, parentId: 2, }, @@ -75,7 +52,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:list', menuType: 'dir', - componentPath: null, + component: null, id: 202, parentId: 2, }, @@ -85,7 +62,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '多级菜单3-1', requiresAuth: true, icon: 'icon-park-outline:list', - componentPath: '/demo/multi/multi-3/multi-4/index.vue', + component: '/demo/multi/multi-3/multi-4/index.vue', id: 20201, parentId: 202, }, @@ -96,7 +73,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:list-two', menuType: 'dir', - componentPath: null, + component: null, id: 3, parentId: null, }, @@ -106,7 +83,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '常用列表', requiresAuth: true, icon: 'icon-park-outline:list-view', - componentPath: '/demo/list/common-list/index.vue', + component: '/demo/list/common-list/index.vue', id: 301, parentId: 3, }, @@ -116,7 +93,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '卡片列表', requiresAuth: true, icon: 'icon-park-outline:view-grid-list', - componentPath: '/demo/list/card-list/index.vue', + component: '/demo/list/card-list/index.vue', id: 302, parentId: 3, }, @@ -126,7 +103,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '拖拽列表', requiresAuth: true, icon: 'icon-park-outline:menu-fold', - componentPath: '/demo/list/draggable-list/index.vue', + component: '/demo/list/draggable-list/index.vue', id: 303, parentId: 3, }, @@ -137,7 +114,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:application-one', menuType: 'dir', - componentPath: null, + component: null, id: 4, parentId: null, }, @@ -147,7 +124,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '请求示例', requiresAuth: true, icon: 'icon-park-outline:international', - componentPath: '/demo/fetch/index.vue', + component: '/demo/fetch/index.vue', id: 401, parentId: 4, }, @@ -157,7 +134,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: 'ECharts', requiresAuth: true, icon: 'icon-park-outline:chart-proportion', - componentPath: '/demo/echarts/index.vue', + component: '/demo/echarts/index.vue', id: 402, parentId: 4, }, @@ -168,7 +145,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'carbon:map', keepAlive: true, - componentPath: '/demo/map/index.vue', + component: '/demo/map/index.vue', id: 403, parentId: 4, }, @@ -179,7 +156,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:editor', menuType: 'dir', - componentPath: null, + component: null, id: 404, parentId: 4, }, @@ -189,7 +166,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: 'MarkDown', requiresAuth: true, icon: 'ri:markdown-line', - componentPath: '/demo/editor/md/index.vue', + component: '/demo/editor/md/index.vue', id: 40401, parentId: 404, }, @@ -199,7 +176,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '富文本', requiresAuth: true, icon: 'icon-park-outline:edit-one', - componentPath: '/demo/editor/rich/index.vue', + component: '/demo/editor/rich/index.vue', id: 40402, parentId: 404, }, @@ -209,7 +186,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '剪贴板', requiresAuth: true, icon: 'icon-park-outline:clipboard', - componentPath: '/demo/clipboard/index.vue', + component: '/demo/clipboard/index.vue', id: 405, parentId: 4, }, @@ -219,7 +196,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '图标', requiresAuth: true, icon: 'local:cool', - componentPath: '/demo/icons/index.vue', + component: '/demo/icons/index.vue', id: 406, parentId: 4, }, @@ -229,7 +206,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '二维码', requiresAuth: true, icon: 'icon-park-outline:two-dimensional-code', - componentPath: '/demo/qr-code/index.vue', + component: '/demo/qr-code/index.vue', id: 407, parentId: 4, }, @@ -239,7 +216,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '省市区联动', requiresAuth: true, icon: 'icon-park-outline:add-subset', - componentPath: '/demo/cascader/index.vue', + component: '/demo/cascader/index.vue', id: 408, parentId: 4, }, @@ -249,7 +226,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '字典示例', requiresAuth: true, icon: 'icon-park-outline:book-one', - componentPath: '/demo/dict/index.vue', + component: '/demo/dict/index.vue', id: 409, parentId: 4, }, @@ -260,7 +237,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:file-doc', menuType: 'dir', - componentPath: null, + component: null, id: 5, parentId: null, }, @@ -270,7 +247,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: 'Vue', requiresAuth: true, icon: 'logos:vue', - componentPath: '/demo/documents/vue/index.vue', + component: '/demo/documents/vue/index.vue', id: 501, parentId: 5, }, @@ -280,7 +257,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: 'Vite', requiresAuth: true, icon: 'logos:vitejs', - componentPath: '/demo/documents/vite/index.vue', + component: '/demo/documents/vite/index.vue', id: 502, parentId: 5, }, @@ -291,7 +268,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'logos:vueuse', href: 'https://vueuse.org/guide/', - componentPath: 'null', + component: 'null', id: 503, parentId: 5, }, @@ -303,7 +280,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'local:logo', href: 'https://nova-admin-docs.netlify.app/', - componentPath: '2333333', + component: '2333333', id: 504, parentId: 5, }, @@ -314,7 +291,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'local:logo', href: '/public', - componentPath: 'null', + component: 'null', id: 505, parentId: 5, }, @@ -325,7 +302,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:people-safe', menuType: 'dir', - componentPath: null, + component: null, id: 6, parentId: null, }, @@ -335,7 +312,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '权限示例', requiresAuth: true, icon: 'icon-park-outline:right-user', - componentPath: '/demo/permission/permission/index.vue', + component: '/demo/permission/permission/index.vue', id: 601, parentId: 6, }, @@ -348,7 +325,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ 'super', ], icon: 'icon-park-outline:wrong-user', - componentPath: '/demo/permission/just-super/index.vue', + component: '/demo/permission/just-super/index.vue', id: 602, parentId: 6, }, @@ -359,27 +336,27 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, icon: 'icon-park-outline:setting', menuType: 'dir', - componentPath: null, + component: null, id: 7, parentId: null, }, { name: 'accountSetting', - path: '/setting/account', + path: '/setting/user', title: '用户设置', requiresAuth: true, icon: 'icon-park-outline:every-user', - componentPath: '/setting/account/index.vue', + component: '/setting/user/index.vue', id: 701, parentId: 7, }, { name: 'dictionarySetting', - path: '/setting/dictionary', + path: '/setting/dict', title: '字典设置', requiresAuth: true, icon: 'icon-park-outline:book-one', - componentPath: '/setting/dictionary/index.vue', + component: '/setting/dict/index.vue', id: 702, parentId: 7, }, @@ -389,7 +366,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '菜单设置', requiresAuth: true, icon: 'icon-park-outline:application-menu', - componentPath: '/setting/menu/index.vue', + component: '/setting/menu/index.vue', id: 703, parentId: 7, }, @@ -399,7 +376,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ title: '关于', requiresAuth: true, icon: 'icon-park-outline:info', - componentPath: '/demo/about/index.vue', + component: '/demo/about/index.vue', id: 8, parentId: null, }, @@ -410,7 +387,7 @@ export const staticRoutes: AppRoute.RowRoute[] = [ requiresAuth: true, hide: true, icon: 'carbon:user-avatar-filled-alt', - componentPath: '/build-in/user-center/index.vue', + component: '/build-in/user-center/index.vue', id: 999, parentId: null, }, diff --git a/src/service/index.ts b/src/service/index.ts deleted file mode 100644 index 2b396f1..0000000 --- a/src/service/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export * from './api/login' -export * from './api/demo' -export * from './api/test' -export * from './api/system/user' -export * from './api/system/menu' -export * from './api/system/role' -export * from './api/system/dict' diff --git a/src/store/auth.ts b/src/store/auth.ts index 906b102..795fb3b 100644 --- a/src/store/auth.ts +++ b/src/store/auth.ts @@ -1,16 +1,16 @@ import { router } from '@/router' -import { fetchLogin, fetchUserInfo } from '@/service' +import { fetchLogin, fetchUserInfo } from '@/api' import { local } from '@/utils' import { useRouteStore } from './router' import { useTabStore } from './tab' interface AuthStatus { - userInfo: Entity.User | null + userInfo: Entity.User | Record } export const useAuthStore = defineStore('auth-store', { state: (): AuthStatus => { return { - userInfo: null, + userInfo: {}, } }, getters: { diff --git a/src/store/dict.ts b/src/store/dict.ts index f2b3544..da81d0e 100644 --- a/src/store/dict.ts +++ b/src/store/dict.ts @@ -1,4 +1,4 @@ -import { fetchDictList } from '@/service' +import { fetchDictList } from '@/api' import { session } from '@/utils' export const useDictStore = defineStore('dict-store', { diff --git a/src/store/router/helper.ts b/src/store/router/helper.ts index 623425a..337a071 100644 --- a/src/store/router/helper.ts +++ b/src/store/router/helper.ts @@ -31,15 +31,14 @@ export function createRoutes(routes: AppRoute.RowRoute[]) { // Generate routes, no need to import files for those with redirect const modules = import.meta.glob('@/views/**/*.vue') resultRouter = resultRouter.map((item: AppRoute.Route) => { - if (item.componentPath && !item.redirect) - item.component = modules[`/src/views${item.componentPath}`] + if (item.component && !item.redirect) + item.component = modules[`/src/views${item.component}`] return item }) // Generate route tree resultRouter = arrayToTree(resultRouter, { parentProperty: 'parentId', - customID: 'id', }) as AppRoute.Route[] const appRootRoute: RouteRecordRaw = { @@ -104,7 +103,6 @@ export function createMenus(userRoutes: AppRoute.RowRoute[]) { // generate side menu return arrayToTree(transformAuthRoutesToMenus(visibleMenus), { parentProperty: 'parentId', - customID: 'id', }) } diff --git a/src/store/router/index.ts b/src/store/router/index.ts index 7b5bc31..7ba8702 100644 --- a/src/store/router/index.ts +++ b/src/store/router/index.ts @@ -1,7 +1,7 @@ import type { MenuOption } from 'naive-ui' import { router } from '@/router' import { staticRoutes } from '@/router/routes.static' -import { fetchUserRoutes } from '@/service' +import { fetchUserRoutes } from '@/api' import { $t } from '@/utils' import { createMenus, createRoutes, generateCacheRoutes } from './helper' diff --git a/src/typings/entities/menu.d.ts b/src/typings/entities/menu.d.ts index 919dbeb..5851029 100644 --- a/src/typings/entities/menu.d.ts +++ b/src/typings/entities/menu.d.ts @@ -5,7 +5,7 @@ namespace Entity { type MenuType = 'directory' | 'page' | 'permission' interface Menu { - menuId: number + id: number /** * 组件路径 */ diff --git a/src/typings/route.d.ts b/src/typings/route.d.ts index 389d9f7..1666c02 100644 --- a/src/typings/route.d.ts +++ b/src/typings/route.d.ts @@ -39,7 +39,7 @@ declare namespace AppRoute { /** 路由重定向 */ redirect?: string /* 页面组件地址 */ - componentPath?: string | null + component?: string | null /* 路由id */ id: number /* 父级路由id，顶级页面为null */ diff --git a/src/service/http/alova.ts b/src/utils/alova/alova.ts similarity index 100% rename from src/service/http/alova.ts rename to src/utils/alova/alova.ts diff --git a/src/service/http/config.ts b/src/utils/alova/config.ts similarity index 100% rename from src/service/http/config.ts rename to src/utils/alova/config.ts diff --git a/src/service/http/handle.ts b/src/utils/alova/handle.ts similarity index 93% rename from src/service/http/handle.ts rename to src/utils/alova/handle.ts index b31e2e8..ede6b53 100644 --- a/src/service/http/handle.ts +++ b/src/utils/alova/handle.ts @@ -1,4 +1,4 @@ -import { fetchRefreshToken } from '@/service' +import { fetchRefreshToken } from '@/api' import { useAuthStore } from '@/store' import { local } from '@/utils' diff --git a/src/service/http/index.ts b/src/utils/alova/index.ts similarity index 100% rename from src/service/http/index.ts rename to src/utils/alova/index.ts diff --git a/src/service/http/type.d.ts b/src/utils/alova/type.d.ts similarity index 100% rename from src/service/http/type.d.ts rename to src/utils/alova/type.d.ts diff --git a/src/views/dashboard/workbench/components/chart.vue b/src/views/build-in/home/components/chart.vue similarity index 100% rename from src/views/dashboard/workbench/components/chart.vue rename to src/views/build-in/home/components/chart.vue diff --git a/src/views/dashboard/workbench/index.vue b/src/views/build-in/home/index.vue similarity index 100% rename from src/views/dashboard/workbench/index.vue rename to src/views/build-in/home/index.vue diff --git a/src/views/build-in/login/components/Login/index.vue b/src/views/build-in/login/components/Login/index.vue index 3f0e9d8..f614145 100644 --- a/src/views/build-in/login/components/Login/index.vue +++ b/src/views/build-in/login/components/Login/index.vue @@ -1,7 +1,7 @@ - - - - diff --git a/src/views/dashboard/monitor/components/chart2.vue b/src/views/dashboard/monitor/components/chart2.vue deleted file mode 100644 index c23e5e7..0000000 --- a/src/views/dashboard/monitor/components/chart2.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - - diff --git a/src/views/dashboard/monitor/components/chart3.vue b/src/views/dashboard/monitor/components/chart3.vue deleted file mode 100644 index 8595499..0000000 --- a/src/views/dashboard/monitor/components/chart3.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/src/views/dashboard/monitor/index.vue b/src/views/dashboard/monitor/index.vue deleted file mode 100644 index bdd8073..0000000 --- a/src/views/dashboard/monitor/index.vue +++ /dev/null @@ -1,258 +0,0 @@ - - - diff --git a/src/views/demo/dict/index.vue b/src/views/demo/dict/index.vue index e813597..1a40826 100644 --- a/src/views/demo/dict/index.vue +++ b/src/views/demo/dict/index.vue @@ -1,5 +1,5 @@ - - diff --git a/src/views/setting/dictionary/columns.tsx b/src/views/setting/dict/columns.tsx similarity index 100% rename from src/views/setting/dictionary/columns.tsx rename to src/views/setting/dict/columns.tsx diff --git a/src/views/setting/dictionary/components/DictModal.vue b/src/views/setting/dict/components/DictModal.vue similarity index 99% rename from src/views/setting/dictionary/components/DictModal.vue rename to src/views/setting/dict/components/DictModal.vue index 71ee529..c3cb3a1 100644 --- a/src/views/setting/dictionary/components/DictModal.vue +++ b/src/views/setting/dict/components/DictModal.vue @@ -1,7 +1,7 @@ + +