西安地图项目路径调整

This commit is contained in:
fan 2020-04-16 16:14:28 +08:00
parent 3871ec173c
commit 6ab7bda6b6
3 changed files with 16 additions and 17 deletions

View File

@ -14,7 +14,7 @@ function hasPermission(roles, permissionRoles) {
return roles.some(role => permissionRoles.indexOf(role) >= 0); 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/]; 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, designxty: loginDesignXtyPage,
designgzb: loginDesignGzbPage, designgzb: loginDesignGzbPage,
designhyd: loginDesignPage, designhyd: loginDesignPage,
designXiAnSubway: loginDesignXasPage designxadt: loginDesignXasPage
}; };
const loginPageMenu = { const loginPageMenu = {
login: loginPage, login: loginPage,
xty: loginXtyPage, xty: loginXtyPage,
gzb: loginGzbPage, gzb: loginGzbPage,
hyd: loginPage, hyd: loginPage,
XiAnSubway: loginXasPage xadt: loginXasPage
}; };
// 获取路径数据 // 获取路径数据
function getRouteInfo(to) { function getRouteInfo(to) {
@ -52,11 +52,10 @@ function getRouteInfo(to) {
let clientId = ''; let clientId = '';
const toRoutePath = to.redirectedFrom || to.path; const toRoutePath = to.redirectedFrom || to.path;
const current_session = getSessionStorage('project'); const current_session = getSessionStorage('project');
console.log(toRoutePath, '==================', /^\/designXiAnSubway/.test(toRoutePath));
if (/^\/designxty/.test(toRoutePath)) { if (/^\/designxty/.test(toRoutePath)) {
loginPath = loginDesignXtyPage; loginPath = loginDesignXtyPage;
clientId = LoginParams.Design.clientId; clientId = LoginParams.Design.clientId;
} else if (/^\/designXiAnSubway/.test(toRoutePath)) { } else if (/^\/designxadt/.test(toRoutePath)) {
loginPath = loginDesignXasPage; loginPath = loginDesignXasPage;
clientId = LoginParams.Design.clientId; clientId = LoginParams.Design.clientId;
} else if (/^\/designgzb/.test(toRoutePath)) { } else if (/^\/designgzb/.test(toRoutePath)) {
@ -74,7 +73,7 @@ function getRouteInfo(to) {
} else if ( /^\/gzb/.test(toRoutePath)) { } else if ( /^\/gzb/.test(toRoutePath)) {
loginPath = loginGzbPage; loginPath = loginGzbPage;
clientId = null; clientId = null;
} else if ( /^\/XiAnSubway/.test(toRoutePath)) { } else if ( /^\/xadt/.test(toRoutePath)) {
loginPath = loginXasPage; loginPath = loginXasPage;
clientId = null; clientId = null;
} else { } else {

View File

@ -3,7 +3,7 @@ import Favicon from '@/assets/icon/favicon.png';
import FaviconXty from '@/assets/icon/favicon_xty.png'; import FaviconXty from '@/assets/icon/favicon_xty.png';
import FaviconGzb from '@/assets/icon/favicon_gzb.png'; import FaviconGzb from '@/assets/icon/favicon_gzb.png';
import FaviconHyd from '@/assets/icon/favicon_hyd.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 = { export const loginInfo = {
xty: { xty: {
@ -38,13 +38,13 @@ export const loginInfo = {
title: '城市轨道交通设计平台', title: '城市轨道交通设计平台',
loginPath: '/design/login' loginPath: '/design/login'
}, },
XiAnSubway: { xadt: {
title: '西安地铁城市轨道交通实训平台', title: '西安地铁城市轨道交通实训平台',
loginPath: '/XiAnSubway/login' loginPath: '/xadt/login'
}, },
designXiAnSubway: { designxadt: {
title: '西安地铁城市轨道交通设计平台', title: '西安地铁城市轨道交通设计平台',
loginPath: '/designXiAnSubway/login' loginPath: '/designxadt/login'
} }
}; };
@ -57,8 +57,8 @@ export const ProjectIcon = {
designgzb:FaviconGzb, designgzb:FaviconGzb,
hyd: FaviconHyd, hyd: FaviconHyd,
designhyd: FaviconHyd, designhyd: FaviconHyd,
XiAnSubway: FaviconXas, xadt: FaviconXadt,
designXiAnSubway: FaviconXas designxadt: FaviconXadt
}; };
export const ProjectCode = { export const ProjectCode = {
@ -70,7 +70,7 @@ export const ProjectCode = {
}; };
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb']; // 实训设计平台通过项目code获取地图列表的项目 export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['hyd', 'designhyd']; // 案例展示隐藏的项目 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 = { export const goOtherPlatformMenu = {
login: '/design/login', login: '/design/login',
design: '/login', design: '/login',
@ -80,6 +80,6 @@ export const goOtherPlatformMenu = {
designgzb: '/gzb/login', designgzb: '/gzb/login',
hyd: '/design/login', hyd: '/design/login',
designhyd: '/login', designhyd: '/login',
XiAnSubway: '/designXiAnSubway/login', xadt: '/designxadt/login',
designXiAnSubway: '/XiAnSubway/login' designxadt: '/xadt/login'
}; };

View File

@ -167,7 +167,7 @@ export default {
}, },
isProject() { isProject() {
const projectName = this.$route.path.split('/')[1]; 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() { logoImg() {
const projectName = this.$route.path.split('/')[1]; const projectName = this.$route.path.split('/')[1];