sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'feature/error-collection' into develop

Browse Source 
# Conflicts:
#	src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue


Former-commit-id: a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a [formerly 1f27799438509890c390866f6a08350b69784203 [formerly 56c0f3b550c89c0d0b9e363e157533c1e88b1b8a]]]]]
Former-commit-id: 8a1b5fba72c1e99b10e3051ace49ff669e195b11
Former-commit-id: 658e36a5af1185c8ab28c37824d4b7f8439ae71a
Former-commit-id: 3e0ae29967cd9cd24d183ec4efd5ed5f820917e9 [formerly 0d1450a0f05f903a57ede770c1dc3a9e0ec710d2]
Former-commit-id: 8a6020f844a854d6e4765e53c9477a9eabf061d1
Former-commit-id: 0dff2e0795f8025ca961e18b1c2fcd65dc9e3bc3
Former-commit-id: 02294aee8f5ae27ece66ff3dabf27a65258e1f3c
Former-commit-id: a66c0fe86850814ca44800db473687ec3f4705b2
Former-commit-id: 75ec5153bc6a9227404abda6b88f74355289ac85
This commit is contained in:
liyang
2018-08-07 16:08:25 +08:00
parent 787dc28752 f28718943b
commit 95badc22ac
18 changed files with 482 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/menu/modules/demo-playground.js
View File

@@ -45,6 +45,15 @@ export default {
{ path: `${pre}db/public`, title: '公用数据', icon: 'users' }
]
},
{
path: `${pre}log`,
title: '日志',
icon: 'bullseye',
children: [
{ path: `${pre}log/log`, title: '日志记录', icon: 'dot-circle-o' },
{ path: `${pre}log/error`, title: '错误捕捉', icon: 'bug' }
]
},
{ path: `${pre}env`, title: '环境信息', icon: 'exclamation-circle' }
])('/demo/playground/')
}