diff --git a/.env.production-nw b/.env.production-nw index 807f710..952a460 100644 --- a/.env.production-nw +++ b/.env.production-nw @@ -12,3 +12,7 @@ VUE_APP_BAIDU_MAP_AK = 'cClgLBaLgGUdQDilX9dGvieL' # 若依管理系统/生产环境 VUE_APP_BASE_API = '/sgzbgl-api' +# VUE_APP_BASE_API = '/gl' + + + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 28de3b0..420bb02 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -125,7 +125,7 @@ export default { location.href = process.env.VUE_APP_ENV === 'production-nw' - ? '/sgzbgl/login' + ? '/gl/login' : '/login' }) }) diff --git a/src/permission.js b/src/permission.js index c1f720b..ee46a0f 100644 --- a/src/permission.js +++ b/src/permission.js @@ -49,7 +49,7 @@ router.beforeEach((to, from, next) => { next({ path: process.env.VUE_APP_ENV === 'production-nw' - ? '/sgzbgl/login' + ? '/gl/login' : '/login', }) }) diff --git a/src/router/index.js b/src/router/index.js index deba38d..1ef297f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -29,185 +29,191 @@ import Layout from '@/layout' */ import Login from '@/views/login.vue' import nwLogin from '@/views/nw-login.vue' -const comLogin = process.env.VUE_APP_ENV === 'production-nw' || process.env.VUE_APP_ENV === 'development-nw' ? nwLogin : Login +const comLogin = + process.env.VUE_APP_ENV === 'production-nw' || + process.env.VUE_APP_ENV === 'development-nw' + ? nwLogin + : Login // 公共路由 export const constantRoutes = [ - { - path: '/redirect', - component: Layout, - hidden: true, - children: [ - { - path: '/redirect/:path(.*)', - component: () => import('@/views/redirect') - } - ] - }, - { - path: '/login', - component: comLogin, - hidden: true - }, - { - path: '/register', - component: () => import('@/views/register'), - hidden: true - }, - { - path: '/404', - component: () => import('@/views/error/404'), - hidden: true - }, - { - path: '/401', - component: () => import('@/views/error/401'), - hidden: true - }, - { - path: '', - component: Layout, - redirect: 'index', - children: [ - { - path: 'index', - component: () => import('@/views/index'), - name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true } - } - ] - }, - { - path: '/dashboard', - component: Layout, - redirect: 'dashboard', - children: [ - { - path: 'dashboard', - component: () => import('@/views/dashboard'), - name: 'Dashboard', - meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false } - } - ] - }, - { - path: '/user', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [ - { - path: 'profile', - component: () => import('@/views/system/user/profile/index'), - name: 'Profile', - meta: { title: '个人中心', icon: 'user' } - } - ] - }, - { - path: '/qrCode/qrCodePage', - component: () => import('@/views/qrCode/qrCode'), - hidden: true - }, - { - path: '/resetPassword', - component: () => import('@/views/resetPassword'), - hidden: true - } + { + path: '/redirect', + component: Layout, + hidden: true, + children: [ + { + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect'), + }, + ], + }, + { + path: '/login', + component: comLogin, + hidden: true, + }, + { + path: '/register', + component: () => import('@/views/register'), + hidden: true, + }, + { + path: '/404', + component: () => import('@/views/error/404'), + hidden: true, + }, + { + path: '/401', + component: () => import('@/views/error/401'), + hidden: true, + }, + { + path: '', + component: Layout, + redirect: 'index', + children: [ + { + path: 'index', + component: () => import('@/views/index'), + name: 'Index', + meta: { title: '首页', icon: 'dashboard', affix: true }, + }, + ], + }, + { + path: '/dashboard', + component: Layout, + redirect: 'dashboard', + children: [ + { + path: 'dashboard', + component: () => import('@/views/dashboard'), + name: 'Dashboard', + meta: { + title: '数据大屏', + icon: 'dashboard', + breadcrumb: false, + }, + }, + ], + }, + { + path: '/user', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'profile', + component: () => import('@/views/system/user/profile/index'), + name: 'Profile', + meta: { title: '个人中心', icon: 'user' }, + }, + ], + }, + { + path: '/qrCode/qrCodePage', + component: () => import('@/views/qrCode/qrCode'), + hidden: true, + }, + { + path: '/resetPassword', + component: () => import('@/views/resetPassword'), + hidden: true, + }, ] // 动态路由,基于用户权限动态去加载 export const dynamicRoutes = [ - { - path: '/system/user-auth', - component: Layout, - hidden: true, - permissions: ['system:user:edit'], - children: [ - { - path: 'role/:userId(\\d+)', - component: () => import('@/views/system/user/authRole'), - name: 'AuthRole', - meta: { title: '分配角色', activeMenu: '/system/user' } - } - ] - }, - { - path: '/system/role-auth', - component: Layout, - hidden: true, - permissions: ['system:role:edit'], - children: [ - { - path: 'user/:roleId(\\d+)', - component: () => import('@/views/system/role/authUser'), - name: 'AuthUser', - meta: { title: '分配用户', activeMenu: '/system/role' } - } - ] - }, - { - path: '/system/dict-data', - component: Layout, - hidden: true, - permissions: ['system:dict:list'], - children: [ - { - path: 'index/:dictId(\\d+)', - component: () => import('@/views/system/dict/data'), - name: 'Data', - meta: { title: '字典数据', activeMenu: '/system/dict' } - } - ] - }, - { - path: '/monitor/job-log', - component: Layout, - hidden: true, - permissions: ['monitor:job:list'], - children: [ - { - path: 'index/:jobId(\\d+)', - component: () => import('@/views/monitor/job/log'), - name: 'JobLog', - meta: { title: '调度日志', activeMenu: '/monitor/job' } - } - ] - }, - { - path: '/tool/gen-edit', - component: Layout, - hidden: true, - permissions: ['tool:gen:edit'], - children: [ - { - path: 'index/:tableId(\\d+)', - component: () => import('@/views/tool/gen/editTable'), - name: 'GenEdit', - meta: { title: '修改生成配置', activeMenu: '/tool/gen' } - } - ] - } + { + path: '/system/user-auth', + component: Layout, + hidden: true, + permissions: ['system:user:edit'], + children: [ + { + path: 'role/:userId(\\d+)', + component: () => import('@/views/system/user/authRole'), + name: 'AuthRole', + meta: { title: '分配角色', activeMenu: '/system/user' }, + }, + ], + }, + { + path: '/system/role-auth', + component: Layout, + hidden: true, + permissions: ['system:role:edit'], + children: [ + { + path: 'user/:roleId(\\d+)', + component: () => import('@/views/system/role/authUser'), + name: 'AuthUser', + meta: { title: '分配用户', activeMenu: '/system/role' }, + }, + ], + }, + { + path: '/system/dict-data', + component: Layout, + hidden: true, + permissions: ['system:dict:list'], + children: [ + { + path: 'index/:dictId(\\d+)', + component: () => import('@/views/system/dict/data'), + name: 'Data', + meta: { title: '字典数据', activeMenu: '/system/dict' }, + }, + ], + }, + { + path: '/monitor/job-log', + component: Layout, + hidden: true, + permissions: ['monitor:job:list'], + children: [ + { + path: 'index/:jobId(\\d+)', + component: () => import('@/views/monitor/job/log'), + name: 'JobLog', + meta: { title: '调度日志', activeMenu: '/monitor/job' }, + }, + ], + }, + { + path: '/tool/gen-edit', + component: Layout, + hidden: true, + permissions: ['tool:gen:edit'], + children: [ + { + path: 'index/:tableId(\\d+)', + component: () => import('@/views/tool/gen/editTable'), + name: 'GenEdit', + meta: { title: '修改生成配置', activeMenu: '/tool/gen' }, + }, + ], + }, ] // 防止连续点击多次路由报错 -let routerPush = Router.prototype.push; -let routerReplace = Router.prototype.replace; +let routerPush = Router.prototype.push +let routerReplace = Router.prototype.replace // push Router.prototype.push = function push(location) { - return routerPush.call(this, location).catch(err => err) + return routerPush.call(this, location).catch((err) => err) } // replace Router.prototype.replace = function push(location) { - return routerReplace.call(this, location).catch(err => err) + return routerReplace.call(this, location).catch((err) => err) } export default new Router({ - // base:'/gl/', - mode: 'history', // 去掉url中的# - scrollBehavior: () => ({ y: 0 }), - routes: constantRoutes, - base: process.env.VUE_APP_ENV === 'production-nw' ? '/sgzbgl' : '' - + // base:'/gl/', + mode: 'history', // 去掉url中的# + scrollBehavior: () => ({ y: 0 }), + routes: constantRoutes, + base: process.env.VUE_APP_ENV === 'production-nw' ? '/gl' : '', }) - diff --git a/src/utils/request.js b/src/utils/request.js index 8453555..93e86d6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -125,7 +125,7 @@ service.interceptors.response.use( location.href = process.env.VUE_APP_ENV === 'production-nw' - ? '/sgzbgl/login' + ? '/gl/login' : '/login' }) }) diff --git a/vue.config.js b/vue.config.js index f2d4ad8..43f5176 100644 --- a/vue.config.js +++ b/vue.config.js @@ -19,7 +19,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。 - publicPath: process.env.VUE_APP_ENV === 'production-nw' ? '/sgzbgl' : '/', ///gl/ + publicPath: process.env.VUE_APP_ENV === 'production-nw' ? '/gl' : '/', ///gl/ // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist) outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)