From f42c48a0c42387a63ef7f7bdb99a94d52a01f83b Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Sun, 19 Jan 2020 18:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4iscs=E4=B8=BA=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 4 +- src/router/index.js | 73 ++++++++++++++++------- src/views/system/iscsDesign/demonList.vue | 2 +- src/views/system/iscsSystem/index.vue | 9 +-- 4 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/permission.js b/src/permission.js index eaa108d9e..1c44bf217 100644 --- a/src/permission.js +++ b/src/permission.js @@ -16,7 +16,7 @@ function hasPermission(roles, permissionRoles) { const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login', '/gzb/login', '/designgzb/login', '/jlmap3d/devicetrain', '/hyd/login']; // 不重定向白名单 -const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/]; +const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/]; function isDesignPage(toRoutePath) { return designPageRegex.some(item => { @@ -34,7 +34,7 @@ const loginHydPage = whiteList[7]; const loginDesignPageMenu = { design: loginDesignPage, designxty: loginDesignXtyPage, - designgzb: loginDesignGzbPage, + designgzb: loginDesignGzbPage }; const loginPageMenu = { login: loginPage, diff --git a/src/router/index.js b/src/router/index.js index 6247a7f89..c2079e5ee 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -785,27 +785,27 @@ export const asyncRouter = [ i18n: 'router.ibpDraw' } }, - { - path:'iscs/design', - component: IscsDesign, - meta: { - i18n: 'router.iscsDraw' - }, - children: [ - { - path: 'edit/:id/:mode', - component: IscsDraw, - hidden: true - } - ] - }, - { - path: 'iscs/system', - component: IscsSystem, - meta: { - i18n: 'router.iscsSystem' - } - }, + // { + // path:'iscs/design', + // component: IscsDesign, + // meta: { + // i18n: 'router.iscsDraw' + // }, + // children: [ + // { + // path: 'edit/:id/:mode', + // component: IscsDraw, + // hidden: true + // } + // ] + // }, + // { + // path: 'iscs/system', + // component: IscsSystem, + // meta: { + // i18n: 'router.iscsSystem' + // } + // }, { path: 'dictionary', component: Dictionary, @@ -970,6 +970,37 @@ export const asyncRouter = [ ] } ] + }, + { // iscs系统 + path: '/iscs', + component: Layout, + meta: { + i18n: 'router.iscsSystem', + roles: [admin] + }, + children: [ + { + path:'design', + component: IscsDesign, + meta: { + i18n: 'router.iscsDraw' + }, + children: [ + { + path: 'edit/:id/:mode', + component: IscsDraw, + hidden: true + } + ] + }, + { + path: 'system', + component: IscsSystem, + meta: { + i18n: 'router.iscsSystem' + } + } + ] } ]; diff --git a/src/views/system/iscsDesign/demonList.vue b/src/views/system/iscsDesign/demonList.vue index 20486c838..42159fbde 100644 --- a/src/views/system/iscsDesign/demonList.vue +++ b/src/views/system/iscsDesign/demonList.vue @@ -131,7 +131,7 @@ export default { case 'system' : break; case 'interface': - this.$router.push({ path: `/system/iscs/design/edit/${obj.id}/${obj.mode}` }); + this.$router.push({ path: `/iscs/design/edit/${obj.id}/${obj.mode}` }); break; } }, diff --git a/src/views/system/iscsSystem/index.vue b/src/views/system/iscsSystem/index.vue index a1182c110..9b5bd1239 100644 --- a/src/views/system/iscsSystem/index.vue +++ b/src/views/system/iscsSystem/index.vue @@ -2,7 +2,8 @@