Commit 45da1dbe authored by wanghao's avatar wanghao

1 添加 bigWindowOld 静态菜单,去掉 如果是 admin 则进入 大屏界面

parent db0f097d
...@@ -53,19 +53,19 @@ export const constantRoutes = [ ...@@ -53,19 +53,19 @@ export const constantRoutes = [
component: (resolve) => require(['@/views/error/401'], resolve), component: (resolve) => require(['@/views/error/401'], resolve),
hidden: true hidden: true
}, },
//大屏展示 //大屏展示Old
{ {
path: '/bigWindow', path: '/bigWindow',
component: (resolve) => require(['@/views/bigWindow'], resolve), component: (resolve) => require(['@/views/bigWindow'], resolve),
hidden: true hidden: true
}, },
// 20240727 wh 调整 // 20240727 wh 调整
//大屏展示 // 大屏展示 Old
// { {
// path: '/bigWindow', path: '/bigWindowOld',
// component: (resolve) => require(['@/views/bigWindowOld'], resolve), component: (resolve) => require(['@/views/bigWindowOld'], resolve),
// hidden: true hidden: true
// }, },
{ {
path: '/outindex', path: '/outindex',
component: (resolve) => require(['@/views/onelogin'], resolve), component: (resolve) => require(['@/views/onelogin'], resolve),
......
...@@ -40,7 +40,6 @@ const permission = { ...@@ -40,7 +40,6 @@ const permission = {
const sdata = JSON.parse(JSON.stringify(res.data)) const sdata = JSON.parse(JSON.stringify(res.data))
const rdata = JSON.parse(JSON.stringify(res.data)) const rdata = JSON.parse(JSON.stringify(res.data))
const sidebarRoutes = filterAsyncRouter(sdata) const sidebarRoutes = filterAsyncRouter(sdata)
const rewriteRoutes = filterAsyncRouter(rdata, false, true) const rewriteRoutes = filterAsyncRouter(rdata, false, true)
rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
......
...@@ -170,9 +170,10 @@ export default { ...@@ -170,9 +170,10 @@ export default {
const roles = res.user.deptId; const roles = res.user.deptId;
let path = "/"; let path = "/";
// 如果是最高权限,就进入大屏 // 如果是最高权限,就进入大屏
if (roles == -2) { // 20240729 wh 调整
path = "/bigWindow"; // if (roles == -2) {
} // path = "/bigWindow";
// }
this.$router.push({ path }).catch(() => {}); this.$router.push({ path }).catch(() => {});
}) })
.catch(() => { .catch(() => {
......
...@@ -201,7 +201,7 @@ export default { ...@@ -201,7 +201,7 @@ export default {
let path = "/"; let path = "/";
// 如果是最高权限,就进入大屏 // 如果是最高权限,就进入大屏
if (roles == -2) { if (roles == -2) {
path = "/bigWindow"; path = "1";
} }
this.$router.push({ path }).catch(() => {}); this.$router.push({ path }).catch(() => {});
}) })
...@@ -252,9 +252,10 @@ export default { ...@@ -252,9 +252,10 @@ export default {
const roles = res.user.deptId; const roles = res.user.deptId;
let path = "/"; let path = "/";
// 如果是最高权限,就进入大屏 // 如果是最高权限,就进入大屏
if (roles == -2) { // 20240729 wh 调整
path = "/bigWindow"; // if (roles == -2) {
} // path = "/bigWindow";
// }
this.$router.push({ path }).catch(() => {}); this.$router.push({ path }).catch(() => {});
}) })
.catch(() => { .catch(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment