diff --git a/src/permission.js b/src/permission.js index 7a38708d1..be1e8f186 100644 --- a/src/permission.js +++ b/src/permission.js @@ -14,7 +14,7 @@ function hasPermission(roles, permissionRoles) { return roles.some(role => permissionRoles.indexOf(role) >= 0); } -const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login', '/gzb/login', '/designgzb/login', '/gzzbxy/relay', '/XiAnSubway/login', '/designXiAnSubway/login']; // 不重定向白名单 +const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login', '/gzb/login', '/designgzb/login', '/gzzbxy/relay', '/xadt/login', '/designxadt/login']; // 不重定向白名单 const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/]; @@ -37,14 +37,14 @@ const loginDesignPageMenu = { designxty: loginDesignXtyPage, designgzb: loginDesignGzbPage, designhyd: loginDesignPage, - designXiAnSubway: loginDesignXasPage + designxadt: loginDesignXasPage }; const loginPageMenu = { login: loginPage, xty: loginXtyPage, gzb: loginGzbPage, hyd: loginPage, - XiAnSubway: loginXasPage + xadt: loginXasPage }; // 获取路径数据 function getRouteInfo(to) { @@ -52,11 +52,10 @@ function getRouteInfo(to) { let clientId = ''; const toRoutePath = to.redirectedFrom || to.path; const current_session = getSessionStorage('project'); - console.log(toRoutePath, '==================', /^\/designXiAnSubway/.test(toRoutePath)); if (/^\/designxty/.test(toRoutePath)) { loginPath = loginDesignXtyPage; clientId = LoginParams.Design.clientId; - } else if (/^\/designXiAnSubway/.test(toRoutePath)) { + } else if (/^\/designxadt/.test(toRoutePath)) { loginPath = loginDesignXasPage; clientId = LoginParams.Design.clientId; } else if (/^\/designgzb/.test(toRoutePath)) { @@ -74,7 +73,7 @@ function getRouteInfo(to) { } else if ( /^\/gzb/.test(toRoutePath)) { loginPath = loginGzbPage; clientId = null; - } else if ( /^\/XiAnSubway/.test(toRoutePath)) { + } else if ( /^\/xadt/.test(toRoutePath)) { loginPath = loginXasPage; clientId = null; } else { diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index e3723acb1..8912e3a6a 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -3,7 +3,7 @@ import Favicon from '@/assets/icon/favicon.png'; import FaviconXty from '@/assets/icon/favicon_xty.png'; import FaviconGzb from '@/assets/icon/favicon_gzb.png'; import FaviconHyd from '@/assets/icon/favicon_hyd.png'; -import FaviconXas from '@/assets/icon/favicon_xas.png'; +import FaviconXadt from '@/assets/icon/favicon_xas.png'; export const loginInfo = { xty: { @@ -38,13 +38,13 @@ export const loginInfo = { title: '城市轨道交通设计平台', loginPath: '/design/login' }, - XiAnSubway: { + xadt: { title: '西安地铁城市轨道交通实训平台', - loginPath: '/XiAnSubway/login' + loginPath: '/xadt/login' }, - designXiAnSubway: { + designxadt: { title: '西安地铁城市轨道交通设计平台', - loginPath: '/designXiAnSubway/login' + loginPath: '/designxadt/login' } }; @@ -57,8 +57,8 @@ export const ProjectIcon = { designgzb:FaviconGzb, hyd: FaviconHyd, designhyd: FaviconHyd, - XiAnSubway: FaviconXas, - designXiAnSubway: FaviconXas + xadt: FaviconXadt, + designxadt: FaviconXadt }; export const ProjectCode = { @@ -70,7 +70,7 @@ export const ProjectCode = { }; export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['hyd', 'designhyd']; // 案例展示隐藏的项目 -export const GenerateRouteProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'XiAnSubway', 'designXiAnSubway'];// 需要在公共路由中生成登录页面的项目 +export const GenerateRouteProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt'];// 需要在公共路由中生成登录页面的项目 export const goOtherPlatformMenu = { login: '/design/login', design: '/login', @@ -80,6 +80,6 @@ export const goOtherPlatformMenu = { designgzb: '/gzb/login', hyd: '/design/login', designhyd: '/login', - XiAnSubway: '/designXiAnSubway/login', - designXiAnSubway: '/XiAnSubway/login' + xadt: '/designxadt/login', + designxadt: '/xadt/login' }; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index c9acee9f6..73e8c2cbc 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -167,7 +167,7 @@ export default { }, isProject() { const projectName = this.$route.path.split('/')[1]; - return projectName.endsWith('xty') || projectName.endsWith('gzb') || projectName.endsWith('hyd') || projectName.endsWith('XiAnSubway'); + return projectName.endsWith('xty') || projectName.endsWith('gzb') || projectName.endsWith('hyd') || projectName.endsWith('xadt'); }, logoImg() { const projectName = this.$route.path.split('/')[1];