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

调整iscs为新的系统

Browse Source
This commit is contained in:
zyy 2020-01-19 18:36:17 +08:00
parent 9d0c88633d
commit f42c48a0c4
4 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/permission.js
View File

@ -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,

73
src/router/index.js
View File

@ -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'
}
}
]
}
];

2
src/views/system/iscsDesign/demonList.vue
View File

@ -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;
}
},

9
src/views/system/iscsSystem/index.vue
View File

@ -2,7 +2,8 @@
<div class="iscs-system-box">
<top-nav @selectMode="selectMode" />
<div class="content-box">
<config-content :mode="mode" />
<!-- <config-content :mode="mode" /> -->
<route-view />
</div>
<!-- <bottom /> -->
</div>
@ -11,13 +12,13 @@
<script>
import TopNav from './nav.vue';
// import bottom from './bottom.vue';
import ConfigContent from './config/index';
// import ConfigContent from './config/index';
export default {
components: {
TopNav,
TopNav
// bottom,
ConfigContent
// ConfigContent
},
data() {
return {