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

Merge branch 'develop'

Browse Source 
Former-commit-id: beb7a7f44499b3bb656f3757290efaeb19b9269f [formerly 1928113f56d85677e984114e1c869e30f2c76613] [formerly beb7a7f44499b3bb656f3757290efaeb19b9269f [formerly 1928113f56d85677e984114e1c869e30f2c76613] [formerly beb7a7f44499b3bb656f3757290efaeb19b9269f [formerly 1928113f56d85677e984114e1c869e30f2c76613] [formerly 1928113f56d85677e984114e1c869e30f2c76613 [formerly f7d385287ad891f7ad9e42e937446c1d11d0309c [formerly 218e0bbae09d6e96d4461228faab00331931372c]]]]]
Former-commit-id: 1219fdfa9bca4b6b859b669d4fd3737c75cd781d
Former-commit-id: b472be3c3842141a8f310519bab116ec49ece98a
Former-commit-id: d9c4481bcaee48d83bf5128b4c825748d7bcd72d [formerly 214c1641b8b8c9a964606d57330e81b54a658e03]
Former-commit-id: 6876ff46533b18aee98aef775f0e17a94c8fd00d
Former-commit-id: 0768b2e35d6109c9a77a7e21de195968f0ddb69d
Former-commit-id: 7e50e3bad0ef97aed79738733c7bccd7861ad993
Former-commit-id: d6c6138f1c1c422d0debe91d1c684f9e230c7621
Former-commit-id: 4dedd840717a655b7fc4597af3cae3bfde64caab
This commit is contained in:
liyang
2019-01-09 21:10:34 +08:00
parent 5d8ce74721 f4e21c2106
commit 38e50cd9f8
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -24,7 +24,7 @@
"countup.js": "^1.9.3", "countup.js": "^1.9.3",
"dayjs": "^1.6.7", "dayjs": "^1.6.7",
"echarts": "^4.1.0", "echarts": "^4.1.0",
"element-ui": "^2.4.4", "element-ui": "^2.4.11",
"flex.css": "^1.1.7", "flex.css": "^1.1.7",
"fuse.js": "^3.2.1", "fuse.js": "^3.2.1",
"github-markdown-css": "^2.10.0", "github-markdown-css": "^2.10.0",

7
src/router/index.js
View File

@@ -53,14 +53,11 @@ router.beforeEach((to, from, next) => {
} }
}) })
router.afterEach(to => { router.afterEach((to) => {
// 进度条 // 进度条
NProgress.done() NProgress.done()
// 需要的信息
const app = router.app
const { name, params, query, fullPath } = to
// 多页控制 打开新的页面 // 多页控制 打开新的页面
app.$store.dispatch('d2admin/page/open', { name, params, query, fullPath }) store.dispatch('d2admin/page/open', to)
// 更改标题 // 更改标题
util.title(to.meta.title) util.title(to.meta.title)
}) })

2
src/store/modules/d2admin/modules/page.js.REMOVED.git-id
View File

@@ -1 +1 @@
662a8892e61c7d979c416032c9a8ea91ebdc5e12 d4654c5862cfee5616a6cd51013c7ce2cdeeef46