From c345a60997be66bc6064b890bb65943f19b97813 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 7 Jul 2020 15:42:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=99=BB=E9=99=86=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84=E8=B0=83=E6=95=B4=EF=BC=88=E5=8F=98=E6=88=90=20design?=
=?UTF-8?q?/login=3Fproject=3Dxxx=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/permission.js | 4 +-
src/router/index_HYD.js | 3 +-
src/scripts/ProjectConfig.js | 106 +++--
src/views/login/hydLogin.vue | 499 ------------------------
src/views/login/index.vue | 37 +-
src/views/system/deviceManage/index.vue | 9 +-
6 files changed, 100 insertions(+), 558 deletions(-)
delete mode 100644 src/views/login/hydLogin.vue
diff --git a/src/permission.js b/src/permission.js
index 99f6fb9ce..fc4551aba 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -51,9 +51,9 @@ function getRouteInfo(to) {
const whitePage = PermissionParam[current_session] ? PermissionParam[current_session].whitePage : '';
loginPath = whitePage || loginPage;
if (to.query.projectDevice && to.query.ibpDevice) {
- loginPath = `${loginPath}?projectDevice=${to.query.projectDevice}&ibpDevice=${to.query.ibpDevice}`;
+ loginPath = `${loginPath}&projectDevice=${to.query.projectDevice}&ibpDevice=${to.query.ibpDevice}`;
} else if (to.query.projectDevice) {
- loginPath = `${loginPath}?projectDevice=${to.query.projectDevice}`;
+ loginPath = `${loginPath}&projectDevice=${to.query.projectDevice}`;
}
if (current_session && current_session.startsWith('jsxt') || current_session && current_session.startsWith('refereeJsxt')) {
const raceId = getSessionStorage('raceId'); // 登陆时候保存 竞赛id
diff --git a/src/router/index_HYD.js b/src/router/index_HYD.js
index d8ef8743a..085a0a969 100644
--- a/src/router/index_HYD.js
+++ b/src/router/index_HYD.js
@@ -6,7 +6,8 @@ Vue.use(VueRouter);
/* Layout */
const Layout = () => import('@/layout');
-const Login = () => import('@/views/login/hydLogin');
+// const Login = () => import('@/views/login/hydLogin');
+const Login = () => import('@/views/login/index');
const Jlmap3dedit = () => import('@/views/jlmap3d/edit/jlmap3dedit');
const Jlmap3d = () => import('@/views/jlmap3d/drive/jl3ddrive');
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index d219d0029..1d82632df 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -15,7 +15,8 @@ import { LoginParams } from '@/utils/login';
export const loginInfo = {
xty: {
title: '西安铁路职业技术学院城市轨道交通实训平台',
- loginPath: '/xty/login',
+ // loginPath: '/xty/login',
+ loginPath:'/login?pro=xty',
loginParam: 'XTY',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
@@ -36,28 +37,33 @@ export const loginInfo = {
},
designxty: {
title: '西安铁路职业技术学院城市轨道交通设计平台',
- loginPath: '/designxty/login',
+ // loginPath: '/designxty/login',
+ loginPath:'/design/login?project=xty',
loginParam: 'XTY',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
},
gzb: {
title: '贵州装备制造职业学院城市轨道交通实训平台',
- loginPath: '/gzb/login',
+ // loginPath: '/gzb/login',
+ loginPath:'/login?project=gzb',
loginParam: 'GZB',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
},
designgzb: {
title: '贵州装备制造职业学院城市轨道交通设计平台',
- loginPath: '/designgzb/login',
+ // loginPath: '/designgzb/login',
+ loginPath:'/design/login?project=gzb',
loginParam: 'GZB',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
},
hyd: {
title: '城市轨道交通综合行车模拟仿真系统V1.0',
- loginPath: '/login',
+ loginTitle: '城市轨道交通综合行车模拟仿真系统V1.0',
+ logoWidth: '140px',
+ loginPath: '/login?project=hyd',
bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273',
loginParam: 'DEFAULT',
navigationLogoWidth: '120px',
@@ -65,7 +71,9 @@ export const loginInfo = {
},
designhyd: {
title: '城市轨道交通设计平台V1.0',
- loginPath: '/design/login',
+ loginTitle: '城市轨道交通设计平台V1.0',
+ logoWidth: '140px',
+ loginPath: '/design/login?project=hyd',
bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273',
loginParam: 'DEFAULT',
navigationLogoWidth: '120px',
@@ -77,7 +85,8 @@ export const loginInfo = {
loginTitle: '调度一部',
homeTitle: '调度一部',
browserTitle: '西安地铁调度一部城市轨道交通实训平台',
- loginPath: '/xadt/login',
+ loginPath:'/login?project=xadt',
+ // loginPath: '/xadt/login',
loginParam: 'DEFAULT',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
@@ -88,7 +97,8 @@ export const loginInfo = {
loginTitle: '调度一部',
homeTitle: '调度一部',
browserTitle: '西安地铁调度一部城市轨道交通设计平台',
- loginPath: '/designxadt/login',
+ // loginPath: '/designxadt/login',
+ loginPath:'/design/login?project=xadt',
loginParam: 'DEFAULT',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
@@ -109,7 +119,8 @@ export const loginInfo = {
},
jyd: {
title: '城市轨道交通实训平台',
- loginPath: '/jyd/login',
+ // loginPath: '/jyd/login',
+ loginPath:'/login?project=jyd',
logoWidth: '300px',
navigationLogoWidth: '120px',
navigationMarginLeft: '140px',
@@ -125,7 +136,8 @@ export const loginInfo = {
logoWidth: '300px',
navigationLogoWidth: '120px',
navigationMarginLeft: '140px',
- loginPath: '/designjyd/login',
+ // loginPath: '/designjyd/login',
+ loginPath:'/design/login?project=jyd',
bottomColumn: '',
bottomIcon: Bottom_Jyd,
linkIcon: Link_Jyd,
@@ -133,19 +145,25 @@ export const loginInfo = {
},
tky: {
title: '城市轨道交通实训平台',
- loginPath: '/tky/login',
- loginTitle: 'jyd',
+ // loginPath: '/tky/login',
+ loginPath:'/login?project=tky',
+ loginTitle: '空串',
bottomColumn: '',
bottomIcon: FaviconTky,
- loginParam: 'DEFAULT'
+ loginParam: 'DEFAULT',
+ navigationLogoWidth: '75px',
+ navigationMarginLeft: '90px'
},
designtky: {
title: '城市轨道交通设计平台',
- loginPath: '/designtky/login',
- loginTitle: 'jyd',
+ // loginPath: '/designtky/login',
+ loginPath:'/design/login?project=tky',
+ loginTitle: '空串',
bottomIcon: FaviconTky,
bottomColumn: '',
- loginParam: 'DEFAULT'
+ loginParam: 'DEFAULT',
+ navigationLogoWidth: '75px',
+ navigationMarginLeft: '90px'
}
};
@@ -191,25 +209,33 @@ export const GenerateRouteProjectList = ['xty', 'designxty', 'gzb', 'designgzb',
export const goOtherPlatformMenu = { // 导航栏快速切换平台
login: '/design/login',
design: '/login',
- xty: '/designxty/login',
- designxty: '/xty/login',
- gzb: '/designgzb/login',
- designgzb: '/gzb/login',
- hyd: '/design/login',
- designhyd: '/login',
- xadt: '/designxadt/login',
- designxadt: '/xadt/login',
- jyd: '/designjyd/login',
- designjyd: '/jyd/login',
- tky: '/designtky/login',
- designtky: '/tky/login'
+ xty: '/design/login?project=xty',
+ designxty: '/login?project=xty',
+ gzb: '/design/login?project=gzb',
+ designgzb: '/login?project=gzb',
+ hyd: '/design/login?project=hyd',
+ designhyd: '/login?project=hyd',
+ xadt: '/design/login?project=xadt',
+ designxadt: '/login?project=xadt',
+ jyd: '/design/login?project=jyd',
+ designjyd: '/login?project=jyd',
+ tky: '/design/login?project=tky',
+ designtky: '/login?project=tky'
};
export const PermissionParam = { // 路径权限处理所需参数配置(跳转白名单&路径正则匹配&clientId)
hyd: {
- systemType: '011'
+ // systemType: '011'
+ whitePage: '/login?project=hyd',
+ reg: /^\/hyd/,
+ systemType: '011',
+ clientId: null
},
designhyd: {
- systemType: '011'
+ // systemType: '011'
+ whitePage: '/design/login?project=hyd',
+ reg: /^\/designhyd/,
+ systemType: '011',
+ clientId: LoginParams.Design.clientId
},
login: {
systemType: '011'
@@ -218,61 +244,61 @@ export const PermissionParam = { // 路径权限处理所需参数配置(跳
systemType: '011'
},
designxty: {
- whitePage: '/designxty/login',
+ whitePage: '/design/login?project=xty',
reg: /^\/designxty/,
systemType: '013',
clientId: LoginParams.Design.clientId
},
designgzb: {
- whitePage: '/designgzb/login',
+ whitePage: '/design/login?project=gzb',
reg: /^\/designgzb/,
systemType: '014',
clientId: LoginParams.Design.clientId
},
designxadt: {
- whitePage: '/designxadt/login',
+ whitePage: '/design/login?project=xadt',
reg: /^\/designxadt/,
systemType: '012',
clientId: LoginParams.Design.clientId
},
designjyd: {
- whitePage: '/designjyd/login',
+ whitePage: '/design/login?project=jyd',
reg: /^\/designjyd/,
systemType: '017',
clientId: LoginParams.Design.clientId
},
designtky: {
- whitePage: '/designtky/login',
+ whitePage: '/design/login?project=tky',
reg: /^\/designtky/,
systemType: '018',
clientId: LoginParams.Design.clientId
},
xty: {
- whitePage: '/xty/login',
+ whitePage: '/login?project=xty',
reg: /^\/xty/,
systemType: '013',
clientId: null
},
gzb: {
- whitePage: '/gzb/login',
+ whitePage: '/login?project=gzb',
reg: /^\/gzb/,
systemType: '014',
clientId: null
},
xadt: {
- whitePage: '/xadt/login',
+ whitePage: '/login?project=xadt',
reg: /^\/xadt/,
systemType: '012',
clientId: null
},
jyd: {
- whitePage: '/jyd/login',
+ whitePage: '/login?project=jyd',
reg: /^\/jyd/,
systemType: '017',
clientId: null
},
tky: {
- whitePage: '/tky/login',
+ whitePage: '/login?project=tky',
reg: /^\/tky/,
systemType: '018',
clientId: null
diff --git a/src/views/login/hydLogin.vue b/src/views/login/hydLogin.vue
deleted file mode 100644
index f990608c0..000000000
--- a/src/views/login/hydLogin.vue
+++ /dev/null
@@ -1,499 +0,0 @@
-
-