Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test
# Conflicts: # jero-boot/db/蔚来标准sql/dev_third_record.sql # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js # jero-web/src/store/modules/user.js # jero-web/src/views/processCenter/components/feedbackInformation.vue # jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
This commit is contained in:
@@ -109,8 +109,10 @@ export default {
|
||||
props = { to: { path: menu.path } }
|
||||
}
|
||||
|
||||
const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title }
|
||||
|
||||
const attrs = { href: menu.path, target: menu.meta.target, title: menu.meta.title }
|
||||
if (menu.meta && menu.meta.existTask) {
|
||||
attrs.style = 'color:red'
|
||||
}
|
||||
if (menu.children && menu.alwaysShow) {
|
||||
// 把有子菜单的 并且 父菜单是要隐藏子菜单的
|
||||
// 都给子菜单增加一个 hidden 属性
|
||||
@@ -162,7 +164,8 @@ export default {
|
||||
span
|
||||
slot = 'title' >
|
||||
{ this.renderIcon(menu.meta.icon) }
|
||||
< span title={menu.meta.title}> { menu.meta.title } < /span>
|
||||
< span
|
||||
title = { menu.meta.title } > { menu.meta.title } < /span>
|
||||
< /span>
|
||||
{
|
||||
itemArr
|
||||
|
||||
Reference in New Issue
Block a user