diff --git a/.env.dev b/.env.dev index 53f0527b..0181e049 100644 --- a/.env.dev +++ b/.env.dev @@ -1,8 +1,8 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-11-15 17:25:58 - # @LastEditors: DY + # @LastEditTime: 2023-11-16 08:52:02 + # @LastEditors: zhp # @Description: ### # 开发环境配置 @@ -18,7 +18,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' -# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.4.159:48080' # VUE_APP_BASE_API = 'http://192.168.1.56:48080' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' # 路由懒加载 diff --git a/src/permission.js b/src/permission.js index 7125eeaa..03b66576 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) // 增加三方登陆 update by 芋艿 -const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee'] +const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee', '/AGVBoard', '/coldBoard', '/processingBoard'] router.beforeEach((to, from, next) => { NProgress.start() @@ -19,7 +19,12 @@ router.beforeEach((to, from, next) => { if (to.path === '/login') { next({ path: '/' }) NProgress.done() - } else { + } + // else if (to.path === '/AGVBoard') { + // next({ path: '/AGVBoard' }) + // NProgress.done() + // } + else { if (store.getters.roles.length === 0) { isRelogin.show = true // 获取字典数据 add by 芋艿 diff --git a/src/router/index.js b/src/router/index.js index b7ea83f8..40189532 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -91,7 +91,7 @@ export const constantRoutes = [ { path: '/AGVBoard', name: 'AGVBoard', - component: Layout, + // component: Layout, // route level code-splitting // this generates a separate chunk (about.[hash].js) for this route // which is lazy-loaded when the route is visited. diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue index 5dfda096..ee4d8b81 100644 --- a/src/views/OperationalOverview/AGVBoard.vue +++ b/src/views/OperationalOverview/AGVBoard.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-07-19 15:18:30 * @LastEditors: zhp - * @LastEditTime: 2023-11-14 10:46:52 + * @LastEditTime: 2023-11-15 16:04:06 * @Description: -->