Commit 61021f02 authored by 李苏's avatar 李苏 💬

调整

parent 87ee4950
...@@ -149,76 +149,36 @@ const permission = { ...@@ -149,76 +149,36 @@ const permission = {
newmenus.push(mi) newmenus.push(mi)
} }
}) })
// res.data=[... // res.data=[...
// newCommonList, ...newErpList, ...newPowerRoutes] // newCommonList, ...newErpList, ...newPowerRoutes]
res.data = dynamicRouter([...newCommonList, ...newErpList, ...newPowerRoutes], asymenus) || [... res.data = dynamicRouter([...newCommonList, ...newErpList, ...newPowerRoutes], asymenus) || [...
newCommonList, ...newErpList, ...newPowerRoutes newCommonList, ...newErpList, ...newPowerRoutes
] ]
/* 重置首页路由*/ /* 重置首页路由*/
// let hompePage = treeToList([...newCommonList,...newErpList,...newPowerRoutes]).filter(item=>item.mkid==localStorage.getItem('homeMkid'))
let ttlist = treeToList([...newCommonList, ...newErpList, ...newPowerRoutes]) let ttlist = treeToList([...newCommonList, ...newErpList, ...newPowerRoutes])
let homePage = ttlist.filter(item => item.mkid == localStorage.getItem('homeMkid')) let homePage = ttlist.filter(item => item.mkid == localStorage.getItem('homeMkid'))
/* 替换首页*/ if (true) {
if (homePage && homePage[0]) {
if (homePage[0].component) {
// Layout ParentView 组件特殊处理
if (homePage[0].component === 'Layout') {
homePage[0].component = Layout
} else if (homePage[0].component === 'ParentView') {
homePage[0].component = ParentView
} else if (homePage[0].component === 'InnerLink') {
homePage[0].component = InnerLink
} else {
if (homePage[0].commonComponent) {
homePage[0].component = loadCommonView(homePage[0].component)
} else if (homePage[0].erpComponent) {
homePage[0].component = loadErpView(homePage[0].component)
} else {
homePage[0].component = loadView(homePage[0].component)
}
}
}
/* 移除默认路由*/
let newHome = { let newHome = {
path: '', path: '',
component: Layout, // component: () => import('@/views/yhlywsytst/yhlywsytst/index.vue'),
redirect: 'index', component: () => import('common/src/erpViews/template/index.vue'),
hidden: true,
children: [{
path: 'index',
component: homePage[0].component ,
name: 'Index',
meta: {
title: '首页',
icon: 'dashboard',
affix: true
}
}]
}
router.addRoutes([newHome])
constantRoutes.push(newHome)
}else{
let newHome= {
path: '',
component: Layout,
redirect: 'index', redirect: 'index',
hidden: true, hidden: true,
children: [{ noCache: true,
children: [{
path: 'index', path: 'index',
component: () => import('@/views/index'), component: () => import('@/views/yhlywsytst/yhlywsytst/index.vue'),
name: 'Index', name: 'Index',
meta: { meta: {
title: '首页', title: '首页',
icon: 'dashboard', icon: 'dashboard',
affix: true affix: true
} },
}] noCache: true,
} }]
router.addRoutes([newHome]) }
constantRoutes.push(newHome) router.addRoutes([newHome])
constantRoutes.push(newHome)
} }
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
"src": "/sbgl/usbxx/init/zt ", "src": "/sbgl/usbxx/init/zt",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
......
This diff is collapsed.
...@@ -43,9 +43,11 @@ module.exports = { ...@@ -43,9 +43,11 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.30.254:18080/dmg`, // target: `http://192.168.30.254:18080/dmg`,
// target: `http://192.168.30.254:28084/erp`, // target: `http://192.168.30.254:28084/erp`,
// target: `http://192.168.30.108:9080/lxyl`, // target: 'http://192.168.30.109:9078/zghywpc',
target: 'http://localhost:9080/lxyl', target: 'http://localhost:9078/zghywpc',
// target: `http://192.168.30.117:9080/lxyl`, // target: 'http://119.3.92.249:28090/zghywpc',
// target: `http://192.168.30.118:9077/zghywpc`,
// target:'http://192.168.30.105:9080/lxyl', // target:'http://192.168.30.105:9080/lxyl',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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