joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

西铁院项目调整

Browse Source
This commit is contained in:
fan 2019-10-16 17:37:03 +08:00
parent 54b078792c
commit 25c4cf957d
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/permission.js
View File

@ -45,7 +45,7 @@ function getRouteInfo(to) {
clientId = LoginParams.Design.clientId; clientId = LoginParams.Design.clientId;
} else if (/^\/plan/.test(toRoutePath)) { } else if (/^\/plan/.test(toRoutePath)) {
const flag = getSessionStorage('design'); const flag = getSessionStorage('design');
if (flag) { if (flag == true) {
loginPath = loginDesignPage; loginPath = loginDesignPage;
getTokenInfo = getDesignToken; getTokenInfo = getDesignToken;
clientId = LoginParams.Design.clientId; clientId = LoginParams.Design.clientId;
@ -118,7 +118,6 @@ router.beforeEach((to, from, next) => {
// 在免登录白名单，直接进入 // 在免登录白名单，直接进入
next(); next();
} else { } else {
console.log(routeInfo, '=========');
// 否则全部重定向到登录页 // 否则全部重定向到登录页
next(routeInfo.loginPath); next(routeInfo.loginPath);
} }

16
src/utils/auth.js
View File

@ -67,13 +67,11 @@ export function handleToken() {
const path = window.location.href; const path = window.location.href;
if (path.includes('/dp/') || path.includes('/display/dp')) { if (path.includes('/dp/') || path.includes('/display/dp')) {
return getScreenToken(); return getScreenToken();
} else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/plan') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/plan') || path.includes('/display/manage') || path.includes('/apply/')) { } else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/plan') || path.includes('/display/manage') || path.includes('/apply/')) {
return getDesignToken(); return getDesignToken();
} } else if (path.includes('/plan')) {
// else if (path.includes('/plan') || path.includes('/display/plan')) { return getDesignToken() || getToken();
// return getPlanToken(); } else {
// }
else {
return getToken(); return getToken();
} }
} }
@ -83,11 +81,7 @@ export function handleRemoveToken() {
const path = window.location.href; const path = window.location.href;
if (path.includes('/dp/') || path.includes('/display/dp')) { if (path.includes('/dp/') || path.includes('/display/dp')) {
return removeScreenToken(); return removeScreenToken();
} } else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/plan') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/plan') || path.includes('/display/manage') || path.includes('/apply/')) {
// else if (path.includes('/plan') || path.includes('/display/plan')) {
// return removePlanToken();
// }
else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/plan') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/plan') || path.includes('/display/manage') || path.includes('/apply/')) {
return removeDesignToken(); return removeDesignToken();
} else { } else {
return removeToken(); return removeToken();

2
src/views/trainingPlatform/demonList.vue
View File

@ -115,7 +115,7 @@
} else if ( obj.type === '考试系统' ){ } else if ( obj.type === '考试系统' ){
this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.mapId}`, query: { prodId: obj.code, type: obj.type }}); this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.mapId}`, query: { prodId: obj.code, type: obj.type }});
} else if ( obj.type === '运行图编制'){ } else if ( obj.type === '运行图编制'){
this.$router.push({ path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}` }) this.$router.push({ path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`,query:{skinCode: '02'} })
} }
localStore.set('trainingPlatformRoute'+this.account,this.$router.history.current.fullPath); localStore.set('trainingPlatformRoute'+this.account,this.$router.history.current.fullPath);
}, },