Merge branch 'master' of http://192.168.110.209:9001/r/lims-before

zouyu

2023-08-31 f0cb887a223e82d4ab076699a50d8e45b3c3f5ad

 src/router/index.js

@@ -472,13 +472,7 @@
          name: 'BasicDataMessage',
          component: () => import('@/views/basicData/index'),
          meta: { title: '基础数据', icon: 'el-icon-s-tools' }
        },
            {
              path: 'myBusiness',
              name: 'MyBusiness',
              component: () => import('@/views/personal/myBusiness/index'),
              meta: { title: '我的企业', icon: 'tree', show: false }
            }
        }
      ]
    },
    { path: '*', redirect: '/404', hidden: true }
@@ -539,9 +533,11 @@
      let menuFather = baseRouter
      const dataMenuFather = fn3(menuFather)
      role.roleMenuList.forEach((r) => {
        dataMenuFather.push(Routees.filter(item => {
          return item.path === r.menuUrl
        })[0])
        if(r.menuName!='首页'){
          dataMenuFather.push(Routees.filter(item => {
            return item.path === r.menuUrl
          })[0])
        }
      })
      let eqChildren = [];
      role.roleMenuList.forEach((r) => {